dxs
/
onionr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Friends API now shows redirect error message when ref header not set instead of request failing

master
Kevin Froman 2020-08-08 15:39:24 -05:00
parent 552e7427d8
commit 6976dcf8f3
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/httpapi/friendsapi/__init__.py
View File

@ -23,6 +23,7 @@ from coredb import keydb
""" """
friends = Blueprint('friends', __name__) friends = Blueprint('friends', __name__)
@friends.route('/friends/list') @friends.route('/friends/list')
def list_friends(): def list_friends():
pubkey_list = {} pubkey_list = {}
@ -31,28 +32,44 @@ def list_friends():
pubkey_list[friend.publicKey] = {'name': friend.get_info('name')} pubkey_list[friend.publicKey] = {'name': friend.get_info('name')}
return json.dumps(pubkey_list) return json.dumps(pubkey_list)
@friends.route('/friends/add/<pubkey>', methods=['POST']) @friends.route('/friends/add/<pubkey>', methods=['POST'])
def add_friend(pubkey): def add_friend(pubkey):
contactmanager.ContactManager(pubkey, saveUser=True).setTrust(1) contactmanager.ContactManager(pubkey, saveUser=True).setTrust(1)
return redirect(request.referrer + '#' + request.form['token']) try:
return redirect(request.referrer + '#' + request.form['token'])
except TypeError:
return Response(
"Added, but referrer not set, cannot return to friends page")
@friends.route('/friends/remove/<pubkey>', methods=['POST']) @friends.route('/friends/remove/<pubkey>', methods=['POST'])
def remove_friend(pubkey): def remove_friend(pubkey):
contactmanager.ContactManager(pubkey).setTrust(0) contactmanager.ContactManager(pubkey).setTrust(0)
contactmanager.ContactManager(pubkey).delete_contact() contactmanager.ContactManager(pubkey).delete_contact()
keydb.removekeys.remove_user(pubkey) keydb.removekeys.remove_user(pubkey)
return redirect(request.referrer + '#' + request.form['token']) try:
return redirect(request.referrer + '#' + request.form['token'])
except TypeError:
return Response(
"Friend removed, but referrer not set, cannot return to page")
@friends.route('/friends/setinfo/<pubkey>/<key>', methods=['POST']) @friends.route('/friends/setinfo/<pubkey>/<key>', methods=['POST'])
def set_info(pubkey, key): def set_info(pubkey, key):
data = request.form['data'] data = request.form['data']
contactmanager.ContactManager(pubkey).set_info(key, data) contactmanager.ContactManager(pubkey).set_info(key, data)
return redirect(request.referrer + '#' + request.form['token']) try:
return redirect(request.referrer + '#' + request.form['token'])
except TypeError:
return Response(
"Info set, but referrer not set, cannot return to friends page")
@friends.route('/friends/getinfo/<pubkey>/<key>') @friends.route('/friends/getinfo/<pubkey>/<key>')
def get_info(pubkey, key): def get_info(pubkey, key):
retData = contactmanager.ContactManager(pubkey).get_info(key) ret_data = contactmanager.ContactManager(pubkey).get_info(key)
if retData is None: if ret_data is None:
abort(404) abort(404)
else: else:
return retData return ret_data