diff options
author | ThibG <thib@sitedethib.com> | 2018-09-11 20:09:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-11 20:09:00 +0200 |
commit | 82b521b4c306d75530795bce9f6c706359e7339e (patch) | |
tree | 4ac730d5c48dfd27703e33ffab034e3266f7e0ad /app/controllers/oauth/authorizations_controller.rb | |
parent | 59de2868c13a61bce08923f841024fefebe3b3da (diff) | |
parent | f1214f00d990612229c753d8657944a10b9bf8a1 (diff) |
Merge pull request #724 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/oauth/authorizations_controller.rb')
-rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index eb977510b..f6f5d1ecc 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -18,4 +18,18 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController def set_pack use_pack 'auth' end + + def render_success + if skip_authorization? || (matching_token? && !truthy_param?('force_login')) + redirect_or_render authorize_response + elsif Doorkeeper.configuration.api_only + render json: pre_auth + else + render :new + end + end + + def truthy_param?(key) + ActiveModel::Type::Boolean.new.cast(params[key]) + end end |