Mastodon/forget-cancellare-vecchi-toot
2
0
Fork 0
mirror of https://github.com/codl/forget synced 2025-01-08 13:42:35 +01:00
Code Issues Releases Wiki Activity

fix 500 when logging in with mastdon with an existing oauth token

Browse Source
This commit is contained in:
codl 2017-08-19 14:32:31 +02:00
parent 126c24db5f
commit 0dbfa5e0bc
No known key found for this signature in database
GPG Key ID: 6CD7C8891ED1233A
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mastodon.py
View File

@ -54,10 +54,11 @@ def receive_code(code, app, callback):
remote_acc = api.account_verify_credentials() remote_acc = api.account_verify_credentials()
acc = account_from_api_object(remote_acc, app.instance) acc = account_from_api_object(remote_acc, app.instance)
acc = db.session.merge(acc) acc = db.session.merge(acc)
token = OAuthToken(account = acc, token = access_token) token = OAuthToken(token = access_token)
token = db.session.merge(token) token = db.session.merge(token)
token.account = acc
return acc return token
def get_api_for_acc(account): def get_api_for_acc(account):

5
routes.py
View File

@ -241,9 +241,8 @@ def mastodon_login_step2(instance):
callback = url_for('mastodon_login_step2', instance=instance, _external=True) callback = url_for('mastodon_login_step2', instance=instance, _external=True)
account = lib.mastodon.receive_code(code, app, callback) token = lib.mastodon.receive_code(code, app, callback)
account = token.account
account = db.session.merge(account)
sess = Session(account = account) sess = Session(account = account)
db.session.add(sess) db.session.add(sess)