carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fix 500 on IntegrityError

master
justcool393 2022-11-15 15:12:36 -06:00
parent 519a9f91f8
commit ee8ad10fac
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
files/routes/oauth.py
View File

@ -15,13 +15,11 @@ def authorize_prompt(v):
if not application: return {"oauth_error": "Invalid `client_id`"}, 401 if not application: return {"oauth_error": "Invalid `client_id`"}, 401
return render_template("oauth.html", v=v, application=application) return render_template("oauth.html", v=v, application=application)
@app.post("/authorize") @app.post("/authorize")
@limiter.limit(DEFAULT_RATELIMIT_SLOWER) @limiter.limit(DEFAULT_RATELIMIT_SLOWER)
@auth_required @auth_required
@ratelimit_user() @ratelimit_user()
def authorize(v): def authorize(v):
client_id = request.values.get("client_id") client_id = request.values.get("client_id")
application = g.db.query(OauthApp).filter_by(client_id=client_id).one_or_none() application = g.db.query(OauthApp).filter_by(client_id=client_id).one_or_none()
if not application: return {"oauth_error": "Invalid `client_id`"}, 401 if not application: return {"oauth_error": "Invalid `client_id`"}, 401
@ -32,14 +30,11 @@ def authorize(v):
g.db.add(new_auth) g.db.add(new_auth)
except sqlalchemy.exc.IntegrityError: except sqlalchemy.exc.IntegrityError:
g.db.rollback() g.db.rollback()
g.db.close()
del g.db
old_auth = g.db.query(ClientAuth).filter_by(oauth_client = application.id, user_id = v.id).one() old_auth = g.db.query(ClientAuth).filter_by(oauth_client = application.id, user_id = v.id).one()
access_token = old_auth.access_token access_token = old_auth.access_token
return redirect(f"{application.redirect_uri}?token={access_token}") return redirect(f"{application.redirect_uri}?token={access_token}")
@app.post("/rescind/<aid>") @app.post("/rescind/<aid>")
@limiter.limit(DEFAULT_RATELIMIT_SLOWER) @limiter.limit(DEFAULT_RATELIMIT_SLOWER)
@auth_required @auth_required