doorkeeper_sso_client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de2665ad3f5e0134f533f0f1f372e47283286e45
-  data.tar.gz: 04fe335ebe3c4bb15c5a0d24059926c47efaac58
+  metadata.gz: c321fedf6edd15e3f7f979602f0979832ba98a84
+  data.tar.gz: 684b0ee93c3c822b2db4ddf903f311286db97db3
 SHA512:
-  metadata.gz: 81c42da53e7dd63163dbc736f8cf1e6be92a020accc7307630081a74b62adf2ed598e2da8c60113d1d9423f6017a606f6c79ef4a64ad063e094d22c71c48629a
-  data.tar.gz: e7e99d711c781c6c6e2f5011dc73bfffe7a758f5b6bf3c8cb990307083b4680017485e99492e91a20daf3bbff22b16871587f0a2571f6fe4500ff16d4c05607d
+  metadata.gz: 86a14ac441a7d2f158bb72491318c675b17cff4d1559514379a29a24acccf58225b2635ac2fe1bda8ffc9fb69ee9e9b7da6959d4e9f8f9fb28641e88c0186b87
+  data.tar.gz: 5d7f14243016bf9e5d0708c50dc1fec4f004ecc476034aaca2999564c80f87b8b518b3b47d8bc53d355206db3bf183d461de2d3731b533791c3995aefaf3b914

data/lib/doorkeeper_sso_client/mixins/devise/controller_helpers.rb

@@ -8,28 +8,41 @@ module DoorkeeperSsoClient
           def activate_sso(scope, options = {})
             class_eval <<-METHODS, __FILE__, __LINE__ + 1
               def validate_passport!
-                if #{scope}_signed_in?
-                  sign_out(current_#{scope}) unless current_#{scope}.passports.find_by_uid(session['passport_id']).try(:active?)
+                if #{scope}_signed_in? and !current_#{scope}.passports.find_by_uid(session['passport_id']).try(:active?)
+                  sign_out(current_#{scope})
                 end
                 return true
               end
 
               def after_sign_out_path_for(resource_or_scope)
-                scope = ::Devise::Mapping.find_scope!(resource_or_scope)
-                if scope == :#{scope}
-                 return File.join( DoorkeeperSsoClient::Config.base_uri, "logout?app_id=" + DoorkeeperSsoClient::Config.oauth_client_id.to_s )
-                end
+                return File.join( DoorkeeperSsoClient::Config.base_uri, "logout?app_id=" + DoorkeeperSsoClient::Config.oauth_client_id.to_s ) if scope_match? resource_or_scope, :#{scope}
                 super
               end
 
               def after_sign_in_path_for(resource_or_scope)
-                scope = ::Devise::Mapping.find_scope!(resource_or_scope)
-                if scope == :#{scope}
+                if scope_match? resource_or_scope, :#{scope}
                   request.env['omniauth.origin'] || super
                 else
                   super
                 end
               end
+
+              def sign_out(resource_or_scope=nil)
+                if scope_match? resource_or_scope, :#{scope}
+                  session['passport_id'] = nil
+                end
+                super
+              end
+
+              def sign_out_all_scopes(lock=true)
+                session['passport_id'] = nil
+                super
+              end
+
+              def scope_match?(resource_or_scope, scope_sym)
+                scope = ::Devise::Mapping.find_scope!(resource_or_scope)
+                return scope == scope_sym
+              end
             METHODS
 
             unless options[:skip_devise_hook]

data/lib/doorkeeper_sso_client/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperSsoClient
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/omniauth/strategies/doorkeeper_sso.rb

@@ -47,7 +47,7 @@ module OmniAuth
 
       def call_app!
         create_passport
-        session[:passport_id] = passport_info["id"]
+        session[:passport_id] = env['omniauth.auth']['extra']['passport_id']
         super
       end
 

data/spec/lib/doorkeeper_sso_client/mixins/devise/controller_helper_spec.rb

@@ -70,6 +70,34 @@ RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers DeviseHoo
     end
   end
 
+
+  describe "#sign_out" do
+    context "user scope" do
+      before(:each) { controller.sign_out(:user) }
+      it "removes session['passport_id']" do
+        expect(controller.session['passport_id']).to be_nil
+      end
+    end
+
+    context "other_scope" do
+      before(:each) do
+        @request.env["devise.mapping"] = Devise.mappings[:admin]
+        sign_in :admin, Fabricate(:user)
+        controller.sign_out :admin
+      end
+      it "keeps session['passport_id']" do
+        expect(controller.session['passport_id']).to eq passport.uid
+      end
+    end
+  end
+
+  describe "#sign_out_all_scopes" do
+    before(:each) { controller.sign_out_all_scopes }
+    it "removes session['passport_id']" do
+      expect(controller.session['passport_id']).to be_nil
+    end
+  end
+
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso_client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -52,6 +52,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: api-auth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
-- !ruby/object:Gem::Dependency
-  name: api-auth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement