auth_passport_checkpoint 0.0.17.29 → 0.1.0

data/lib/auth_passport_checkpoint/engine.rb

@@ -8,12 +8,7 @@ module AuthPassportCheckpoint
     initializer "auth_passport_checkpoint.configure" do |app|
       AuthPassportCheckpoint.configure(app.config.auth_passport_checkpoint)
       
-      require 'auth_passport_checkpoint/frontend_app/access_token_helper'
-      require 'auth_passport_checkpoint/intermediary_api/access_token_helper'
-      require 'auth_passport_checkpoint/intermediary_api/current_user_helper'
-      require 'auth_passport_checkpoint/booster'
-      require 'auth_passport_checkpoint/signed_request'
-      
+      require 'auth_passport_checkpoint/helpers/controller_helpers'      
       
       if ::AuthPassportCheckpoint.is_intermediary_api?
         ::AuthOriginControl.setup do |config|

data/lib/auth_passport_checkpoint/helpers/controller_helpers/access_token_helper.rb

@@ -0,0 +1,14 @@
+module AuthPassportCheckpoint
+  module AccessTokenHelper
+    
+    def current_access_token
+      unless token = params[:access_token]
+        return nil unless session['user_id']
+        token = session['user_id'].try(:credentials).try(:token)
+      end
+      token
+    end
+    
+    ActiveSupport.run_load_hooks :auth_passport_checkpoint_access_token_helper, self
+  end
+end

data/lib/auth_passport_checkpoint/helpers/controller_helpers/current_user_helper.rb

@@ -0,0 +1,41 @@
+module AuthPassportCheckpoint
+  module CurrentUserHelper
+    module ForIntermediaryApi
+      def login_required     
+        if !current_user
+          error = { 'error' => '401 Unauthorized', 'status' => 401 }
+          if Object.const_defined?("Grape") and self.class == Grape::Endpoint
+            error!('401 Unauthorized', 401)
+          else
+            render :json => error.to_json
+          end
+        end
+      end
+  
+      def current_user
+        return @current_user if @current_user 
+        if result = user_signed_request_result(AuthPassportCheckpoint.current_user_url)
+          return @current_user ||= OpenStruct.new(result)
+        end        
+        nil
+      end
+      
+      ActiveSupport.run_load_hooks :auth_passport_checkpoint_current_user_helper_for_intermediary_api, self
+    end
+
+    module ForAll
+      def self.included base 
+        base.send :extend, ForAll::ClassMethods
+        puts "included in #{base.to_s}"
+      end
+      
+      module ClassMethods
+        def make_auth_passport_checkpoint_intermediary_api
+          self.send(:include, AuthPassportCheckpoint::CurrentUserHelper::ForIntermediaryApi)
+        end
+      end
+      
+      ActiveSupport.run_load_hooks :auth_passport_checkpoint_current_user_helper_for_all, self
+    end
+  end
+end

data/lib/auth_passport_checkpoint/helpers/controller_helpers/signed_request.rb

@@ -0,0 +1,42 @@
+module AuthPassportCheckpoint
+  module SignedRequestHelper
+    extend ActiveSupport::Concern
+  
+    def user_signed_request_result(request_uri, args = {})
+      if kurrent_user = AuthPassportCheckpoint::Booster.get(current_access_token)
+       return kurrent_user
+      else
+        request_params = (args[:params] || {}).merge({access_token: current_access_token})
+        result = AuthOriginControl::SignedRequest.new(request_uri, args.merge({:payload => request_params})).try(:result)
+        if result = success_result(result) 
+          AuthPassportCheckpoint::Booster.set current_access_token, result
+          return AuthPassportCheckpoint::Booster.get(current_access_token) || result
+        end
+      end
+      nil
+    end
+  
+    def signed_request_result(request_uri, args = {}, redirect=true)
+      begin
+        kurrent_access_token = current_access_token
+      rescue NoMethodError
+        kurrent_access_token = args[:params].try(:[],:acces_token)
+      end
+      request_params = (args[:params] || {}).merge({access_token: kurrent_access_token})
+      raw_result = AuthOriginControl::SignedRequest.new(request_uri, args.merge({:payload => request_params})).try(:result)
+      if result = success_result(raw_result)
+        result
+      else
+        return redirect ? redirect_to(AuthPassportCheckpoint.authenticate_redirect_url(self)) : raw_result
+      end
+    end
+    
+    def success_result r
+      error = (r.is_a?(Hash) and r.try(:[],:error) || r.try(:[],"error"))
+      return r unless error
+      nil
+    end
+  
+    ActiveSupport.run_load_hooks(:auth_passport_checkpoint_signed_request_helper, self)
+  end
+end

data/lib/auth_passport_checkpoint/helpers/controller_helpers.rb

@@ -0,0 +1,34 @@
+require 'auth_passport_checkpoint/helpers/controller_helpers/access_token_helper'
+require 'auth_passport_checkpoint/helpers/controller_helpers/current_user_helper'
+require 'auth_passport_checkpoint/helpers/controller_helpers/booster'
+require 'auth_passport_checkpoint/helpers/controller_helpers/signed_request'
+
+module AuthPassportCheckpoint
+  module ControllerHelpers
+    
+    def self.included base
+      include_dependents base
+    end
+    
+    def self.include_dependents base
+      base.send :include, AuthOriginControl::Helpers # from AuthOriginControl
+      base.send :include, AuthPassportCheckpoint::AccessTokenHelper
+      if AuthPassportCheckpoint.is_intermediary_api?
+        base.send :include, AuthPassportCheckpoint::CurrentUserHelper::ForIntermediaryApi
+      else
+        base.send :include, AuthPassportCheckpoint::CurrentUserHelper::ForAll
+      end
+      base.send :include, AuthPassportCheckpoint::SignedRequestHelper
+    end
+    include_dependents self
+    
+    this = self
+    ActiveSupport.on_load :action_controller do
+      ActiveSupport.run_load_hooks :auth_passport_checkpoint_controller_helpers, this
+    end
+    
+    ActiveSupport.on_load :auth_passport_checkpoint_controller_helpers do
+      ActionController::Base.send :include, self
+    end    
+  end
+end

data/lib/auth_passport_checkpoint/version.rb

@@ -1,3 +1,3 @@
 module AuthPassportCheckpoint
-  VERSION = "0.0.17.29"
+  VERSION = "0.1.0"
 end

data/lib/auth_passport_checkpoint.rb

@@ -17,7 +17,17 @@ module AuthPassportCheckpoint
   
   mattr_accessor :redis_connection
   def self.redis_connection
-    @@redis_connection ||= @@redis_config ? Redis.new(@@redis_config) : nil
+    @@redis_connection ||= try_redis_connection
+  end
+  
+  def self.try_redis_connection
+    begin
+      redis = @@redis_config ? Redis.new(@@redis_config) : nil
+      redis.keys
+      redis
+    rescue Redis::CannotConnectError => e
+      nil
+    end
   end
     
   mattr_accessor :redis_cache_expiration, :redis_config
@@ -25,6 +35,12 @@ module AuthPassportCheckpoint
     @@is_intermediary_api = args[:is_intermediary_api] || false
     @@current_user_url = args[:current_user_url]
     @@redis_config = args[:redis_config]
-    @@redis_cache_expiration = args[:redis_cache_expiration] || 360
+    @@redis_cache_expiration = args[:redis_cache_expiration] || 9.minutes
+    @@authenticate_redirect_url = args[:authenticate_redirect_url]
   end  
+  
+  mattr_accessor :authenticate_redirect_url
+  def self.authenticate_redirect_url context
+    @@authenticate_redirect_url ||= context.login_path
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auth_passport_checkpoint
 version: !ruby/object:Gem::Version
-  version: 0.0.17.29
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70267725771000 !ruby/object:Gem::Requirement
+  requirement: &70366743684880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,32 +21,32 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70267725771000
+  version_requirements: *70366743684880
 - !ruby/object:Gem::Dependency
   name: auth_origin_control
-  requirement: &70267725770460 !ruby/object:Gem::Requirement
+  requirement: &70366743684360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70267725770460
+  version_requirements: *70366743684360
 - !ruby/object:Gem::Dependency
   name: sso_clyent
-  requirement: &70267725739500 !ruby/object:Gem::Requirement
+  requirement: &70366743683900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70267725739500
+  version_requirements: *70366743683900
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70267725739000 !ruby/object:Gem::Requirement
+  requirement: &70366743683340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70267725739000
+  version_requirements: *70366743683340
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70267725738300 !ruby/object:Gem::Requirement
+  requirement: &70366743682960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70267725738300
+  version_requirements: *70366743682960
 description: ! 'Checks id at entry: id of users on client apps and on intermediary
   apps (sso_clyent), id of apps on intermediary apps (auth_origin_control), id '
 email:
@@ -80,12 +80,12 @@ files:
 - app/helpers/auth_passport_checkpoint/application_helper.rb
 - app/views/layouts/auth_passport_checkpoint/application.html.erb
 - config/routes.rb
-- lib/auth_passport_checkpoint/booster.rb
 - lib/auth_passport_checkpoint/engine.rb
-- lib/auth_passport_checkpoint/frontend_app/access_token_helper.rb
-- lib/auth_passport_checkpoint/intermediary_api/access_token_helper.rb
-- lib/auth_passport_checkpoint/intermediary_api/current_user_helper.rb
-- lib/auth_passport_checkpoint/signed_request.rb
+- lib/auth_passport_checkpoint/helpers/controller_helpers/access_token_helper.rb
+- lib/auth_passport_checkpoint/helpers/controller_helpers/booster.rb
+- lib/auth_passport_checkpoint/helpers/controller_helpers/current_user_helper.rb
+- lib/auth_passport_checkpoint/helpers/controller_helpers/signed_request.rb
+- lib/auth_passport_checkpoint/helpers/controller_helpers.rb
 - lib/auth_passport_checkpoint/version.rb
 - lib/auth_passport_checkpoint.rb
 - lib/tasks/auth_passport_checkpoint_tasks.rake

data/lib/auth_passport_checkpoint/frontend_app/access_token_helper.rb

@@ -1,24 +0,0 @@
-# module AccessTokenHelper
-#   extend ActiveSupport::Concern
-#   
-#   def current_access_token
-#     return nil unless session[:user_id]
-#     session[:user_id]['access_token']
-#   end
-# end
-# if !AuthPassportCheckpoint.is_intermediary_api?
-#   ActionController::Base.send :include, AccessTokenHelper
-# end
-
-# REMOVED THE INTERMEDIARY API LOGIC - Useless
-#
-# if !AuthPassportCheckpoint.is_intermediary_api?
-#   module AuthPassportCheckpoint
-#     module Helper
-#       def current_access_token
-#         return nil unless session['user_id']
-#         session['user_id'].try(:credentials).try(:token)
-#       end
-#     end
-#   end
-# end

data/lib/auth_passport_checkpoint/intermediary_api/access_token_helper.rb

@@ -1,25 +0,0 @@
-module AuthPassportCheckpoint
-  module IntermediaryApi
-    module AccessTokenHelper
-      
-      def current_access_token
-        unless token = params[:access_token]
-          return nil unless session['user_id']
-          token = session['user_id'].try(:credentials).try(:token)
-        end
-        token
-      end
-      
-    end
-  end
-end
-
-# REMOVED THE INTERMEDIARY API LOGIC - Useless
-#
-#if AuthPassportCheckpoint.is_intermediary_api?
-module AuthPassportCheckpoint
-  module Helper
-    include AuthPassportCheckpoint::IntermediaryApi::AccessTokenHelper
-  end
-end
-#end

data/lib/auth_passport_checkpoint/intermediary_api/current_user_helper.rb

@@ -1,47 +0,0 @@
-module AuthPassportCheckpoint
-  module IntermediaryApi
-    module CurrentUserHelper
-      module ForIntermediaryApi
-        def login_required     
-          if !current_user
-            error = { 'error' => '401 Unauthorized', 'status' => 401 }
-            if Object.const_defined?("Grape") and self.class == Grape::Endpoint
-              error!('401 Unauthorized', 401)
-            else
-              render :json => error.to_json
-            end
-          end
-        end
-    
-        def current_user
-          return @current_user if @current_user 
-        
-          result = user_signed_request_result(AuthPassportCheckpoint.current_user_url)
-          @current_user ||= (result.try(:[],:error) || result.try(:[],"error")) ? nil : result
-        end
-      end
-
-      module ForAll
-        extend ActiveSupport::Concern
-        
-        module ClassMethods
-          def make_auth_passport_checkpoint_intermediary_api
-            self.send(:include, AuthPassportCheckpoint::IntermediaryApi::CurrentUserHelper::ForIntermediaryApi)
-          end
-        end
-      end
-    end
-  end
-end
-
-if AuthPassportCheckpoint.is_intermediary_api?
-  module AuthPassportCheckpoint
-    module Helper
-      include AuthPassportCheckpoint::IntermediaryApi::CurrentUserHelper::ForIntermediaryApi
-    end
-  end
-else
-  class ActionController::Base
-    include AuthPassportCheckpoint::IntermediaryApi::CurrentUserHelper::ForAll
-  end
-end

data/lib/auth_passport_checkpoint/signed_request.rb

@@ -1,32 +0,0 @@
-module SignedRequestHelper
-  extend ActiveSupport::Concern
-  
-  def user_signed_request_result(request_uri, args = {})
-    logger.debug current_access_token
-    if kurrent_user = AuthPassportCheckpoint::Booster.get(current_access_token)
-      kurrent_user
-    else
-      request_params = (args[:params] || {}).merge({access_token: current_access_token})
-      AuthPassportCheckpoint::Booster.set current_access_token, AuthOriginControl::SignedRequest.new(request_uri, args.merge({:payload => request_params})).try(:result)
-      AuthPassportCheckpoint::Booster.get(current_access_token)
-    end
-  end
-  
-  def signed_request_result(request_uri, args = {})
-    current_access_token = respond_to?(:current_access_token) ? current_access_token : args[:params].try(:[],:acces_token)
-    request_params = (args[:params] || {}).merge({access_token: current_access_token})
-    AuthOriginControl::SignedRequest.new(request_uri, args.merge({:payload => request_params})).try(:result)
-  end
-end
-
-module AuthPassportCheckpoint
-  module Helper
-    include AuthOriginControl::Helpers # from AuthOriginControl
-    include SignedRequestHelper
-  end
-end
-
-class ActionController::Base
-  include AuthPassportCheckpoint::Helper
-end
-