From 670b9b1299c92df38812833531ec9b3bc6880f4b Mon Sep 17 00:00:00 2001 From: Garrett Mills Date: Wed, 15 Sep 2021 04:16:01 +0000 Subject: [PATCH] Update 'app/controllers/auth/Oauth2.controller.js' --- app/controllers/auth/Oauth2.controller.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/auth/Oauth2.controller.js b/app/controllers/auth/Oauth2.controller.js index 6f3a247..861cc6b 100644 --- a/app/controllers/auth/Oauth2.controller.js +++ b/app/controllers/auth/Oauth2.controller.js @@ -36,12 +36,6 @@ class Oauth2 extends Oauth2Controller { }) } - if ( req.query.state ) { - const state = Array.isArray(req.query.state) ? req.query.state[0] : req.query.state - const uri_params = new URLSearchParams(uri.params) - uri_params.set('state', state) - } - req.user.authorize(starship_client) await req.user.save() return super.authorize_post(req, res, next) @@ -73,6 +67,12 @@ class Oauth2 extends Oauth2Controller { }) } + if ( req.query.state ) { + const state = Array.isArray(req.query.state) ? req.query.state[0] : req.query.state + const uri_params = new URLSearchParams(uri.params) + uri_params.set('state', state) + } + if ( req.user.has_authorized(starship_client) ) { return this.Vue.invoke_action(res, { text: 'Grant Access',