devise-rownd 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3317512e4c6ead0a28dddb83bcd70a07d66a118ded1898382c0ce90cf6f789c3
-  data.tar.gz: 2de19260f908ff6f2544c1a8bcb4b3257c67c969fe8e5d52db102edd07384886
+  metadata.gz: 66fb0808a220fb26f13eeeaad657dfeb8a5f402b4ff8eb93ea4e78ca9d2a6dad
+  data.tar.gz: 21c796b17298e08ca8eb350ebc9564933c99e78dc9b471e09c7010b6e4477fc1
 SHA512:
-  metadata.gz: 29bcc368a05051514753c79cdd176ef97f338ba9f467460a9a86df4e85cc7dadd62d81f188df5349473fbd102b98a89315f808288197fb6e07d7a5b174064990
-  data.tar.gz: 03b017507234b0c520ac96e9c0a9a1fa939074e79e3f765376f68e09fba141c0c55b3b54524fac0adf21b60f25b42b0a5e8619c84b1bd2e9df210292f4c30653
+  metadata.gz: 9c4bc7a3fd3014d49f74a330c5af548be40349e266be90bf39b8d5599ac603e9c704e447b13b48310f5857df45a82d03e1767f5c978d00eaa2e80697589ed4c8
+  data.tar.gz: 1115a0a1e51d5650c4bd6c4aff8cc313d83a1c954307ae39cb73e67af166f07dcdc43feb9dbcee291e01af5d4ea0306b00bf6f31a3026a5996bc0faad6026a98

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/models/rownd_authenticatable.rb

@@ -8,21 +8,15 @@ module Devise
       # TODO: What if we don't interact with the database at all?
       class_methods do
         def find_or_create_with_authentication_profile(profile)
-          result = where(user_id: profile['user_id']).first_or_create({ email: profile['email'] })
-          result
+          where(user_id: profile['user_id']).first_or_create({ email: profile['email'] })
         end
 
         def serialize_from_session(data)
-          result = Devise::Rownd::User.new(data)
-          # result = find_by_user_id_or_email(user_id, email)
-          result
+          Devise::Rownd::User.new(data)
         end
 
         def serialize_into_session(resource)
-          # result = [resource.data]
-          result = [resource]
-          # result = [resource['user_id'], resource['email']]
-          result
+          [resource]
         end
 
         # def find_by_user_id_or_email(user_id, email)

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,28 @@ 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)
+          user_data['is_verified_user'] = @decoded_jwt['https://auth.rownd.io/is_verified_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
@@ -39,16 +50,17 @@ module Devise
       end
 
       def fetch_user
+        cache_key = "rownd_user_#{@decoded_jwt['jti']}"
         if session[:rownd_stale_data] == true
           data = fetch_user_from_api
-          Rails.cache.write('rownd_user', data, expires_in: 1.minute)
+          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('rownd_user', 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
@@ -61,31 +73,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/user.rb

@@ -1,7 +1,7 @@
 module Devise
   module Rownd
     class User
-      attr_reader :data
+      attr_reader :data, :is_verified_user
 
       def initialize(data)
         @data = data
@@ -10,6 +10,11 @@ module Devise
           instance_variable_value = data.is_a?(Hash) && data.key?(key) ? data[key] : nil
           instance_variable_set("@#{key}", instance_variable_value)
         end
+        @is_verified_user = data.key?('is_verified_user') ? data['is_verified_user'] : false
+      end
+
+      def verified?
+        @is_verified_user
       end
     end
   end

data/lib/devise/rownd/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Rownd
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   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.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Bobby Radford
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-06-03 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