doorkeeper_sso 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b37cfaca0f0f4f0087f9bd86254651caf44e15a
-  data.tar.gz: 8fa3028938be6f401d24481df77f61f8e72d4fbd
+  metadata.gz: 83cabb56cf16ffc50f1c907b6eca037aaa2ef747
+  data.tar.gz: 15314eedab0b7141de0abdf4d3fd096c6d141638
 SHA512:
-  metadata.gz: 81c4872126d84a3cfd6629b4f805c7b0c71093ae118c667051874d30744118e9a36cbf5ba12f82f493b1ec331827a85911799210a999d0459274cf54c4a3bca6
-  data.tar.gz: 1a44dec7b5b5b93820b44e255fcd0b63095f2508e0223b206f9d89b790ee9d50642ab2dfd8bd9b37ff07c8a890ff0a263972ea32babe3dc1713e31060658b992
+  metadata.gz: 41a0d41cee7396b3db3f9155871e23d6b65354c1fe45859374b4bb9ab22217da4b972538e6b537a7fca40d03a2072377b1c7e08314b98d3d8d9d5e9ac6bab3e1
+  data.tar.gz: d6ae977b71310c72e773dfbabbd8ecb19979a37eb48647031d653e5ac2407cf450e41e2a2745acae21fcc9a5657ab3e14d3cdb178cf4793505b3ed8457152d9c

data/app/models/sso/client.rb

@@ -18,6 +18,11 @@ module Sso
       def find_by_access_token(token)
         find_by(access_token: ::Doorkeeper::AccessToken.by_token(token))
       end
+
+      def create_from_access_token(session, token_id)
+        return false unless oauth_token = ::Doorkeeper::AccessToken.find_by(id: token_id)
+        client = session.find_or_create_by(access_token_id: token_id)
+      end
     end
 
     def update_access_token(token)

data/lib/doorkeeper/oauth/request_concern.rb

@@ -0,0 +1,12 @@
+module Doorkeeper
+  module OAuth
+    module RequestConcern
+      include Wisper::Publisher
+
+      def after_successful_response
+        broadcast(:access_token_created, token.id) if respond_to? :token
+        super
+      end
+    end
+  end
+end

data/lib/doorkeeper_sso.rb

@@ -1,4 +1,5 @@
 require "active_model_serializers"
+require "wisper"
 require "sso"
 
 module DoorkeeperSso

data/lib/sso/doorkeeper/authorization/code_mixin.rb

@@ -0,0 +1,20 @@
+# Doorkeeper::OAuth::Authorization::Code extensions
+# This module extends oauth authorization classes to publish a wisper event when token is issued
+
+module Sso
+  module Doorkeeper
+    module Authorization
+      module CodeMixin
+        extend ActiveSupport::Concern
+        include ::Sso::Logging
+
+        def issue_token
+          super
+          broadcast(:access_grant_created, token.id) if @token.try(:id)
+          @token
+        end
+
+      end
+    end
+  end
+end

data/lib/sso/doorkeeper/authorization/token_mixin.rb

@@ -0,0 +1,19 @@
+# Doorkeeper::OAuth::Authorization::Token extensions
+# This module extends oauth authorization classes to publish a wisper event when token is issued
+
+module Sso
+  module Doorkeeper
+    module Authorization
+      module CodeMixin
+        extend ActiveSupport::Concern
+        include ::Sso::Logging
+
+        def issue_token
+          super
+          broadcast(:access_token_created, token.id) if @token.try(:id)
+          @token
+        end
+      end
+    end
+  end
+end

data/lib/sso/doorkeeper/authorizations_controller_mixin.rb

@@ -5,11 +5,22 @@ module Sso
       include ::Sso::Logging
 
       included do
+        around_action :subscribe_to_token_creation, only: [:new, :create]
         after_action :after_grant_create, only: [:new, :create]
       end
 
     protected
 
+      def subscribe_to_token_creation
+        Wisper.subscribe(self) do
+          yield
+        end
+      end
+
+      def access_token_created(token_id)
+        raise "AuthorizationsController#gives token - #{token_id}"
+      end
+
       def after_grant_create
         debug { "AuthorizationsController#Create : after_action" }
         code_response = authorization.instance_variable_get("@response")

data/lib/sso/engine.rb

@@ -26,13 +26,12 @@ module Sso
       ::Doorkeeper::Application.send(:include, Sso::Doorkeeper::ApplicationMixin)
       ::Doorkeeper::AccessGrant.send(:include, Sso::Doorkeeper::AccessGrantMixin)
       ::Doorkeeper::AccessToken.send(:include, Sso::Doorkeeper::AccessTokenMixin)
-
-
+      ::Doorkeeper::OAuth::CodeRequest.send(:include, ::Wisper::Publisher)
       ::Doorkeeper::TokensController.send(:include, AbstractController::Callbacks)
       ::Doorkeeper::TokensController.send(:include, Sso::Doorkeeper::TokensControllerMixin)
       ::Doorkeeper::AuthorizationsController.send(:include, Sso::Doorkeeper::AuthorizationsControllerMixin)
 
-      ::Warden::Manager.after_set_user(scope: :user, &::Sso::Warden::Hooks::CreateMasterSession.to_proc)
+      ::Warden::Manager.after_set_user(scope: :user, except: :fetch, &::Sso::Warden::Hooks::CreateMasterSession.to_proc)
       ::Warden::Manager.before_logout(scope: :user, &::Sso::Warden::Hooks::BeforeLogout.to_proc)
 
       # TODO : Do we want to ensure that session is always active?

data/lib/sso/version.rb

@@ -1,3 +1,3 @@
 module Sso
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/lib/sso.rb

@@ -1,3 +1,4 @@
+require "doorkeeper/oauth/request_concern"
 require "sso/engine"
 require "sso/logging"
 require "sso/warden/support"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: wisper
+  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
@@ -334,11 +348,14 @@ files:
 - db/migrate/20150521142926_create_sso_clients.rb
 - db/migrate/20150521165143_remove_extra_columns_from_sso_sessions.rb
 - db/migrate/20150603145730_add_pingback_uri_to_doorkeeper_applications.rb
+- lib/doorkeeper/oauth/request_concern.rb
 - lib/doorkeeper_sso.rb
 - lib/sso.rb
 - lib/sso/doorkeeper/access_grant_mixin.rb
 - lib/sso/doorkeeper/access_token_mixin.rb
 - lib/sso/doorkeeper/application_mixin.rb
+- lib/sso/doorkeeper/authorization/code_mixin.rb
+- lib/sso/doorkeeper/authorization/token_mixin.rb
 - lib/sso/doorkeeper/authorizations_controller_mixin.rb
 - lib/sso/doorkeeper/tokens_controller_mixin.rb
 - lib/sso/engine.rb
@@ -396,7 +413,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="