openstax_accounts 9.4.0 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffaa6e6017568ff2aec46e9e34189be66aee407ab518efc713f5632b1cdfcc2e
-  data.tar.gz: c990c936f23ca170bb15f99f52ed1265874881fc4f264b443c6acb9805181888
+  metadata.gz: 48ae6fdbc68368694770f436f5a7a4e57dea39b18c93b2791308aace6b07a02a
+  data.tar.gz: bbfbe2609b86b3b216ad0a94c7bf41b7c6bc1b29ea65e4a99388288dfcc80f7f
 SHA512:
-  metadata.gz: bdb1fcf467f575dde03294f690fc8ddace34c812bdd91ac92027a810d32c36668a725de64469e050039ad77ffe247b084125107a99777773c2e38bece3720967
-  data.tar.gz: c1c1f7b32f71f9e91e771f20804f66b444aae41a32b4d6032ab97a63f3d76aad562e00d070f1ca991779e74efde627cc1684b3d8661dadcc44a06d915273060f
+  metadata.gz: 29b93ef99bbb0ee170f4619269e79dd94fd89634a328985d55a057b9f0c85980480fdf8bfe47d4e946fb9dfc42e3a91c7e087a1825b8067c7c4a68d27e56f70f
+  data.tar.gz: dd689a226b1f8c92be65d8543c917b35af81eafa9a90f9de3b718fc2cf7b14e4df0ed7f64aff883bc2cf2141bfe1122dffadb9841a7cf0b1df9147e7b419779c

data/app/controllers/openstax/accounts/sessions_controller.rb

@@ -27,14 +27,18 @@ module OpenStax
       end
 
       def destroy
-        sign_out!
-
-        # Unless we are stubbing, we redirect to a configurable URL, which is normally
-        # (or at least eventually) the Accounts logout URL so that users can't sign back
-        # in automagically.
-        redirect_to configuration.enable_stubbing? ?
-                    main_app.root_url :
-                    configuration.logout_redirect_url(request)
+        # if a handler is configured, let it handle everything
+        if configuration.logout_handler
+          configuration.logout_handler.call(self)
+        else
+          # Unless we are stubbing, we redirect to a configurable URL, which is normally
+          # (or at least eventually) the Accounts logout URL so that users can't sign back
+          # in automagically.
+          sign_out!
+          redirect_to configuration.enable_stubbing? ?
+                        main_app.root_url :
+                        configuration.logout_redirect_url(request)
+        end
       end
 
       def failure

data/lib/openstax/accounts/configuration.rb

@@ -53,9 +53,16 @@ module OpenStax
       # If more would be returned, the result will be empty instead
       attr_accessor :max_search_items
 
+      # logout_handler
+      # Handles logging out and redirecting user when they've requested logout
+      # if specified, the logout_redirect_url has no effect
+      attr_accessor :logout_handler
+
       # logout_redirect_url
       # A URL to redirect to after the app logs out, can be a string or a Proc.
       # If a Proc (or lambda), it will be called with the logout request.
+      #
+      # Only used if the logout_handler above is not specified
       # If this field is nil or if the Proc returns nil, the logout will redirect
       # to the default Accounts logout URL.
       attr_writer :logout_redirect_url
@@ -117,6 +124,7 @@ module OpenStax
         @account_user_mapper = OpenStax::Accounts::DefaultAccountUserMapper
         @min_search_characters = 3
         @max_search_items = 10
+        @logout_handler = nil
         @logout_redirect_url = nil
         @return_to_url_approver = nil
         @forwardable_login_params = [

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = '9.4.0'
+    VERSION = '9.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 9.4.0
+  version: 9.5.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails