doorkeeper_sso 0.2.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe5ab16d2f2e2a47ac7661e14aaf1e3fb65e3623
-  data.tar.gz: 2c16456bf1eeb023a47c79b96bdae2a6e421f515
+  metadata.gz: 1b37cfaca0f0f4f0087f9bd86254651caf44e15a
+  data.tar.gz: 8fa3028938be6f401d24481df77f61f8e72d4fbd
 SHA512:
-  metadata.gz: 141aae2e35e3f82733a6f3d58e949d63ea1c04bc640a1fb3185edc25af8da4179ea3c18e4fdbcc25c097e21ffe5ed0a23fb66a5dad0e02ebc5ff6d14523d5c08
-  data.tar.gz: 3514b67ddedd75de55802a4b7b5275b177734893dfe19aed9454e8558b373c9b8a9df2a0f7778f63ec31cc39a53a4c3a3a04f74d358673bae7cba749daad8bf6
+  metadata.gz: 81c4872126d84a3cfd6629b4f805c7b0c71093ae118c667051874d30744118e9a36cbf5ba12f82f493b1ec331827a85911799210a999d0459274cf54c4a3bca6
+  data.tar.gz: 1a44dec7b5b5b93820b44e255fcd0b63095f2508e0223b206f9d89b790ee9d50642ab2dfd8bd9b37ff07c8a890ff0a263972ea32babe3dc1713e31060658b992

data/lib/sso/engine.rb

@@ -32,7 +32,7 @@ module Sso
       ::Doorkeeper::TokensController.send(:include, Sso::Doorkeeper::TokensControllerMixin)
       ::Doorkeeper::AuthorizationsController.send(:include, Sso::Doorkeeper::AuthorizationsControllerMixin)
 
-      ::Warden::Manager.after_authentication(scope: :user, &::Sso::Warden::Hooks::AfterAuthentication.to_proc)
+      ::Warden::Manager.after_set_user(scope: :user, &::Sso::Warden::Hooks::CreateMasterSession.to_proc)
       ::Warden::Manager.before_logout(scope: :user, &::Sso::Warden::Hooks::BeforeLogout.to_proc)
 
       # TODO : Do we want to ensure that session is always active?

data/lib/sso/version.rb

@@ -1,3 +1,3 @@
 module Sso
-  VERSION = "0.2.7"
+  VERSION = "0.4.0"
 end

data/lib/sso/warden/hooks/{after_authentication.rb → create_master_session.rb}

@@ -1,12 +1,16 @@
 module Sso
   module Warden
     module Hooks
-      class AfterAuthentication
+      class CreateMasterSession
         include ::Sso::Warden::Support
 
         def call
-          debug { "Starting hook because this is considered the first login of the current session..." }
-          generate_session
+          if logged_in?
+            debug { "Starting hook because this is considered the first login of the current session..." }
+            debug { "Log out previous Sso:Session if exists : ID session['sso_session_id']" }
+            ::Sso::Session.logout(session["sso_session_id"])
+            generate_session
+          end
           return nil
         end
 

data/lib/sso.rb

@@ -1,7 +1,7 @@
 require "sso/engine"
 require "sso/logging"
 require "sso/warden/support"
-require "sso/warden/hooks/after_authentication"
+require "sso/warden/hooks/create_master_session"
 require "sso/warden/hooks/before_logout"
 require "sso/warden/hooks/session_check"
 require "sso/doorkeeper/access_grant_mixin"

data/spec/lib/sso/warden/hooks/{after_authentication_spec.rb → create_master_session_spec.rb}

@@ -1,24 +1,9 @@
 require 'rails_helper'
 
-RSpec.describe Sso::Warden::Hooks::AfterAuthentication do
+RSpec.describe Sso::Warden::Hooks::CreateMasterSession do
 
   # Set up user
   let(:user) { Fabricate(:user) }
-  # let(:application) { Fabricate('Doorkeeper::Application') }
-  # let(:access_token) { Fabricate('Doorkeeper::AccessToken',
-  #                                resource_owner_id: user.id) }
-  # let!(:access_grant) { Fabricate('Doorkeeper::AccessGrant',
-  #                                application_id: application.id,
-  #                                resource_owner_id: user.id,
-  #                                redirect_uri: 'http://localhost:3002/oauth/callback'
-  #                               ) }
-
-  # # Set up Session
-  # let(:session) {  Fabricate('Sso::Session', owner: user) }
-  # let!(:client) {  Fabricate('Sso::Client', session: session,
-  #                               application_id: application.id,
-  #                               access_token_id: access_token.id,
-  #                               access_grant_id: access_grant.id) }
 
   # Set up rack
   let(:proc)           { described_class.to_proc }
@@ -45,7 +30,44 @@ RSpec.describe Sso::Warden::Hooks::AfterAuthentication do
       expect(rack.call).to be_nil
     end
 
-    it "run #generate_session" do
+    context 'existing session' do
+      let(:sso_params) { { :ip => "202.188.0.133", :agent => "Chrome" } }
+      let(:sso_session) { ::Sso::Session.generate_master(user, sso_params ) }
+      let!(:session_params) { { "sso_session_id" => sso_session.id } }
+
+      before() { rack.call }
+
+      it { expect(::Sso::Session.count).to eq 2 }
+      it { expect(::Sso::Session.find_by_id(sso_session.id).revoke_reason).to eq "logout" }
+
+      it "runs Sso::Session.logout" do
+        expect(::Sso::Session).to receive(:logout).with(nil)
+        rack.call
+      end
+    end
+
+    context 'logged out' do
+      let(:user) { nil }
+
+      before() { rack.call }
+
+      it "will not run Sso::Session.logout" do
+        expect(::Sso::Session).not_to receive(:logout)
+        rack.call
+      end
+
+      it "will not run #generate_session" do
+        expect(rack).not_to receive(:generate_session)
+        rack.call
+      end
+    end
+
+    it "runs Sso::Session.logout" do
+      expect(::Sso::Session).to receive(:logout).with(nil)
+      rack.call
+    end
+
+    it "runs #generate_session" do
       expect(rack).to receive(:generate_session)
       rack.call
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.4.0
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -344,8 +344,8 @@ files:
 - lib/sso/engine.rb
 - lib/sso/logging.rb
 - lib/sso/version.rb
-- lib/sso/warden/hooks/after_authentication.rb
 - lib/sso/warden/hooks/before_logout.rb
+- lib/sso/warden/hooks/create_master_session.rb
 - lib/sso/warden/hooks/session_check.rb
 - lib/sso/warden/support.rb
 - lib/tasks/sso_tasks.rake
@@ -363,8 +363,8 @@ files:
 - spec/lib/doorkeeper/application_mixin_spec.rb
 - spec/lib/doorkeeper/authorizations_controller_mixin_spec.rb
 - spec/lib/doorkeeper/tokens_controller_mixin_spec.rb
-- spec/lib/sso/warden/hooks/after_authentication_spec.rb
 - spec/lib/sso/warden/hooks/before_logout_spec.rb
+- spec/lib/sso/warden/hooks/create_master_session_spec.rb
 - spec/models/sso/client_spec.rb
 - spec/models/sso/pingback_spec.rb
 - spec/models/sso/session_spec.rb
@@ -423,8 +423,8 @@ test_files:
 - spec/lib/doorkeeper/application_mixin_spec.rb
 - spec/lib/doorkeeper/authorizations_controller_mixin_spec.rb
 - spec/lib/doorkeeper/tokens_controller_mixin_spec.rb
-- spec/lib/sso/warden/hooks/after_authentication_spec.rb
 - spec/lib/sso/warden/hooks/before_logout_spec.rb
+- spec/lib/sso/warden/hooks/create_master_session_spec.rb
 - spec/models/sso/client_spec.rb
 - spec/models/sso/pingback_spec.rb
 - spec/models/sso/session_spec.rb