forest_liana 6.0.0.pre.beta.3 → 6.0.0.pre.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ea2912357a0fabb3b4c6527d848f9b728d2394c83155cd77314e54f66c1d8e2
-  data.tar.gz: 69863c89f2668cb142f54ddc5a9fcc1c473417cef56fc307765e53a686572bd3
+  metadata.gz: 3d299c9968621d0592da4e25c67969073237e6cf0eac69d0d898e6db6027ad14
+  data.tar.gz: bbb59dfd951086e62df9829124fcf57ef0b71d40550597abeaff3de07450c946
 SHA512:
-  metadata.gz: 11e36ad5a50676182d85029fe634e2874328c537bff2679e5a99661393e5d23c84fa3e30c165c376c06c0e8bc013beffc8d0b2497408276322a0811de8fbf222
-  data.tar.gz: 3bb4aec7204cced667652ac92f1aef9e4897d282a578408603c2fd98b7b37079565ea39d58ef1d26ee4f62af545c41bd2e56666df4d0335f7b53a455c705f17a
+  metadata.gz: 9b3dc3c43d682e085dd95066648471f779bd03da28b935eb645532e04da42ab75651d679291d03118355cba35379655878fa9a3a36a2fb945fbdb1ac35099748
+  data.tar.gz: 2bd81a3eb3aa40c9129b1afd5fc86004eb10bbe6115f422537f82ffbeec0d94be77c542f68ed5494688464f1857bee5b691187a95d86a45357ca6d3e07b7c400

data/app/controllers/forest_liana/authentication_controller.rb

@@ -46,7 +46,7 @@ module ForestLiana
           { 'renderingId' => rendering_id },
         )
 
-        redirect_to(result['authorization_url'])
+        render json: { authorizationUrl: result['authorization_url']}, status: 200
       rescue => error
         render json: { errors: [{ status: 500, detail: error.message }] },
           status: :internal_server_error, serializer: nil

data/app/services/forest_liana/oidc_client_manager.rb

@@ -8,11 +8,15 @@ module ForestLiana
         if client_data.nil?
           configuration = ForestLiana::OidcConfigurationRetriever.retrieve()
 
-          client_credentials = ForestLiana::OidcDynamicClientRegistrator.register({
-            token_endpoint_auth_method: 'none',
-            redirect_uris: [callback_url],
-            registration_endpoint: configuration['registration_endpoint']
-          })
+          if ForestLiana.forest_client_id.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
+          end
 
           client_data = { :client_id => client_credentials['client_id'], :issuer => configuration['issuer'] }
           Rails.cache.write(callback_url, client_data)

data/lib/forest_liana.rb

@@ -16,6 +16,7 @@ module ForestLiana
 
   mattr_accessor :env_secret
   mattr_accessor :auth_secret
+  mattr_accessor :forest_client_id
   mattr_accessor :application_url
   mattr_accessor :integrations
   mattr_accessor :apimap

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "6.0.0-beta.3"
+  VERSION = "6.0.0-beta.4"
 end

data/spec/requests/authentications_spec.rb

@@ -33,12 +33,13 @@ describe "Authentications", type: :request do
       }
     end
 
-    it "should respond with a 302 code" do
-      expect(response).to have_http_status(302)
+    it "should respond with a 200 code" do
+      expect(response).to have_http_status(200)
     end
 
     it "should return a valid authentication url" do
-      expect(response.headers['Location']).to eq('https://api.forestadmin.com/oidc/auth?client_id=random_id&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fforest%2Fauthentication%2Fcallback&response_type=code&scope=openid%20email%20profile&state=%7B%22renderingId%22%3D%3E42%7D')
+      body = JSON.parse(response.body, :symbolize_names => true)
+      expect(body[:authorizationUrl]).to eq('https://api.forestadmin.com/oidc/auth?client_id=random_id&redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Fforest%2Fauthentication%2Fcallback&response_type=code&scope=openid%20email%20profile&state=%7B%22renderingId%22%3D%3E42%7D')
     end
   end
 

data/test/services/forest_liana/resources_getter_test.rb

@@ -119,8 +119,8 @@ module ForestLiana
       records = getter.records
       count = getter.count
 
-      assert records.count == 1
-      assert count = 1
+      assert records.count == 2
+      assert count = 2
       assert records.first.id == 4
       assert records.first.name == 'Oak'
       assert records.first.owner.name == 'Arnaud Besnier'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.beta.3
+  version: 6.0.0.pre.beta.4
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-14 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails