openstax_accounts 6.1.7 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5baab38c25cc2d119bc67c65740b6fa40a99056
-  data.tar.gz: 63ae3554c50de33b42dfabd0c7781ca4e5d10ea6
+  metadata.gz: a14d93863001f4a2e859e6512e8a24ef577fa1b2
+  data.tar.gz: e0b513f8258a6dc438246c0e607ec39b7f474b75
 SHA512:
-  metadata.gz: bed53557a3e3179ce6dea7f0382571d9f7e3a6e4b073f30faa6f331e21644088b812f947b29f6dede5ae875d6e36231d55fbe4b16ffcdd5537871467ec12fd51
-  data.tar.gz: e18a4a56e5e93a5b65a61abf5cff7675aaf6d73620a8d6187953ba25580f4f2055a5e6a37253dd81d2f4da3ef88a523347700a7c545baa36e0768eff1599c785
+  metadata.gz: 46c3dfda5ddfe710b79ff9786b2f5615a07393bf92e7e2d6eec6c8f6ee863d817c68eaaf4f0241dc918ee068a4e23016f950abd38d97e6a5faa6d316d0f31cdf
+  data.tar.gz: a545e7cd3e78e7902078d6e5f50dbea4268987d6abef5ee3524723fa13c799cbd31ed3837a0e2aae33ab8813313239a621cbdc08e4c05227afd12e2454c9ebaa

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

@@ -7,6 +7,10 @@ module OpenStax
 
       skip_before_filter :authenticate_user!
 
+      def configuration
+        OpenStax::Accounts.configuration
+      end
+
     end
 
   end

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

@@ -3,7 +3,7 @@ module OpenStax
     class SessionsController < OpenStax::Accounts::ApplicationController
 
       def new
-        if OpenStax::Accounts.configuration.enable_stubbing?
+        if configuration.enable_stubbing?
           redirect_to dev_accounts_path
         else
           store_fallback key: :accounts_return_to, strategies: [:session]
@@ -26,17 +26,12 @@ module OpenStax
       def destroy
         sign_out!
 
-        # If we're using the Accounts server, need to sign out of it so can't 
-        # log back in automagically
-        if OpenStax::Accounts.configuration.enable_stubbing?
-          redirect_to main_app.root_url
-        else
-          redirect_to(
-            OpenStax::Utilities.generate_url(
-              OpenStax::Accounts.configuration.openstax_accounts_url, "logout"
-            )
-          )
-        end
+        # 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)
       end
 
       def failure
@@ -46,9 +41,7 @@ module OpenStax
 
       def profile
         # TODO: stub profile if stubbing is enabled
-        redirect_to(URI.join(
-          OpenStax::Accounts.configuration.openstax_accounts_url, "/profile"
-        ).to_s)
+        redirect_to URI.join(configuration.openstax_accounts_url, "/profile").to_s
       end
 
     end

data/lib/openstax/accounts/configuration.rb

@@ -5,6 +5,12 @@ module OpenStax
       # Base URL for OpenStax Accounts
       attr_reader :openstax_accounts_url
 
+      def openstax_accounts_url=(url)
+        url.gsub!(/https|http/,'https') if !(url =~ /localhost/)
+        url = url + "/" if url[url.size-1] != '/'
+        @openstax_accounts_url = url
+      end
+
       # openstax_application_id
       # OAuth client_id received from OpenStax Accounts
       attr_accessor :openstax_application_id
@@ -47,10 +53,22 @@ module OpenStax
       # If more would be returned, the result will be empty instead
       attr_accessor :max_search_items
 
-      def openstax_accounts_url=(url)
-        url.gsub!(/https|http/,'https') if !(url =~ /localhost/)
-        url = url + "/" if url[url.size-1] != '/'
-        @openstax_accounts_url = url
+      # 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.
+      # 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
+
+      def logout_redirect_url(request)
+        (@logout_redirect_url.is_a?(Proc) ?
+           @logout_redirect_url.call(request) :
+           @logout_redirect_url) ||
+        default_logout_redirect_url
+      end
+
+      def default_logout_redirect_url
+        URI.join(openstax_accounts_url, "logout").to_s
       end
 
       def initialize
@@ -66,6 +84,7 @@ module OpenStax
         @account_user_mapper = OpenStax::Accounts::DefaultAccountUserMapper
         @min_search_characters = 3
         @max_search_items = 10
+        @logout_redirect_url = nil
         super
       end
 

data/lib/openstax/accounts/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Accounts
-    VERSION = "6.1.7"
+    VERSION = "6.2.0"
   end
 end

data/spec/controllers/openstax/accounts/sessions_controller_spec.rb

@@ -8,6 +8,10 @@ module OpenStax::Accounts
                                         username: 'some_user',
                                         openstax_uid: 10 }
 
+    after(:all) {
+      OpenStax::Accounts.configuration.logout_redirect_url = nil
+    }
+
     it 'should redirect users to the login path' do
       c = controller
       get :new
@@ -27,5 +31,16 @@ module OpenStax::Accounts
       expect(controller.current_account).to eq(AnonymousAccount.instance)
       expect(controller.current_account.is_anonymous?).to eq(true)
     end
+
+    it 'should get signout redirect URL from configured setting' do
+      my_lambda = ->(request) { "http://www.google.com" }
+      OpenStax::Accounts.configuration.logout_redirect_url = my_lambda
+
+      allow(OpenStax::Accounts.configuration).to receive(:enable_stubbing?) {false}
+      expect(my_lambda).to receive(:call).with(anything())
+
+      controller.sign_in account
+      delete :destroy
+    end
   end
 end

data/spec/lib/openstax/accounts/configuration_spec.rb

@@ -0,0 +1,29 @@
+module OpenStax
+  module Accounts
+    describe Configuration do
+
+      let!(:config) { Configuration.new.tap {|c| c.openstax_accounts_url = "https://accounts.openstax.org"} }
+      let!(:a_fake_request) { OpenStruct.new(url: "http://foo.com") }
+
+      it "returns the default logout redirect when no explicit URL is set" do
+        expect(config.logout_redirect_url(a_fake_request)).to eq "https://accounts.openstax.org/logout"
+      end
+
+      it "returns an explicitly-set string logout redirect URL when set" do
+        config.logout_redirect_url = "blah"
+        expect(config.logout_redirect_url(a_fake_request)).to eq "blah"
+      end
+
+      it "returns the default URL when Proc logout redirect URL set and returns nil" do
+        config.logout_redirect_url = ->(request) { nil }
+        expect(config.logout_redirect_url(a_fake_request)).to eq "https://accounts.openstax.org/logout"
+      end
+
+      it "returns the Proc URL when Proc logout redirect URL set and returns non-nil" do
+        config.logout_redirect_url = ->(request) { "howdy" }
+        expect(config.logout_redirect_url(a_fake_request)).to eq "howdy"
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 6.1.7
+  version: 6.2.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -304,6 +304,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem allows Rails apps to easily access the API's and login infrastructure
   of OpenStax Accounts.
 email:
@@ -444,6 +458,7 @@ files:
 - spec/handlers/openstax/accounts/accounts_search_spec.rb
 - spec/handlers/openstax/accounts/dev/accounts_search_spec.rb
 - spec/lib/openstax/accounts/api_spec.rb
+- spec/lib/openstax/accounts/configuration_spec.rb
 - spec/lib/openstax/accounts/current_user_manager_spec.rb
 - spec/lib/openstax/accounts/has_many_through_groups/active_record/base_spec.rb
 - spec/models/openstax/accounts/account_spec.rb
@@ -544,6 +559,7 @@ test_files:
 - spec/handlers/openstax/accounts/accounts_search_spec.rb
 - spec/handlers/openstax/accounts/dev/accounts_search_spec.rb
 - spec/lib/openstax/accounts/api_spec.rb
+- spec/lib/openstax/accounts/configuration_spec.rb
 - spec/lib/openstax/accounts/current_user_manager_spec.rb
 - spec/lib/openstax/accounts/has_many_through_groups/active_record/base_spec.rb
 - spec/models/openstax/accounts/account_spec.rb