lib/unimatrix/authorization/railtie.rb in unimatrix-2.9.0 vs lib/unimatrix/authorization/railtie.rb in unimatrix-3.0.0

@@ -16,10 +16,12 @@
         "keymaker-policies-#{ Digest::SHA1.hexdigest( key ) }",
         expires_in: 1.minute
       ) do
         request_policies( resource_name, access_token, realm_uuid, resource_server )
       end
+    else
+      nil
     end
   end
 
   def retrieve_resource_owner( access_token )
     if access_token
@@ -27,9 +29,43 @@
         "keymaker-resource_owner-#{ Digest::SHA1.hexdigest( access_token ) }",
         expires_in: 1.minute
       ) do
         request_resource_owner( access_token )
       end
+    else
+      nil
+    end
+  end
+  
+  def retrieve_client_token( client_id, client_secret )
+    if client_id && client_secret
+      key        = [ client_id, client_secret ].join
+      expires_in = nil
+      
+      token = Rails.cache.fetch(
+        "keymaker-client_token-#{ Digest::SHA1.hexdigest( key ) }",
+        expires_in: 1.minute
+      ) do
+        token_hash = request_client_token( client_id, client_secret )
+        
+        if token_hash && token_hash[ :expires_in ] && token_hash[ :expires_in ] < 60
+          expires_in = token_hash[ :expires_in ]
+        end
+        
+        token_hash[ :access_token ] rescue nil
+      end
+      
+      if expires_in
+        Rails.cache.write(
+          "keymaker-client_token-#{ Digest::SHA1.hexdigest( key ) }",
+          token,
+          expires_in: expires_in
+        )
+      end
+      
+      token
+    else
+      nil
     end
   end
 
 end