doorkeeper_sso_client 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d023a2b0e77cc03d40b7e1fbc979d3b6f4c518bf
-  data.tar.gz: 5c38e72b6e17927ed4b534a7a8916618703893bd
+  metadata.gz: aa2d95c6f02bff6fa8d4bf95dcb760591e39d23d
+  data.tar.gz: ae2fd4b66c75e23957fac23bc1145930f7be73f4
 SHA512:
-  metadata.gz: 37366c8de0979e3da04321c43933eb84e5593f5140f9eacd4280c8c90c1d3996c19acde2f5ccab23e26ad2b226ef03d77dfd6a655f981da992cc5fa299fd09d8
-  data.tar.gz: 83f88664f332726c72bee19d970adf2f163802cbab0387ba7521a87dac87493910a14d78620c83d410740e3a5d70d5238b40c7a7bf85b7516288c0fad26fa8f7
+  metadata.gz: 3e5c7076db43b1f70cea8f9df1db648f24023ce27ff120af72e2a58c2c8681d9782ace202424dbebfea60e622e23110b1c4e98350e4cf4748eebd4b947063f7b
+  data.tar.gz: b399085444f1e88108bd0a55cc2011debed894ebefd6cc1e3738ba03e8c77a1ed052c93800ba1aa6bbccde5790577a87ae2f0ac083e1bdbd484cb13dc3432bc1

data/lib/doorkeeper_sso_client.rb

@@ -4,6 +4,7 @@ require "doorkeeper_sso_client/engine"
 require 'doorkeeper_sso_client/config'
 require 'doorkeeper_sso_client/logging'
 require 'doorkeeper_sso_client/passport_verifier'
+require 'doorkeeper_sso_client/warden/support'
 require 'doorkeeper_sso_client/warden/hooks/after_fetch'
 require 'doorkeeper_sso_client/version'
 require 'omniauth/strategies/doorkeeper_sso'

data/lib/doorkeeper_sso_client/mixins.rb

@@ -1,9 +1,12 @@
-require 'doorkeeper_sso_client/mixins/passport_base'
 require 'doorkeeper_sso_client/mixins/devise/controller_helpers'
 require 'doorkeeper_sso_client/mixins/devise/test_helpers'
-require 'doorkeeper_sso_client/mixins/mongoid/passport'
+require 'doorkeeper_sso_client/mixins/passport_base'
 
 module DoorkeeperSsoClient
   module Mixins
+    module Mongoid
+      autoload :Passport, 'doorkeeper_sso_client/mixins/mongoid/passport'
+    end
   end
 end
+

data/lib/doorkeeper_sso_client/mixins/mongoid/passport.rb

@@ -1,4 +1,4 @@
-require_dependency 'mongoid'
+require 'mongoid'
 
 module DoorkeeperSsoClient
   module Mixins

data/lib/doorkeeper_sso_client/mixins/passport_base.rb

@@ -1,5 +1,3 @@
-require_dependency 'mongoid'
-
 module DoorkeeperSsoClient
   module Mixins
     module PassportBase
@@ -12,7 +10,8 @@ module DoorkeeperSsoClient
 
       module ClassMethods
         def create_from_omniauth(auth_hash)
-          passport = where(uid: auth_hash["extra"]["passport_id"]).first_or_initialize
+          uid = { uid: auth_hash["extra"]["passport_id"] }
+          passport = where(uid).first || new(uid)
           passport.update_attributes!(
             secret: auth_hash["extra"]["passport_secret"],
             token: auth_hash["credentials"]["token"],

data/lib/doorkeeper_sso_client/version.rb

@@ -1,3 +1,3 @@
 module DoorkeeperSsoClient
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/lib/doorkeeper_sso_client/warden/support.rb

@@ -0,0 +1,38 @@
+module DoorkeeperSsoClient
+  module Warden
+    module Support
+      extend ActiveSupport::Concern
+      include ::DoorkeeperSsoClient::Logging
+
+      included do
+        attr_reader :user, :warden, :options
+        delegate :request, to: :warden
+        delegate :params, to: :request
+      end
+
+      module ClassMethods
+        def to_proc
+          proc do |user, warden, options|
+            new(user, warden, options).call
+          end
+        end
+      end
+
+      def initialize(user, warden, options)
+        @user, @warden, @options = user, warden, options
+      end
+
+      def scope
+        scope = options[:scope]
+      end
+
+      def session
+        warden.session(scope)
+      end
+
+      def logged_in?
+        warden.authenticated?(scope) && session && user
+      end
+    end
+  end
+end

data/spec/models/passport_spec.rb

@@ -12,4 +12,47 @@ RSpec.describe DoorkeeperSsoClient::Passport, :type => :model do
     it { is_expected.to validate_uniqueness_of(:uid) }
   end
 
+  describe "::create_from_omniauth" do
+    let(:token) { SecureRandom.hex }
+    let(:passport_uid) { SecureRandom.uuid }
+    let(:auth_hash) {
+      HashWithIndifferentAccess.new(
+        provider: 'mindvalley',
+        uid: '123545',
+        info: {
+          first_name: 'Steve',
+          last_name: 'Jobs',
+          email: 'steve@apple.com'
+        },
+        extra: {
+          passport_id: passport_uid
+        },
+        credentials: { token: token, refresh_token: nil, expiry: nil  }
+      )
+    }
+    let(:fetched_passport) { DoorkeeperSsoClient::Passport.first }
+
+
+    before(:each) do
+      DoorkeeperSsoClient::Passport.create_from_omniauth(auth_hash)
+    end
+
+    context "new passport" do
+      it { expect(DoorkeeperSsoClient::Passport.count).to eq 1 }
+      it { expect(fetched_passport.uid).to eq passport_uid }
+      it { expect(fetched_passport.token).to eq token }
+    end
+
+    context "update existing" do
+      let!(:passport) { Fabricate("DoorkeeperSsoClient::Passport") }
+      let(:token) { passport.token }
+      let(:passport_uid) { passport.uid }
+
+      it { expect(DoorkeeperSsoClient::Passport.count).to eq 1 }
+      it { expect(fetched_passport.uid).to eq passport_uid }
+      it { expect(fetched_passport.token).to eq token }
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso_client
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -351,6 +351,7 @@ files:
 - lib/doorkeeper_sso_client/passport_verifier.rb
 - lib/doorkeeper_sso_client/version.rb
 - lib/doorkeeper_sso_client/warden/hooks/after_fetch.rb
+- lib/doorkeeper_sso_client/warden/support.rb
 - lib/omniauth/strategies/doorkeeper_sso.rb
 - lib/tasks/doorkeeper_sso_client_tasks.rake
 - spec/controllers/doorkeeper_sso_client/callbacks_controller_spec.rb