fix(authentication): fix authentication errors after deploying a new instance with the same code (#gb01xz) (#447)

Author: DrRaider

app/services/forest_liana/oidc_client_manager.rb

@@ -4,22 +4,20 @@ module ForestLiana
   class OidcClientManager
     def self.get_client_for_callback_url(callback_url)
       begin
-        client_data = Rails.cache.read(callback_url) || nil
-        if client_data.nil?
-          configuration = ForestLiana::OidcConfigurationRetriever.retrieve()
-
-          if ForestLiana.forest_client_id.nil?
+        configuration = ForestLiana::OidcConfigurationRetriever.retrieve()
+        if ForestLiana.forest_client_id.nil?
+          client_data = Rails.cache.read("#{callback_url}-#{ForestLiana.env_secret}-client-data") || nil
+          if client_data.nil?
             client_credentials = ForestLiana::OidcDynamicClientRegistrator.register({
               token_endpoint_auth_method: 'none',
               redirect_uris: [callback_url],
               registration_endpoint: configuration['registration_endpoint']
             })
-          else
-            client_credentials = { 'client_id' => ForestLiana.forest_client_id }
+            client_data = { :client_id => client_credentials['client_id'], :issuer => configuration['issuer'] }
+            Rails.cache.write("#{callback_url}-#{ForestLiana.env_secret}-client-data", client_data)
           end
-
-          client_data = { :client_id => client_credentials['client_id'], :issuer => configuration['issuer'] }
-          Rails.cache.write(callback_url, client_data)
+        else
+          client_data = { :client_id => ForestLiana.forest_client_id, :issuer => configuration['issuer'] }
         end
 
         OpenIDConnect::Client.new(
@@ -30,7 +28,7 @@ def self.get_client_for_callback_url(callback_url)
           token_endpoint: '/oidc/token',
         )
       rescue => error
-        Rails.cache.delete(callback_url)
+        Rails.cache.delete("#{callback_url}-#{ForestLiana.env_secret}-client-data")
         raise error
       end
     end