devise-rownd 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce95c890c9eaefb6188d86384d0b895d12263a54b50869202fd1913fd0137741
-  data.tar.gz: 8cd89c98656cdeff0dd3845e69d9b8441147fe334ccaeee06ab6ed49b05f93ce
+  metadata.gz: d54df50c4a7815d8fe0ee291891134f7e1fbb9f9afebb935b48e6f34ec649467
+  data.tar.gz: 24410b4335a8e44ed8d1bb62215ce43ec8215e5d3ef949565c022ce533188f6b
 SHA512:
-  metadata.gz: 51753f3cc575a7683641c42ccf7d6e2a019bb9dbc2e1791ff8a07149e4c84e282d7d00f0c1b8e45a310f45afaaba99a58b64a0ea48330c745323ebd010e8b8c9
-  data.tar.gz: 35c90e573f0143dfe8ca6d3119d0b27a33b0f080c2a2e82449ba13f116d6a9b01bd4d4a67b763b8c0d3402ed5fe27825317387fdc6749502510604dca824aec9
+  metadata.gz: 4323c21cdf8ba62dc8d11c4c95016064987ca2d256cef7e525cc635286ad57d2fd40fc2d52708677d5d6a970ad335800cd728326befdfbc34dc9e9d8dbd535d9
+  data.tar.gz: c835bc2862a1338fb379c0578a4dc9493a372ff0aadf1ec4f1aebb011a383a595b401b5e1868ea53a0584cf8118c5ff3d543525216ff9d20f1148d958205780a

data/app/controllers/devise/rownd/auth_controller.rb

@@ -20,9 +20,11 @@ module Devise::Rownd
         warden.authenticate!(scope: :user)
       end
 
+      warden.authenticate!(scope: :user)
+
       render json: {
         message: 'Successfully authenticated user',
-        should_refresh_page: new_access_token || session[:rownd_stale_data] == true,
+        should_refresh_page: new_access_token || session[:rownd_stale_data] == true
       }, status: :ok
     end
 

data/config/initializers/app_config.rb

@@ -1,19 +1,25 @@
 require 'devise/rownd/api'
+require 'devise/rownd/caching'
 
 module Devise
   module Rownd
     include API
 
     def app_config
-      fetch_app_config
+      config = Devise::Rownd::Caching.fetch('rownd_app_config', 15.minutes) { fetch_app_config }
+
+      raise 'Failed to fetch app config' unless config
+
+      config
     end
 
     def self.fetch_app_config
-      Rails.cache.fetch("rownd_app_config", expires_in: 15.minutes) do
-        response = API.make_api_call('/hub/app-config', { method: 'GET',
-                                                          headers: { 'x-rownd-app-key' => app_key } })
-        response.body['app'] if response.success?
-      end
+      response = API.make_api_call('/hub/app-config', { method: 'GET',
+                                                        headers: { 'x-rownd-app-key' => app_key } })
+      return response.body['app'] if response.success?
+
+      Rails.logger.error("Failed to fetch app config from Rownd: #{response.body['message']}")
+      nil
     end
 
     module_function :app_config

data/lib/devise/rownd/caching.rb

@@ -0,0 +1,30 @@
+require 'async'
+
+module Devise::Rownd
+  module Caching
+    def fetch(cache_key, ttl)
+      cache_val = Rails.cache.read(cache_key)
+
+      # If there's nothing in the cache, yield the value and write it to cache
+      if cache_val.nil?
+        return_value = yield
+        Rails.cache.write(cache_key, [return_value, Time.now]) if return_value
+      else
+        return_value = cache_val[0]
+        last_fetch_time = cache_val[1]
+
+        # Start a new thread to update the cached value if the TTL is exceeded
+        Async do
+          if Time.now - last_fetch_time > ttl
+            new_value = yield
+            Rails.cache.write(cache_key, [new_value, Time.now]) if new_value
+          end
+        end
+      end
+
+      return_value
+    end
+
+    module_function :fetch
+  end
+end

data/lib/devise/rownd/strategies/rownd_authenticatable.rb

@@ -2,6 +2,7 @@ require 'devise'
 require 'devise/strategies/authenticatable'
 require 'devise/rownd/user'
 require 'devise/rownd/api'
+require 'devise/rownd/caching'
 require 'jose'
 
 require_relative '../../../../config/initializers/app_creds'
@@ -20,18 +21,26 @@ module Devise
         @access_token = session[:rownd_user_access_token]
         return fail!('No Access Token') unless @access_token
 
-        @decoded_jwt = verify_token(@access_token)
-        @app_id = @decoded_jwt['aud'].find(/^app:.+/).first.split(':').last
+        begin
+          @decoded_jwt = verify_token(@access_token)
 
-        configured_app_id = Devise::Rownd.app_id
-        ok = @app_id == configured_app_id
-        return fail!('JWT not authorized for app') unless ok
+          @app_id = @decoded_jwt['aud'].find(/^app:.+/).first.split(':').last
 
-        rownd_user = Devise::Rownd::User.new(fetch_user)
+          configured_app_id = Devise::Rownd.app_id
+          ok = @app_id == configured_app_id
+          return fail!('JWT not authorized for app') unless ok
 
-        return fail!(:unable_to_authenticate) unless rownd_user
+          user_data = fetch_user
+          return fail!('Failed to fetch user') unless user_data
 
-        success!(rownd_user)
+          rownd_user = Devise::Rownd::User.new(user_data)
+
+          return fail!('Failed to initialize user') unless rownd_user
+
+          success!(rownd_user)
+        rescue StandardError => e
+          fail!("Unable to authenticate: #{e.message}")
+        end
       end
 
       def return_to_after_sign_out
@@ -42,14 +51,14 @@ module Devise
         cache_key = "rownd_user_#{@decoded_jwt['jti']}"
         if session[:rownd_stale_data] == true
           data = fetch_user_from_api
+          return nil unless data
+
           Rails.cache.write(cache_key, data, expires_in: 1.minute)
           session.delete(:rownd_stale_data) if session[:rownd_stale_data]
           return data
         end
 
-        Rails.cache.fetch(cache_key, expires_in: 1.minute) do
-          fetch_user_from_api
-        end
+        Devise::Rownd::Caching.fetch(cache_key, 1.minute) { fetch_user_from_api }
       end
 
       def fetch_user_from_api
@@ -62,31 +71,32 @@ module Devise
         )
         return response.body['data'] if response.success?
 
-        raise StandardError, response.body['message']
+        Rails.logger.error("Failed to fetch user: #{response.body['message']}")
+        nil
       end
 
       def verify_token(access_token)
-        for jwk in jwks
-          begin
-            response = JOSE::JWT.verify_strict(jwk, ['EdDSA'], access_token)
-            return response[1].fields if response[0]
-          rescue StandardError => e
-            puts "Error: #{e}"
-            next
-          end
-          raise StandardError
+        raise StandardError, 'No JWKs' unless jwks
+
+        jwks.each do |jwk|
+          response = JOSE::JWT.verify_strict(jwk, ['EdDSA'], access_token)
+          return response[1].fields if response[0]
+        rescue StandardError
+          next
         end
+        raise StandardError, 'Failed to verify JWT. No matching JWKs'
       end
 
       def jwks
-        Rails.cache.fetch('rownd_jwks', expires_in: 15.minutes) do
-          fetch_jwks
-        end
+        Devise::Rownd::Caching.fetch('rownd_jwks', 15.minutes) { fetch_jwks_from_api }
       end
 
-      def fetch_jwks
+      def fetch_jwks_from_api
         response = ::Devise::Rownd::API.make_api_call('/hub/auth/keys')
-        response.body['keys']
+        return response.body['keys'] if response.success?
+
+        Rails.logger.error("Failed to fetch JWKs: #{response.body['message']}")
+        nil
       end
     end
   end

data/lib/devise/rownd/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Rownd
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/lib/devise/rownd.rb

@@ -4,6 +4,7 @@ require 'devise/rownd/strategies'
 require 'devise/rownd/models'
 require 'devise/rownd/api'
 require 'devise/rownd/user'
+require 'devise/rownd/caching'
 
 module Devise
   module Rownd

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: devise-rownd
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Bobby Radford
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.30.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.30.2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +205,7 @@ files:
 - config/routes.rb
 - lib/devise/rownd.rb
 - lib/devise/rownd/api.rb
+- lib/devise/rownd/caching.rb
 - lib/devise/rownd/custom_failure.rb
 - lib/devise/rownd/engine.rb
 - lib/devise/rownd/models.rb