Merge pull request #224 from nov/feature/priority_on_max_age_and_prompt

priority on max age and prompt

CHANGELOG.md

@@ -6,6 +6,7 @@
 - [#222] Support max_age=0
 - [#221] Avoid raising invalid_request error on prompt=create
 - [#220] Define priority on possible prompt values to statically & successfully process multiple prompt values
+- [#224] Define priority between max_age & prompt
 
 ## v1.8.10 (2024-11-29)
 

lib/doorkeeper/openid_connect/helpers/controller.rb

@@ -17,8 +17,8 @@ def authenticate_resource_owner!
           super.tap do |owner|
             next unless oidc_authorization_request?
 
-            handle_oidc_prompt_param!(owner)
             handle_oidc_max_age_param!(owner)
+            handle_oidc_prompt_param!(owner)
           end
         rescue Errors::OpenidConnectError => e
           handle_oidc_error!(e)

spec/controllers/doorkeeper/authorizations_controller_spec.rb

@@ -313,7 +313,6 @@ def expect_successful_callback!
         expect(response).to redirect_to('/select_account')
       end
 
-      # FIXME:
       it 'when login+consent' do
         authorize! prompt: 'login consent'
         expect(response).to redirect_to('/reauthenticate')
@@ -382,6 +381,15 @@ def expect_successful_callback!
         expect(response).to redirect_to '/reauthenticate'
       end
     end
+
+    context 'when used along with prompt=select_account' do
+      it 'renders the authorization form' do
+        user.update! current_sign_in_at: 5.seconds.ago
+        authorize! max_age: 1, prompt: 'select_account'
+
+        expect(response).to redirect_to '/select_account'
+      end
+    end
   end
 
   describe '#reauthenticate_oidc_resource_owner' do