activeadmin-oidc 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12acbb45f9bb446114545d4634dfeac08880038ad2860e95e61c5a97a26f8fda
-  data.tar.gz: 18c6dadbc576e60c0cc6f8ecae04d8cf8c674127f430c12b8ea33f12b7472e47
+  metadata.gz: 352c557fd647f3422d80408f88f874cb995d6ce588dd2265263b3d6bf0da0030
+  data.tar.gz: 488b15eb1617beb855fba722dc841bee6cf3403e7b5782c5904bf92bc97d7f74
 SHA512:
-  metadata.gz: 0f4a8f41ac39006e4c0882b55fc481f1bee795290655c71e79a56a219425145a7f977f60ec4e72d2e0a317b765688dd41478c48c208f49104f85dd024c5273d9
-  data.tar.gz: 0e017cf647f5fbea240074c247bc7baac89c81222d7a94d2a0387364a3d7ef08468d5cef1e183c375291f56fc4d6105b316c78076cc82beee75a04b4ee7c651e
+  metadata.gz: a687c6ff15b7338e64e4dd5719792ce345b1b582c3952df38b7d44dde287020a92e71f57de660d9c487016025e518fe4eb72a12fc1103ba7f7131b6fd2d34eab
+  data.tar.gz: abcfbd2f2a94c224c12315dc096a0c7c2fea335be7620e44798c3a2f584872eac47543f6b647b2679052d0dd657e85d3f896c18205f2c00dcc9dc97b25d0bde6

data/lib/activeadmin/oidc/engine.rb

@@ -156,8 +156,24 @@ module ActiveAdmin
               # isolated engines don't try to resolve the controller as
               # `<Engine>::ActiveAdmin::Devise::SessionsController` from
               # the relative string form.
-              get    login_path,  to: ::ActiveAdmin::Devise::SessionsController.action(:new),     as: :"new_#{scope_name}_session"
-              delete logout_path, to: ::ActiveAdmin::Devise::SessionsController.action(:destroy), as: :"destroy_#{scope_name}_session"
+              get login_path, to: ::ActiveAdmin::Devise::SessionsController.action(:new), as: :"new_#{scope_name}_session"
+
+              # Mirror what AA's own Devise integration does in
+              # lib/active_admin/devise.rb: accept whichever HTTP
+              # methods Devise.sign_out_via and
+              # ActiveAdmin.application.logout_link_method combine to.
+              # Read at route-draw time (not in the enclosing
+              # after_initialize) so `Rails.application.reload_routes!`
+              # picks up host changes to either value — useful for
+              # specs that stub the setting and re-evaluate routes.
+              # AA 4 dropped `logout_link_method` (its layout uses
+              # `button_to` + Turbo), so only consult the setting when
+              # the version still exposes it.
+              aa_app = ::ActiveAdmin.application
+              aa_method = aa_app.logout_link_method if aa_app.respond_to?(:logout_link_method)
+              logout_via = [*::Devise.sign_out_via, aa_method].compact.uniq
+
+              match logout_path, to: ::ActiveAdmin::Devise::SessionsController.action(:destroy), as: :"destroy_#{scope_name}_session", via: logout_via
             end
           end
         end

data/lib/activeadmin/oidc/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveAdmin
   module Oidc
-    VERSION = "2.1.2"
+    VERSION = "2.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-oidc
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Igor Fedoronchuk