Merge commit '1ae6b52c471d82d3682a732680549fd849c91957' into glitch-soc/merge-upstream

app/controllers/oauth/authorizations_controller.rb

@@ -20,14 +20,8 @@ class OAuth::AuthorizationsController < Doorkeeper::AuthorizationsController
     store_location_for(:user, request.url)
   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
+  def can_authorize_response?
+    !truthy_param?('force_login') && super
   end
 
   def truthy_param?(key)