sso_clyent 0.0.7.38 → 0.1.0

data/lib/sso_clyent.rb

@@ -22,6 +22,7 @@ module SsoClyent
     @@signup_url = config[:signup_url] || "#{@@provyder[:url]}/users/sign_up"
     @@login_url = config[:login_url] || "#{@@provyder[:url]}/users/sign_in"
     @@edit_account_url = config[:edit_account_url] || "#{@@provyder[:url]}/users/edit"
+    @@login_timeout = config[:login_timeout] || 9.minutes
   end
 
   def self.user_class

data/lib/sso_clyent/controllers/current_user_helpers.rb

@@ -2,12 +2,17 @@ module SsoClyent
   module CurrentUserHelpers
   
     def self.included base
-      unless base.is_a?(Module)
-        base.send :before_filter, :sso_clyent_check_if_from_sign_up
-        base.send :before_filter, :sso_clyent_store_return_to_url
+      if base.is_a?(Class)
+        base.send :prepend_before_filter, :sso_clyent_check_if_from_sign_up
+        base.send :prepend_before_filter, :sso_clyent_store_return_to_url
       end
     end
     
+    def fresh_login_required
+      current_user_logout
+      login_required
+    end
+    
     def login_required
       if !current_user
         return respond_to do |format|
@@ -18,13 +23,18 @@ module SsoClyent
     end
   
     def current_user
-      return nil unless session[:user_id]
+      return nil unless sso_clyent_session_active?
       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
+    
+    def sso_clyent_session_active?
+      session[:user_id] = nil if Time.now - session[:sso_clyent_last_login] > SsoClyent.login_timeout
+      session[:user_id]
+    end
   
     def user_signed_in?
       !!current_user
@@ -59,6 +69,7 @@ module SsoClyent
     end
     
     def sso_clyent_store_return_to_url
+      puts "sso_clyent_store_return_to_url"
       (session['for_sign_up'] ||= {})['send_back_to'] = session['return-to-url'] = request.url
     end
   end

data/lib/sso_clyent/version.rb

@@ -1,3 +1,3 @@
 module SsoClyent
-  VERSION = "0.0.7.38"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sso_clyent
 version: !ruby/object:Gem::Version
-  version: 0.0.7.38
+  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: &70336545198980 !ruby/object:Gem::Requirement
+  requirement: &70195582569900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *70336545198980
+  version_requirements: *70195582569900
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
-  requirement: &70336545197660 !ruby/object:Gem::Requirement
+  requirement: &70195582569040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70336545197660
+  version_requirements: *70195582569040
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70336545197040 !ruby/object:Gem::Requirement
+  requirement: &70195582567240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336545197040
+  version_requirements: *70195582567240
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70336545196300 !ruby/object:Gem::Requirement
+  requirement: &70195582566460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70336545196300
+  version_requirements: *70195582566460
 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: