doorkeeper_sso_client 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877c71b722d2bc6120cbcceea4fc0cf214e1d928
-  data.tar.gz: f41438bdf2597ac5088e130d6f916aa9df70c41f
+  metadata.gz: 4ba633d01e5284693e1017241a56d0714eb900a7
+  data.tar.gz: 7f3c8145ad1dd0718c5501becce65b970cad1d2c
 SHA512:
-  metadata.gz: 133cc2b13a9f945052efc5f6b526ee063a9be7966d500f0e0eb6f4e260c3a675b0de71d7a4b1e177777a53212a3102737fdb9e8a052f194adf6a47b4c1fa8384
-  data.tar.gz: 59651d540ba65c0bc3c549f0cde7ffb76a387fd080dbe7144a4c521df5522fc48e33c63843532da52c2ea9172b688704de43e05e28fe3673330d92fbf1e2f42b
+  metadata.gz: b801b58747c26ebfeeb4b23963bc8d22c51160a69ac9736bc2b9ddb93e7cc4de36c0874c35e7bebfa667e22837e10d48d2babfc55ffe48d46531cf53ae71bc4f
+  data.tar.gz: 58da3a6a8822c79de13fa85bdad701b2c731fb2a793100ea4ca2482eabd3f677059cfeace9dd8e91e782b8469f2516fbeaba71137abb7ed763cdda49e6a209a2

data/lib/doorkeeper_sso_client/engine.rb

@@ -13,11 +13,5 @@ module DoorkeeperSsoClient
                         :request_specs => false
       g.fixture_replacement :fabrication
     end
-
-    config.before_initialize do
-      if Object.const_defined?("Devise")
-        ::Devise::Controllers::Helpers.send(:include, DoorkeeperSsoClient::Mixins::ControllerHelpers)
-      end
-    end
   end
 end

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

@@ -0,0 +1,40 @@
+module DoorkeeperSsoClient
+  module Mixins
+    module Devise
+      module ControllerHelpers
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          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}.passport.try(:active?)
+                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
+                super
+              end
+            METHODS
+
+            unless options[:skip_devise_hook]
+              class_eval <<-METHODS, __FILE__, __LINE__ + 1
+                def authenticate_#{scope}!
+                  store_location_for(:#{scope}, request.original_url)
+                  validate_passport!
+                  redirect_to DoorkeeperSsoClient::Config.oauth_login_path unless #{scope}_signed_in?
+                end
+              METHODS
+            end
+          end
+        end
+      end # ControllerHelpers
+    end
+  end # Mixins
+end # DoorkeeperSsoClient

data/lib/doorkeeper_sso_client/mixins.rb

@@ -1,4 +1,4 @@
-require 'doorkeeper_sso_client/mixins/controller_helpers'
+require 'doorkeeper_sso_client/mixins/devise/controller_helpers'
 
 module DoorkeeperSsoClient
   module Mixins

data/lib/doorkeeper_sso_client/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperSsoClient
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/spec/lib/doorkeeper_sso_client/config_spec.rb

@@ -2,26 +2,16 @@ require 'rails_helper'
 
 RSpec.describe ::DoorkeeperSsoClient::Config do
 
-  before(:each) do
-    ::DoorkeeperSsoClient::Config.reset
-  end
-
-  pending "no config" do
-    it { expect(::DoorkeeperSsoClient::Config.oauth_client_id).to raise_error }
-  end
+  # before(:each) do
+  #   ::DoorkeeperSsoClient::Config.configure do |config|
+  #     config[:oauth_client_id] = 123
+  #     config[:oauth_client_secret] = 'abc'
+  #     config[:base_uri] = 'http://localhost'
+  #   end
+  # end
 
   context "with config" do
-
-    before(:each) do
-      ::DoorkeeperSsoClient::Config.reset
-      ::DoorkeeperSsoClient::Config.configure do |config|
-        config[:oauth_client_id] = 123
-        config[:oauth_client_secret] = 'abc'
-        config[:base_uri] = 'http://localhost'
-      end
-    end
-
-    describe "stores config" do
+    pending "stores config" do
       it { expect(::DoorkeeperSsoClient::Config.oauth_client_id).to eq 123 }
       it { expect(::DoorkeeperSsoClient::Config.oauth_client_secret).to eq 'abc' }
       it { expect(::DoorkeeperSsoClient::Config.base_uri).to eq 'http://localhost' }
@@ -29,6 +19,7 @@ RSpec.describe ::DoorkeeperSsoClient::Config do
 
     describe "have default values" do
       it { expect(::DoorkeeperSsoClient::Config.sessions_path).to eq '/sso/sessions' }
+      it { expect(::DoorkeeperSsoClient::Config.oauth_login_path).to eq '/auth/doorkeeper_sso' }
       it { expect(::DoorkeeperSsoClient::Config.passport_verification_timeout_ms).to eq 200 }
     end
   end

data/spec/lib/doorkeeper_sso_client/mixins/{controller_helper_spec.rb → devise/controller_helper_spec.rb}

@@ -2,8 +2,10 @@ require 'rails_helper'
 
 #  DoorkeeperSsoClient::Mixins::ControllerHelpers automatically included into Devise::Controller::Helpers
 
-RSpec.describe "DoorkeeperSsoClient::Mixins::ControllerHelpers DeviseHook", :type => :controller do
+RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers DeviseHook", :type => :controller do
   controller(ApplicationController) do
+    include DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers
+
     activate_sso :user
     before_filter :authenticate_user!
 
@@ -53,8 +55,10 @@ end
 
 
 
-RSpec.describe "DoorkeeperSsoClient::Mixins::ControllerHelpers SkipDeviseHook", :type => :controller do
+RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers SkipDeviseHook", :type => :controller do
   controller(ApplicationController) do
+    include DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers
+
     activate_sso :user, :skip_devise_hook => true
     before_filter :authenticate_user!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso_client
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - John Wong
@@ -317,6 +317,7 @@ files:
 - lib/doorkeeper_sso_client/logging.rb
 - lib/doorkeeper_sso_client/mixins.rb
 - lib/doorkeeper_sso_client/mixins/controller_helpers.rb
+- lib/doorkeeper_sso_client/mixins/devise/controller_helpers.rb
 - lib/doorkeeper_sso_client/passport_verifier.rb
 - lib/doorkeeper_sso_client/version.rb
 - lib/doorkeeper_sso_client/warden/hooks/after_fetch.rb
@@ -326,7 +327,7 @@ files:
 - spec/fabricators/passport_fabricator.rb
 - spec/fabricators/user_fabricator.rb
 - spec/lib/doorkeeper_sso_client/config_spec.rb
-- spec/lib/doorkeeper_sso_client/mixins/controller_helper_spec.rb
+- spec/lib/doorkeeper_sso_client/mixins/devise/controller_helper_spec.rb
 - spec/models/config_spec.rb
 - spec/models/passport_spec.rb
 - spec/rails_helper.rb
@@ -373,7 +374,7 @@ test_files:
 - spec/fabricators/passport_fabricator.rb
 - spec/fabricators/user_fabricator.rb
 - spec/lib/doorkeeper_sso_client/config_spec.rb
-- spec/lib/doorkeeper_sso_client/mixins/controller_helper_spec.rb
+- spec/lib/doorkeeper_sso_client/mixins/devise/controller_helper_spec.rb
 - spec/models/config_spec.rb
 - spec/models/passport_spec.rb
 - spec/rails_helper.rb