capcoauth 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 413293494a485db6a7d32e5f7ebb599b0a140dd1
-  data.tar.gz: f37a26cb400e3c5092b2958799551e13ee433af0
+  metadata.gz: 88d88d5d24669f7c09057d039ed04bcf8f7e4215
+  data.tar.gz: e3126ba3d76375574f63dd3b7f65177e66f1a781
 SHA512:
-  metadata.gz: a6401723ff07e5dc867d4fbbac9a2142c5bba2139d34b0c5969ff1737cb83f5d90fa261103e689eb289b23dce44ba0b046a488f1845496d1554d277ec1878162
-  data.tar.gz: 2d591b42756602ac29116859f224a0780408ddefaf303f53ce3b41d5340504d61fbc49a84242bcb32c655f2b9f5f39830749ca4bf43f5d62753f677e5452e606
+  metadata.gz: c7ed882f4e5786775fa4f858c994398f6bd01720f27ea2da660eec2dd2ae2e3f1d98029c50a9ce49b2c45a2292d0bfd54430d5a87deb13e467739a842022fbc3
+  data.tar.gz: c41136838fe6f2e529b2f290a1b27e7860983c756e089e1751bb3bece86c61bf9d54598c38741a077357fc161ba2f3c2222224a24f8d8104f8c0f48fdced2b84

data/lib/capcoauth/oauth/access_token.rb

@@ -6,6 +6,7 @@ module Capcoauth
 
       def initialize(token)
         @token = token
+        @user_id = TTLCache.user_id_for(token)
       end
 
       def verify

data/lib/capcoauth/oauth/token_verifier.rb

@@ -9,7 +9,7 @@ module Capcoauth
 
       def self.verify(access_token)
         raise UnauthorizedError if access_token.blank? or access_token.token.blank?
-        return access_token if TTLCache.valid?(access_token.token)
+        return access_token if TTLCache.user_id_for(access_token.token)
 
         # Call Capcoauth
         response = ::HTTParty.get("#{Capcoauth.configuration.capcoauth_url}/oauth/token/info", {
@@ -23,7 +23,7 @@ module Capcoauth
           access_token.user_id = response.parsed_response['resource_owner_id']
           if response.parsed_response.fetch('application', {}).fetch('uid', nil) === Capcoauth.configuration.client_id
             logger.info("CapcOAuth: The access token for user ##{access_token.user_id} was verified successfully") unless logger.nil?
-            TTLCache.update(access_token.token)
+            TTLCache.update(access_token.token, access_token.user_id)
             access_token
           else
             logger.info("CapcOAuth: The access token for user ##{access_token.user_id} was valid, but for a different OAuth client ID") unless logger.nil?

data/lib/capcoauth/oauth/ttl_cache.rb

@@ -3,13 +3,14 @@ module Capcoauth
     class TTLCache
       @@cache = {}
 
-      def self.valid?(access_token)
+      def self.user_id_for(access_token)
         purge
-        !!@@cache[access_token]
+        return @@cache[access_token][:user_id] if @@cache[access_token].present?
+        nil
       end
 
-      def self.update(access_token)
-        @@cache[access_token] = Time.zone.now
+      def self.update(access_token, user_id)
+        @@cache[access_token] = { last_checked: Time.zone.now, user_id: user_id }
       end
 
       def self.remove(access_token)
@@ -18,7 +19,7 @@ module Capcoauth
 
       def self.purge
         @@cache.delete_if do |k, v|
-          Time.zone.now > v + Capcoauth.configuration.token_verify_ttl
+          Time.zone.now > v[:last_checked] + Capcoauth.configuration.token_verify_ttl
         end
       end
     end

data/lib/capcoauth/rails/helpers.rb

@@ -29,7 +29,8 @@ module Capcoauth
       end
 
       def current_user
-        @user ||= User.find_by_id verify_authorized!
+        verify_authorized!
+        @current_user ||= User.find_by_id @current_user_id
       end
 
       protected

data/lib/capcoauth/version.rb

@@ -1,3 +1,3 @@
 module Capcoauth
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capcoauth
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Adam Robertson