forest_liana 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db3ae9b9a24a9f298e24a2b6562e8df12b0123cbbe45f453fab19d8da7a8f10
-  data.tar.gz: 4e245a23470730308895296e37e765a711186381820f2bf619e5091966cba6fc
+  metadata.gz: a28bd829a3004c62b0c2accffd12b9c089913e944c66f262c247fe9f529c898c
+  data.tar.gz: d884e158839f6c8418da92751a36fa0b4db642e8c3a7fce5b6c76dce966afe24
 SHA512:
-  metadata.gz: 9d87f2aa53059a2c6129bc5cc1d5107009121d6c97f08b2b6e745c55132ac333be420d9ea9f82fe4441c9b59a447eafad3f4111b4a8109650935d958664e6cd2
-  data.tar.gz: 9e7300a1819a26f7ca5dd4f8d59fa58abdb009dca12b045c963c0a0fdf10398bdeb403833fc7b021b4c93257ef7799f57210c6e8cda8755b350d3252f548d0e6
+  metadata.gz: 0f2dd4cd85cd8040430a69a4459a98cb8f0a57a9e9177a82e6efc85e0716db7f837c9f7110f2e20ad4cfe76ac587257926cf94e932713d8e6d72670fb1d59faa
+  data.tar.gz: a99fce237e2a743237404aa613e1ae1eb65822427d2410c52bf81ebdd6470025e310e73e38b12bbc82357cfb074fef1091afb3a6e8be51596eeaabe12f7cda12

data/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 @@ module ForestLiana
           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

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "6.3.0"
+  VERSION = "6.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Sandro Munda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails