doorkeeper_sso_client 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba633d01e5284693e1017241a56d0714eb900a7
-  data.tar.gz: 7f3c8145ad1dd0718c5501becce65b970cad1d2c
+  metadata.gz: de2665ad3f5e0134f533f0f1f372e47283286e45
+  data.tar.gz: 04fe335ebe3c4bb15c5a0d24059926c47efaac58
 SHA512:
-  metadata.gz: b801b58747c26ebfeeb4b23963bc8d22c51160a69ac9736bc2b9ddb93e7cc4de36c0874c35e7bebfa667e22837e10d48d2babfc55ffe48d46531cf53ae71bc4f
-  data.tar.gz: 58da3a6a8822c79de13fa85bdad701b2c731fb2a793100ea4ca2482eabd3f677059cfeace9dd8e91e782b8469f2516fbeaba71137abb7ed763cdda49e6a209a2
+  metadata.gz: 81c42da53e7dd63163dbc736f8cf1e6be92a020accc7307630081a74b62adf2ed598e2da8c60113d1d9423f6017a606f6c79ef4a64ad063e094d22c71c48629a
+  data.tar.gz: e7e99d711c781c6c6e2f5011dc73bfffe7a758f5b6bf3c8cb990307083b4680017485e99492e91a20daf3bbff22b16871587f0a2571f6fe4500ff16d4c05607d

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

@@ -9,7 +9,7 @@ module DoorkeeperSsoClient
             class_eval <<-METHODS, __FILE__, __LINE__ + 1
               def validate_passport!
                 if #{scope}_signed_in?
-                  sign_out(current_#{scope}) unless current_#{scope}.passport.try(:active?)
+                  sign_out(current_#{scope}) unless current_#{scope}.passports.find_by_uid(session['passport_id']).try(:active?)
                 end
                 return true
               end
@@ -21,6 +21,15 @@ module DoorkeeperSsoClient
                 end
                 super
               end
+
+              def after_sign_in_path_for(resource_or_scope)
+                scope = ::Devise::Mapping.find_scope!(resource_or_scope)
+                if scope == :#{scope}
+                  request.env['omniauth.origin'] || super
+                else
+                  super
+                end
+              end
             METHODS
 
             unless options[:skip_devise_hook]

data/lib/doorkeeper_sso_client/version.rb

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

data/lib/omniauth/strategies/doorkeeper_sso.rb

@@ -14,8 +14,6 @@ module OmniAuth
       option :fields, [:email, :name, :first_name, :last_name]
       option :uid_field, :id
 
-      attr_accessor :passport
-
       uid do
         user_info[options.uid_field.to_s]
       end
@@ -48,7 +46,8 @@ module OmniAuth
       end
 
       def call_app!
-        self.passport = create_passport
+        create_passport
+        session[:passport_id] = passport_info["id"]
         super
       end
 

data/spec/fabricators/user_fabricator.rb

@@ -4,5 +4,5 @@ Fabricator(:user) do
   password  { 'password' }
   name { |attrs| [attrs[:first_name], attrs[:last_name]].join(" ") }
   email { FFaker::Internet.email }
-  passport { Fabricate('DoorkeeperSsoClient::Passport') }
+  passports { [ Fabricate('DoorkeeperSsoClient::Passport') ] }
 end

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

@@ -20,7 +20,7 @@ RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers DeviseHoo
   before(:each) do
     @request.env["devise.mapping"] = Devise.mappings[:user]
     sign_in user
-    get :index
+    get :index, nil, {'passport_id' => passport.uid}
   end
 
   describe "::activate_sso" do
@@ -47,10 +47,29 @@ RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers DeviseHoo
     end
   end
 
-  # Will redirect to sso server to completely logout user
+
   describe "#after_sign_out_path_for" do
+    # Will redirect to sso server to completely logout user
     it { expect(controller.after_sign_out_path_for(:user)).to eq "http://sso_server.com/logout?app_id=123" }
   end
+
+
+  describe "#after_sign_in_path_for" do
+    # Will redirect to request.env['omniauth.origin']
+    context "has omniauth.origin" do
+      before(:each) do
+        mock_env = @request.env.merge 'omniauth.origin' => "http://localhost/profile"
+        allow(@request).to receive(:env).and_return(mock_env)
+      end
+
+      it { expect(controller.after_sign_in_path_for(:user)).to eq "http://localhost/profile" }
+    end
+
+    describe "omniauth.origin env missing" do
+      it { expect(controller.after_sign_in_path_for(:user)).to eq "/anonymous" }
+    end
+  end
+
 end
 
 

data/spec/test_app/app/models/user.rb

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable, password_length: 6..128
 
-  has_one :passport, as: :identity, class_name: "DoorkeeperSsoClient::Passport"
+  has_many :passports, as: :identity, class_name: "DoorkeeperSsoClient::Passport"
 
   validates :email, :first_name, presence: true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso_client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -316,7 +316,6 @@ files:
 - lib/doorkeeper_sso_client/engine.rb
 - 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
@@ -328,7 +327,6 @@ files:
 - spec/fabricators/user_fabricator.rb
 - spec/lib/doorkeeper_sso_client/config_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
 - spec/spec_helper.rb
@@ -375,7 +373,6 @@ test_files:
 - spec/fabricators/user_fabricator.rb
 - spec/lib/doorkeeper_sso_client/config_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
 - spec/spec_helper.rb

data/lib/doorkeeper_sso_client/mixins/controller_helpers.rb

@@ -1,39 +0,0 @@
-module DoorkeeperSsoClient
-  module Mixins
-    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
-  end
-end

data/spec/models/config_spec.rb

@@ -1,21 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe DoorkeeperSsoClient::Config, :type => :model do
-  before(:each) do
-    DoorkeeperSsoClient::Config.oauth_client_id = 123
-    DoorkeeperSsoClient::Config.oauth_client_secret = 'abc'
-    DoorkeeperSsoClient::Config.base_uri = 'http://localhost'
-  end
-
-  describe "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' }
-  end
-
-  describe "have default values" do
-    it { expect(DoorkeeperSsoClient::Config.sessions_path).to eq '/sso/sessions' }
-    it { expect(DoorkeeperSsoClient::Config.passport_verification_timeout_ms).to eq 200 }
-  end
-
-end