doorkeeper_sso_client 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3783f708d98bac384c9dc40534defe5f17df63
-  data.tar.gz: dbfa104f88e0302c70503537b8acecca414ffd74
+  metadata.gz: 47c9f11b2efdd8c4ed007aa6390d87ff1c936516
+  data.tar.gz: e69fd047adc6b6a2641e331152499ebb4965f9cf
 SHA512:
-  metadata.gz: 7cefa864f3a0e0c57b09ef676af06d85462bfdb1d5b7a983bdda91d86dbe32efb49adcbf3dc4662079cad83a178aad626d268bede4e2551a12f9aed11c4fd340
-  data.tar.gz: 810515abf3aa8ddbd63fe9ef2f949a6c1878343bcd482886d17b9e2edbf5dd2d4c801adcafd1413f1c12761910f35cfe46f90c57424aaa2a763edf6c4605eb18
+  metadata.gz: 701069b5f57bbc69ce250d5baef0a714bfad5910c4a04bb324fdaaede4aecf5bad5f1dc38b2e15e21774bf6e2bd4910bfa91a61003d1f318159f28747b274e37
+  data.tar.gz: 2af04057c7c01621c6b507ab5c5a37abff79d45c1cb85afd8da09dc6cebb6c3e911456c98fd90704ef81a7c58f335d22e162136afe3826cdd70488ea61b29d07

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

@@ -43,17 +43,13 @@ module DoorkeeperSsoClient
                 scope = ::Devise::Mapping.find_scope!(resource_or_scope)
                 return scope == scope_sym
               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
+              def authenticate_#{scope}!
+                store_location_for(:#{scope}, request.original_url)
+                validate_passport!
+                redirect_to DoorkeeperSsoClient::Config.oauth_login_path + "?origin=" + URI.encode(request.original_url) unless #{scope}_signed_in?
+              end
+            METHODS
           end
         end
       end # ControllerHelpers

data/lib/doorkeeper_sso_client/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperSsoClient
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

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

@@ -37,8 +37,8 @@ RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers DeviseHoo
         expect(controller.user_signed_in?).to be_falsey
       end
 
-      it "redirects to Omniauth strategy" do
-        expect(response).to redirect_to("http://test.host/auth/doorkeeper_sso")
+      it "redirects to Omniauth strategy with origin" do
+        expect(response).to redirect_to("http://test.host/auth/doorkeeper_sso?origin=http://test.host/anonymous")
       end
 
       it "stores origin location" do
@@ -97,48 +97,4 @@ RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers DeviseHoo
       expect(controller.session['passport_id']).to be_nil
     end
   end
-end
-
-
-
-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!
-
-    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 "#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.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth