sso_clyent 0.0.7.31 → 0.0.7.32

data/lib/sso_clyent/controllers/current_user_helpers.rb

@@ -1,69 +1,63 @@
-module CurrentUserHelpers
-  def login_required
-    if !current_user
-      return respond_to do |format|
-        format.html { redirect_to login_path }
-        format.json { render :json => { 'error' => 'Access Denied' }.to_json }
+module SsoClyent
+  module CurrentUserHelpers
+  
+    def self.included base
+      base.send :before_filter, :sso_clyent_check_if_from_sign_up
+      base.send :before_filter, :sso_clyent_store_return_to_url
+    end
+    
+    def login_required
+      if !current_user
+        return respond_to do |format|
+          format.html { redirect_to sso_login_path }
+          format.json { render :json => { 'error' => 'Access Denied' }.to_json }
+        end
       end
     end
-  end
-  
-  def login_path
-    "#{SsoClyent.path}/auth/sso"
-  end
-  
-  def logout_path
-    "#{SsoClyent.path}/logout"
-  end
   
-  def signup_path
-    SsoClyent.signup_url
-  end
-
-  def edit_account_path
-    SsoClyent.edit_account_url
-  end
-
-  def current_user
-    return nil unless session[:user_id]
-    users = user_klass
-    uid = userid
-    if users.respond_to?(:"find_by_#{uid}")
-      @current_user ||= users.send(:"find_by_#{uid}", session[:user_id]['uid'])
+    def current_user
+      return nil unless session[:user_id]
+      users = sso_clyent_user_klass
+      uid = sso_clyent_userid
+      if users.respond_to?(:"find_by_#{uid}")
+        @current_user ||= users.send(:"find_by_#{uid}", session[:user_id]['uid'])
+      end
     end
-  end
   
-  def user_signed_in?
-    !!current_user
-  end
+    def user_signed_in?
+      !!current_user
+    end
   
-  def check_for_login_error api_response
-    current_user_logout if !api_response.is_a? Array and api_response.try(:[],:error).try(:==,'401 Unauthorized')
-  end
+    def check_for_login_error api_response
+      current_user_logout if !api_response.is_a?(Array) and api_response.try(:[],:error).try(:==,'401 Unauthorized')
+    end
 
-  def current_user_logout
-    session[:user_id] = nil
-  end
+    def current_user_logout
+      session[:user_id] = nil
+    end
 
-  def user_klass
-    SsoClyent.user_class
-  end
+    def sso_clyent_user_klass
+      SsoClyent.user_class
+    end
 
-  def userid
-    SsoClyent.unique_id
-  end
+    def sso_clyent_userid
+      SsoClyent.unique_id
+    end
   
-  def check_if_from_sign_up
-    if from_sign_up = params.delete(:from_sign_up)
-      login_required
-      begin process_params_from_sign_up(from_sign_up)
-      rescue
-      end
-      unless performed?
-        return redirect_to(url_for(params))
+    def sso_clyent_check_if_from_sign_up
+      if from_sign_up = params.delete(:from_sign_up)
+        login_required
+        begin process_params_from_sign_up(from_sign_up)
+        rescue
+        end
+        unless performed?
+          return redirect_to(url_for(params))
+        end
       end
     end
+    
+    def sso_clyent_store_return_to_url
+      (session['for_sign_up'] ||= {})['send_back_to'] = session['return-to-url'] = request.url
+    end
   end
-end
-ActionController::Base.send :include, CurrentUserHelpers
-ActionController::Base.send :before_filter, :check_if_from_sign_up
+end

data/lib/sso_clyent/controllers/path_helpers.rb

@@ -0,0 +1,21 @@
+module SsoClyent
+  module PathHelpers
+  
+    def login_path
+      "#{SsoClyent.path}/auth/sso"
+    end
+
+    def logout_path
+      "#{SsoClyent.path}/logout"
+    end
+
+    def signup_path
+      SsoClyent.signup_url
+    end
+
+    def edit_account_path
+      SsoClyent.edit_account_url
+    end
+
+  end
+end

data/lib/sso_clyent/engine.rb

@@ -1,4 +1,5 @@
 require_relative './helpers/current_user_helpers'
+require_relative './controllers/path_helpers'
 
 module SsoClyent
   class Engine < ::Rails::Engine
@@ -26,8 +27,10 @@ module SsoClyent
       end
     end
     
-    initializer 'sso_clyent.extend_view_helpers' do |app|
+    initializer 'sso_clyent.extend_controllers_and_view_helpers' do |app|
       ActiveSupport.on_load :action_controller do
+        include SsoClyent::CurrentUserHelpers
+        include SsoClyent::PathHelpers
         helper SsoClyent::Helpers::CurrentUserHelpers
       end
     end

data/lib/sso_clyent/helpers/current_user_helpers.rb

@@ -3,7 +3,7 @@ require_relative '../controllers/current_user_helpers'
 module SsoClyent
   module Helpers
     module CurrentUserHelpers
-      include ::CurrentUserHelpers
+      include ::SsoClyent::CurrentUserHelpers
     end
   end
 end

data/lib/sso_clyent/version.rb

@@ -1,3 +1,3 @@
 module SsoClyent
-  VERSION = "0.0.7.31"
+  VERSION = "0.0.7.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sso_clyent
 version: !ruby/object:Gem::Version
-  version: 0.0.7.31
+  version: 0.0.7.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70175890649680 !ruby/object:Gem::Requirement
+  requirement: &70359513219100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70175890649680
+  version_requirements: *70359513219100
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70175890648420 !ruby/object:Gem::Requirement
+  requirement: &70359513218060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70175890648420
+  version_requirements: *70359513218060
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70175890647040 !ruby/object:Gem::Requirement
+  requirement: &70359513216320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175890647040
+  version_requirements: *70359513216320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70175890646240 !ruby/object:Gem::Requirement
+  requirement: &70359513215480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70175890646240
+  version_requirements: *70359513215480
 description: See sso_provyder for the provider part. Based on Devise, Authentifyd
   and joshsoftware/sso-devise-omniauth-client. Parts directly taken from https://github.com/joshsoftware/sso-devise-omniauth-client
 email:
@@ -72,6 +72,7 @@ files:
 - config/routes.rb
 - lib/sso_clyent/base.rb
 - lib/sso_clyent/controllers/current_user_helpers.rb
+- lib/sso_clyent/controllers/path_helpers.rb
 - lib/sso_clyent/engine.rb
 - lib/sso_clyent/helpers/current_user_helpers.rb
 - lib/sso_clyent/omniauth/strategies/sso.rb