bsm-sso-client 0.2.0 → 0.3.4

data/lib/bsm/sso/client/failure_app.rb

@@ -22,7 +22,7 @@ class Bsm::Sso::Client::FailureApp < ActionController::Metal
   end
 
   def redirect!
-    redirect_to Bsm::Sso::Client.user_class.sign_in_url(:service => service_url(env["warden.options"][:attempted_path])), :status => 303
+    redirect_to Bsm::Sso::Client.user_class.sso_sign_in_url(:service => service_url(env["warden.options"][:attempted_path])), :status => 303
   end
 
   def respond_with_js!

data/lib/bsm/sso/client/strategies/http_auth.rb

@@ -9,7 +9,7 @@ class Bsm::Sso::Client::Strategies::HttpAuth < Bsm::Sso::Client::Strategies::Bas
   end
 
   def authenticate!
-    u = user_class.authorize(token)
+    u = user_class.sso_authorize(token)
     u.nil? ? fail!(:invalid) : success!(u)
   end
 

data/lib/bsm/sso/client/strategies/ticket.rb

@@ -6,7 +6,7 @@ class Bsm::Sso::Client::Strategies::Ticket < Bsm::Sso::Client::Strategies::Base
   end
 
   def authenticate!
-    u = user_class.consume(params[:ticket], service_url)
+    u = user_class.sso_consume(params[:ticket], service_url)
     u.nil? ? fail!(:invalid) : success!(u)
   end
 

data/lib/bsm/sso/client/user.rb

@@ -1,36 +1,39 @@
 class Bsm::Sso::Client::User < Bsm::Sso::Client::AbstractResource
   class << self
 
-    def consume(ticket, service)
-      # TODO rename Sso endpoint to /validate
-      find :one, :from => '/validate', :params => { :ticket => ticket, :service => service }
+    def sso_find(id)
+      find id
+    end
+
+    def sso_consume(ticket, service)
+      find :one, :from => '/consume', :params => { :ticket => ticket, :service => service }
     rescue ActiveResource::ResourceInvalid
       nil
     end
 
-    def authorize(token)
+    def sso_authorize(token)
       find :one, :from => '/authorize', :params => { :auth_token => token }
     rescue ActiveResource::ResourceInvalid
       nil
     end
 
-    def authenticate(credentials)
+    def sso_authenticate(credentials)
       find :one, :from => "/authenticate", :params => credentials.slice(:email, :password)
     rescue ActiveResource::ResourceInvalid
       nil
     end
 
-    def sign_in_url(params = {})
-      custom_absolute_method_root_url(:sign_in, params)
+    def sso_sign_in_url(params = {})
+      sso_custom_absolute_method_root_url(:sign_in, params)
     end
 
-    def sign_out_url(params = {})
-      custom_absolute_method_root_url(:sign_out, params)
+    def sso_sign_out_url(params = {})
+      sso_custom_absolute_method_root_url(:sign_out, params)
     end
 
     private
 
-      def custom_absolute_method_root_url(method_name, params = {})
+      def sso_custom_absolute_method_root_url(method_name, params = {})
         "#{site.to_s.chomp('/')}/#{method_name}#{query_string(params)}"
       end
 

data/lib/bsm/sso/client/user_methods.rb

@@ -3,25 +3,34 @@ module Bsm::Sso::Client::UserMethods
 
   included do
     class << self
-      delegate :sign_in_url, :sign_out_url, :to => :"Bsm::Sso::Client::User"
+      delegate :sso_sign_in_url, :sso_sign_out_url, :to => :"Bsm::Sso::Client::User"
     end
   end
 
   module ClassMethods
 
-    def consume(*a)
-      result = Bsm::Sso::Client::User.consume(*a)
-      new(result.attributes) if result
+    def sso_find(id)
+      resource = Bsm::Sso::Client::User.sso_find(id)
+      sso_cache(resource, :find) if resource
     end
 
-    def authenticate(*a)
-      result = Bsm::Sso::Client::User.authenticate(*a)
-      new(result.attributes) if result
+    def sso_consume(*a)
+      resource = Bsm::Sso::Client::User.sso_consume(*a)
+      sso_cache(resource, :consume) if resource
     end
 
-    def authorize(*a)
-      result = Bsm::Sso::Client::User.authorize(*a)
-      new(result.attributes) if result
+    def sso_authenticate(*a)
+      resource = Bsm::Sso::Client::User.sso_authenticate(*a)
+      sso_cache(resource, :authenticate) if resource
+    end
+
+    def sso_authorize(*a)
+      resource = Bsm::Sso::Client::User.sso_authorize(*a)
+      sso_cache(resource, :authorize) if resource
+    end
+
+    def sso_cache(resource, action = nil)
+      new(resource.attributes)
     end
 
   end

data/lib/bsm/sso/client/warden_ext.rb

@@ -5,7 +5,7 @@ class Warden::SessionSerializer
   end
 
   def deserialize(id)
-    Bsm::Sso::Client.user_class.find(id)
+    Bsm::Sso::Client.user_class.sso_find(id)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bsm-sso-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &18984320 !ruby/object:Gem::Requirement
+  requirement: &14509780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *18984320
+  version_requirements: *14509780
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &18983200 !ruby/object:Gem::Requirement
+  requirement: &14508960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *18983200
+  version_requirements: *14508960
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &18981860 !ruby/object:Gem::Requirement
+  requirement: &14495240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -52,10 +52,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *18981860
+  version_requirements: *14495240
 - !ruby/object:Gem::Dependency
   name: rails_warden
-  requirement: &18980200 !ruby/object:Gem::Requirement
+  requirement: &14494520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -63,10 +63,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *18980200
+  version_requirements: *14494520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18967880 !ruby/object:Gem::Requirement
+  requirement: &14494120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -74,10 +74,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18967880
+  version_requirements: *14494120
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &18967420 !ruby/object:Gem::Requirement
+  requirement: &14493640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,10 +85,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18967420
+  version_requirements: *14493640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18967000 !ruby/object:Gem::Requirement
+  requirement: &14493220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -96,10 +96,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18967000
+  version_requirements: *14493220
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &18966380 !ruby/object:Gem::Requirement
+  requirement: &14492780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -107,10 +107,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18966380
+  version_requirements: *14492780
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &18965740 !ruby/object:Gem::Requirement
+  requirement: &14492360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -118,7 +118,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18965740
+  version_requirements: *14492360
 description: ''
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: BSM's internal SSO client