doorkeeper_sso_client 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ee8d13e7e88d390380516c9def8b0c68a93d3f7
-  data.tar.gz: 34dd41b3aff5231b38fe5f848a135b23bdc71dac
+  metadata.gz: 00aa97b0712d8db04fbb37bb15432c99fb042ee1
+  data.tar.gz: fdd6f0131330cb540ad92afc656d0777edf7d6be
 SHA512:
-  metadata.gz: f8a82ab4fc2068f55b0b0c5f4d5d3997d1d0b657baf9872923e819b949187c3ccaf75859c36cd6ba3293eaa63a315448d8de8ed8a3be30c17ee1e9cf97909c8a
-  data.tar.gz: c1413b8872de5be18ee5b5c475c8abd211301c4bf837fdc0ecd7bb9370b8c68d018341bd15141d562a30059b476a57d6dbb4c97a5cc52565afd6ebadf7d8b64b
+  metadata.gz: ea87f47e2380d4e2eb07947ace447a9f7dbe25ee75f8c352b8dfbaff92dda77344b9b5a5ded28d9b433f3128c01e3a3681861d73395b53678e6c3851128b87c7
+  data.tar.gz: 63a7dcf41d25b79c420146d65052e55ddfa41a1b199ac977657329fad7b761afbbebbe551b8db558d2e5025236cdf28318c986e1d16ecbb6c446a1ee124bf791

data/lib/doorkeeper_sso_client/mixins/controller_helpers.rb

@@ -3,12 +3,28 @@ module DoorkeeperSsoClient
     module ControllerHelpers
       extend ActiveSupport::Concern
 
+      module ClassMethods
+        def activate_sso(scope, options = {})
+          devise_group :sso, contains: [scope]
+
+          unless options[:skip_devise_hook]
+            class_eval <<-METHODS, __FILE__, __LINE__ + 1
+              def authenticate_#{scope}!
+                validate_passport!
+                super
+              end
+            METHODS
+          end
+        end
+      end
+
       def validate_passport!
         if sso_signed_in?
           sign_out(current_sso) unless current_sso.passport.try(:active?)
         end
         return true
       end
+
     end
   end
 end

data/lib/doorkeeper_sso_client/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperSsoClient
-  VERSION = "0.2.5"
+  VERSION = "0.2.7"
 end

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

@@ -2,44 +2,80 @@ require 'rails_helper'
 
 #  DoorkeeperSsoClient::Mixins::ControllerHelpers automatically included into Devise::Controller::Helpers
 
-RSpec.describe "DoorkeeperSsoClient::Mixins::ControllerHelpers", :type => :controller do
-    controller(ApplicationController) do
-      devise_group :sso, contains: [:user]
+RSpec.describe "DoorkeeperSsoClient::Mixins::ControllerHelpers DeviseHook", :type => :controller do
+  controller(ApplicationController) do
+    activate_sso :user
+    before_filter :authenticate_user!
 
-      before_filter :authenticate_user!
-      before_filter :validate_passport!
+    def index
+      render nothing: :true
+    end
+  end
+
+  let(:passport) { Fabricate('DoorkeeperSsoClient::Passport', identity: Fabricate(:user)) }
+  let(:user) { passport.identity }
+
+  before(:each) do
+    @request.env["devise.mapping"] = Devise.mappings[:user]
+    sign_in user
+    get :index
+  end
+
+  describe "::activate_sso" do
 
-      def index
-        render nothing: :true
+    context "with valid passport" do
+      it "remain signed in" do
+        expect(controller.user_signed_in?).to be_truthy
       end
     end
 
-    let(:user) { Fabricate(:user) }
-    let(:passport) { Fabricate(:passport, identity: user) }
+    context "with invalid passport" do
+      let(:passport) { Fabricate('DoorkeeperSsoClient::Passport', identity: Fabricate(:user), revoked_at: Time.now, revoke_reason: :logout ) }
+      it "automatically signed out" do
+        expect(controller.user_signed_in?).to be_falsey
+      end
+    end
+  end
+end
 
-    describe "before_filter#validate_passport!" do
-      context "when user is logged in" do
-        before(:each) do
-          @request.env["devise.mapping"] = Devise.mappings[:user]
-          sign_in user
-          get :index
-        end
 
-        context "with valid passport" do
 
-          it "remain signed in" do
-            expect(controller.user_signed_in?).to be_truthy
-          end
-        end
-      end
+RSpec.describe "DoorkeeperSsoClient::Mixins::ControllerHelpers SkipDeviseHook", :type => :controller do
+  controller(ApplicationController) do
+    activate_sso :user, :skip_devise_hook => true
+    before_filter :authenticate_user!
 
-      context "when user is logged out" do
-        let(:passport) { Fabricate(:passport, identity: user, revoked_at: Time.now, revoke_reason: :logout ) }
+    def index
+      render nothing: :true
+    end
+  end
+
+  let(:passport) { Fabricate('DoorkeeperSsoClient::Passport', identity: Fabricate(:user)) }
+  let(:user) { passport.identity }
 
-        it "log out user" do
-          expect(controller.user_signed_in?).to be_falsey
-        end
+  before(:each) do
+    @request.env["devise.mapping"] = Devise.mappings[:user]
+    sign_in user
+    get :index
+  end
+
+  describe "#validate_passport!" do
+    context "with valid passport" do
+      it "remain signed in" do
+        expect(controller.user_signed_in?).to be_truthy
+      end
+    end
+
+    context "with invalid passport" do
+      let(:passport) { Fabricate('DoorkeeperSsoClient::Passport', identity: Fabricate(:user), revoked_at: Time.now, revoke_reason: :logout ) }
+      it "remain signed in" do
+        expect(controller.user_signed_in?).to be_truthy
+      end
 
+      it "sign out when manually validate_passport!" do
+        controller.validate_passport!
+        expect(controller.user_signed_in?).to be_falsey
       end
     end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso_client
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth