From 9597920c6371db5555415705643ad26026d198fb Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 18 Feb 2016 18:47:35 +0100 Subject: attempting to fix omniauth problem --- app/controllers/oauth/authorizations_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 24025d8c723..874af5de243 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -7,6 +7,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController if pre_auth.authorizable? if skip_authorization? || matching_token? auth = authorization.authorize + reset_session redirect_to auth.redirect_uri else render "doorkeeper/authorizations/new" -- cgit v1.2.1 From ce45389a4d9b9405112a22daaa4e6808201414e0 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Fri, 19 Feb 2016 14:22:06 +0100 Subject: another attempt to fix oauth issue --- app/controllers/oauth/authorizations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 874af5de243..c721dca58d9 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -7,7 +7,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController if pre_auth.authorizable? if skip_authorization? || matching_token? auth = authorization.authorize - reset_session + session.delete(:user_return_to) redirect_to auth.redirect_uri else render "doorkeeper/authorizations/new" -- cgit v1.2.1