doorkeeper_sso_client 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c9f11b2efdd8c4ed007aa6390d87ff1c936516
-  data.tar.gz: e69fd047adc6b6a2641e331152499ebb4965f9cf
+  metadata.gz: d023a2b0e77cc03d40b7e1fbc979d3b6f4c518bf
+  data.tar.gz: 5c38e72b6e17927ed4b534a7a8916618703893bd
 SHA512:
-  metadata.gz: 701069b5f57bbc69ce250d5baef0a714bfad5910c4a04bb324fdaaede4aecf5bad5f1dc38b2e15e21774bf6e2bd4910bfa91a61003d1f318159f28747b274e37
-  data.tar.gz: 2af04057c7c01621c6b507ab5c5a37abff79d45c1cb85afd8da09dc6cebb6c3e911456c98fd90704ef81a7c58f335d22e162136afe3826cdd70488ea61b29d07
+  metadata.gz: 37366c8de0979e3da04321c43933eb84e5593f5140f9eacd4280c8c90c1d3996c19acde2f5ccab23e26ad2b226ef03d77dfd6a655f981da992cc5fa299fd09d8
+  data.tar.gz: 83f88664f332726c72bee19d970adf2f163802cbab0387ba7521a87dac87493910a14d78620c83d410740e3a5d70d5238b40c7a7bf85b7516288c0fad26fa8f7

data/lib/doorkeeper_sso_client/mixins.rb

@@ -1,5 +1,7 @@
+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'
 
 module DoorkeeperSsoClient
   module Mixins

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

@@ -28,6 +28,7 @@ module DoorkeeperSsoClient
               end
 
               def sign_out(resource_or_scope=nil)
+                return sign_out_all_scopes unless resource_or_scope
                 if scope_match? resource_or_scope, :#{scope}
                   session['passport_id'] = nil
                 end

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

@@ -6,7 +6,6 @@ module DoorkeeperSsoClient
 
         def sign_out(resource_or_scope=nil)
           @controller.sign_out(resource_or_scope)
-          super
         end
       end # TestHelpers
     end

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

@@ -0,0 +1,40 @@
+require_dependency 'mongoid'
+
+module DoorkeeperSsoClient
+  module Mixins
+    module Mongoid
+      module Passport
+        extend ActiveSupport::Concern
+
+        include ::Mongoid::Document
+        include ::Mongoid::Timestamps
+        include ::DoorkeeperSsoClient::Mixins::PassportBase
+
+        included do
+          field :identity_id, type: Integer
+          field :identity_type, type: String
+          field :secret, type: String
+          field :state, type: String
+          field :chip, type: String
+          field :verified, type: Boolean, default: false
+          field :modified, type: Boolean, default: false
+          field :created_at, type: DateTime
+          field :updated_at, type: DateTime
+          field :uid, type: String
+          field :token, type: String
+          field :refresh_token, type: String
+          field :token_expiry, type: DateTime
+          field :revoked_at, type: DateTime
+          field :revoke_reason, type: String
+          field :last_login_at, type: DateTime
+        end
+
+        module ClassMethods
+          def find_by_uid(uid)
+            passport = where(uid: uid).first
+          end
+        end # ClassMethods
+      end # Passport
+    end # Mongoid
+  end # Mixins
+end # DoorkeeperSsoClient

data/lib/doorkeeper_sso_client/mixins/passport_base.rb

@@ -0,0 +1,61 @@
+require_dependency 'mongoid'
+
+module DoorkeeperSsoClient
+  module Mixins
+    module PassportBase
+      extend ActiveSupport::Concern
+
+      included do
+        belongs_to :identity, polymorphic: true
+        validates :uid, presence: true, uniqueness: true
+      end
+
+      module ClassMethods
+        def create_from_omniauth(auth_hash)
+          passport = where(uid: auth_hash["extra"]["passport_id"]).first_or_initialize
+          passport.update_attributes!(
+            secret: auth_hash["extra"]["passport_secret"],
+            token: auth_hash["credentials"]["token"],
+            refresh_token: auth_hash["credentials"]["refresh_token"],
+            token_expiry:  auth_hash["credentials"]["expiry"],
+            revoked_at: nil,
+            revoke_reason: nil,
+            last_login_at: Time.current
+          )
+        end
+      end # ClassMethods
+
+      def update_from_pingback(pingback_hash)
+        update_attributes!(
+          revoked_at: pingback_hash["revoked_at"],
+          revoke_reason: pingback_hash["revoke_reason"],
+          last_login_at: pingback_hash["activity_at"]
+        )
+      end
+
+      def verified!
+        update_attribute(:verified, true)
+      end
+
+      def unverified?
+        !verified?
+      end
+
+      def modified!
+        update_attribute(:modified, true)
+      end
+
+      def unmodified?
+        !modified?
+      end
+
+      def delta
+        { state: state, user: user }
+      end
+
+      def active?
+        revoked_at.blank?
+      end
+    end # Passport
+  end # Mixins
+end # DoorkeeperSsoClient

data/lib/doorkeeper_sso_client/version.rb

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

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

@@ -89,6 +89,13 @@ RSpec.describe "DoorkeeperSsoClient::Mixins::Devise::ControllerHelpers DeviseHoo
         expect(controller.session['passport_id']).to eq passport.uid
       end
     end
+
+    context "no scope" do
+      it "sign_out_all_scopes if nil passed" do
+        expect(controller).to receive(:sign_out_all_scopes)
+        sign_out
+      end
+    end
   end
 
   describe "#sign_out_all_scopes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso_client
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +346,8 @@ files:
 - lib/doorkeeper_sso_client/mixins.rb
 - lib/doorkeeper_sso_client/mixins/devise/controller_helpers.rb
 - lib/doorkeeper_sso_client/mixins/devise/test_helpers.rb
+- lib/doorkeeper_sso_client/mixins/mongoid/passport.rb
+- lib/doorkeeper_sso_client/mixins/passport_base.rb
 - lib/doorkeeper_sso_client/passport_verifier.rb
 - lib/doorkeeper_sso_client/version.rb
 - lib/doorkeeper_sso_client/warden/hooks/after_fetch.rb