koinz 0.0.7 → 0.0.8

data/lib/koinz/controllers/internal_helpers.rb

@@ -6,8 +6,15 @@ module Koinz
       # handles auth_token and two-legged token too
       def login_required
         if !current_user
-          session[:user_id] = nil
-          redirect_to login_required_path
+          respond_to do |format|
+            format.html  { 
+              session[:user_id] = nil
+              redirect_to login_required_path
+            }
+            format.json {
+              render :json => { 'error' => 'Access Denied' }.to_json
+            }
+          end
         end
       end
 
@@ -54,16 +61,38 @@ module Koinz
 
       def authenticate_token
         if params[:access_token]
-            result = Koinz::OAuth2Client::UserManager.call(params[:access_token], '/auth/koinz/user')
+            result = Koinz::OAuth2Client::UserManager.call(params[:access_token], '/isalive.json')
             return if result.is_a?(Hash) and result[:error]
-            session[:user_id] = result
+
+            # All is well 
+            session[:last_access] = Time.now.utc
         end
       end
 
+      def timedout?
+        return true if not session[:last_access] 
+        (session[:last_access] - DEVISE_TIMEOUT.ago) < 1.minute #grace period
+      end
+
       def current_user
-        authenticate_token unless @current_user
+        authenticate_token if !@current_user or timedout?
+
         # if not session, bail out
         return nil unless session[:user_id]
+
+        if timedout?
+          # get/set session from User Manager
+          result = Koinz::OAuth2Client::UserManager.call(get_session_access_token, '/isalive.json')
+          # session has indeed timed out even from user manager - cleanup!
+          if result.is_a?(Hash) and result[:error]
+            session[:user_id] = nil
+            return nil
+          end
+
+          # All is well
+          session[:last_access] = Time.now.utc
+        end
+
         @current_user ||= get_koinz_user(session[:user_id]['uid'])
       end
     end

data/lib/koinz/version.rb

@@ -1,3 +1,3 @@
 module Koinz
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: koinz
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Gautam Rege
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +05:30
+date: 2011-01-25 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency