forest_liana 8.0.15 → 8.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f05d57e597b220694bfa6681b6fd44ce847bbc3d9bed60c23547f4b6f879bcb5
-  data.tar.gz: d3bbd0453df99c237ead29a3d86b7b67a64dc6ceedf03420cc99ccd39eefd1ff
+  metadata.gz: d66f322c9f51d6beebaa2eb338b8f568f7d12bc781d71c4b47a8c2c3e6503c73
+  data.tar.gz: 37db17c392bac96b35c43595c03ef702e840ae40e420538151d36edc2a347c68
 SHA512:
-  metadata.gz: 03506c47bf6f748129c80823b372246845f215d253b7b3ee3d2d14a27b4588c4014fa6a27d05a8199bee5134549663637c19f35327a87ff3ee0a0f4bfba82632
-  data.tar.gz: 2b55b11b94dc2fa393bcdbb66bf2a16305b193f004399ac4b79c2a33ac0c0d81f1fed98c8c798725c1504e38a718990ff402e6e1fdb2f1e91726306ff6c3cb29
+  metadata.gz: 9466f6b82dc0ffbfae007bfc0024e5b831172dacdffcf00e51c58a8ca2333dbbefb165227a3d36b704954b1cdb75ecdfb9a5f2605840572220e612226e6cb39d
+  data.tar.gz: 5c313811aead7c0617d1e5d5d9c424f66e56b0482a46dc8354a1714b59f61490a728cc1cacb9224553110b0577b68712ba62366e8b214d6c7bddb2daffde4c7d

data/app/controllers/forest_liana/authentication_controller.rb

@@ -39,6 +39,8 @@ module ForestLiana
     end
 
     def authentication_callback
+      return authentication_exception if params.key?(:error)
+
       begin
         token = @authentication_service.verify_code_and_generate_token(params)
 
@@ -55,6 +57,21 @@ module ForestLiana
       end
     end
 
+    def authentication_exception
+      begin
+        raise ForestLiana::Errors::AuthenticationOpenIdClientException.new(params[:error], params[:error_description], params[:state])
+      rescue => error
+        FOREST_REPORTER.report error
+        FOREST_LOGGER.error "AuthenticationOpenIdClientException: #{error.error_description}"
+
+        render json: {
+          error: error.error,
+          error_description: error.error_description,
+          state: error.state
+        }, status: :unauthorized
+      end
+    end
+
     def logout
       begin
         if cookies.has_key?(:forest_session_token)

data/app/services/forest_liana/authentication.rb

@@ -38,8 +38,6 @@ module ForestLiana
         raise ForestLiana::MESSAGES[:SERVER_TRANSACTION][:INVALID_STATE_MISSING]
       end
 
-      rendering_id = nil
-
       begin
         parsed_state = JSON.parse(state.gsub("'",'"').gsub('=>',':'))
         rendering_id = parsed_state["renderingId"].to_s

data/config/initializers/errors.rb

@@ -30,6 +30,17 @@ module ForestLiana
       end
     end
 
+    class AuthenticationOpenIdClientException < StandardError
+      attr_reader :error, :error_description, :state
+
+      def initialize(error, error_description, state)
+        super(error_description)
+        @error = error
+        @error_description = error_description
+        @state = state
+      end
+    end
+
     class ExpectedError < StandardError
       attr_reader :error_code, :status, :message, :name
 

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "8.0.15"
+  VERSION = "8.0.16"
 end

data/spec/requests/authentications_spec.rb

@@ -44,44 +44,66 @@ describe "Authentications", type: :request do
   end
 
   describe "GET /authentication/callback" do
-    before() do
-      response = '{"data":{"id":666,"attributes":{"first_name":"Alice","last_name":"Doe","email":"alice@forestadmin.com","teams":[1,2,3],"role":"Test","tags":[{"key":"city","value":"Paris"}]}}}'
-      allow(ForestLiana::ForestApiRequester).to receive(:get).with(
-        "/liana/v2/renderings/42/authorization", { :headers => { "forest-token" => "THE-ACCESS-TOKEN" }, :query => {} }
-      ).and_return(
-        instance_double(HTTParty::Response, :body => response, :code => 200)
-      )
-
-      get ForestLiana::Engine.routes.url_helpers.authentication_callback_path + "?code=THE-CODE&state=#{CGI::escape('{"renderingId":42}')}"
-    end
+    context 'when the response is a 200' do
+      before() do
+        response = '{"data":{"id":666,"attributes":{"first_name":"Alice","last_name":"Doe","email":"alice@forestadmin.com","teams":[1,2,3],"role":"Test","tags":[{"key":"city","value":"Paris"}]}}}'
+        allow(ForestLiana::ForestApiRequester).to receive(:get).with(
+          "/liana/v2/renderings/42/authorization", { :headers => { "forest-token" => "THE-ACCESS-TOKEN" }, :query => {} }
+        ).and_return(
+          instance_double(HTTParty::Response, :body => response, :code => 200)
+        )
 
-    it "should respond with a 200 code" do
-      expect(response).to have_http_status(200)
-    end
+        get ForestLiana::Engine.routes.url_helpers.authentication_callback_path + "?code=THE-CODE&state=#{CGI::escape('{"renderingId":42}')}"
+      end
 
-    it "should return a valid authentication token" do
-      body = JSON.parse(response.body, :symbolize_names => true);
+      it "should respond with a 200 code" do
+        expect(response).to have_http_status(200)
+      end
 
-      token = body[:token]
-      decoded = JWT.decode(token, ForestLiana.auth_secret, true, { algorithm: 'HS256' })[0]
+      it "should return a valid authentication token" do
+        body = JSON.parse(response.body, :symbolize_names => true);
 
-      expected_token_data = {
-        "id" => 666,
-        "email" => 'alice@forestadmin.com',
-        "rendering_id" => "42",
-        "first_name" => 'Alice',
-        "last_name" => 'Doe',
-        "team" => 1,
-        "role" => "Test",
-      }
+        token = body[:token]
+        decoded = JWT.decode(token, ForestLiana.auth_secret, true, { algorithm: 'HS256' })[0]
 
-      expect(decoded).to include(expected_token_data)
-      tags = decoded['tags']
-      expect(tags.length).to eq(1)
-      expect(tags[0]['key']).to eq("city")
-      expect(tags[0]['value']).to eq("Paris")
-      expect(body).to eq({ token: token, tokenData: decoded.deep_symbolize_keys! })
-      expect(response).to have_http_status(200)
+        expected_token_data = {
+          "id" => 666,
+          "email" => 'alice@forestadmin.com',
+          "rendering_id" => "42",
+          "first_name" => 'Alice',
+          "last_name" => 'Doe',
+          "team" => 1,
+          "role" => "Test",
+        }
+
+        expect(decoded).to include(expected_token_data)
+        tags = decoded['tags']
+        expect(tags.length).to eq(1)
+        expect(tags[0]['key']).to eq("city")
+        expect(tags[0]['value']).to eq("Paris")
+        expect(body).to eq({ token: token, tokenData: decoded.deep_symbolize_keys! })
+        expect(response).to have_http_status(200)
+      end
+    end
+
+    context 'when the response is not a 200' do
+      before() do
+        get ForestLiana::Engine.routes.url_helpers.authentication_callback_path,
+          params: {
+            error: 'TrialBlockedError',
+            error_description: 'Your free trial has ended. We hope you enjoyed your experience with Forest Admin.',
+            state: '{"renderingId":100}'
+          },
+          headers: {
+            'Accept' => 'application/json',
+            'Content-Type' => 'application/json',
+          }
+      end
+
+      it "should respond with a 401 code" do
+        expect(response).to have_http_status(401)
+        expect(response.body).to eq('{"error":"TrialBlockedError","error_description":"Your free trial has ended. We hope you enjoyed your experience with Forest Admin.","state":"{\"renderingId\":100}"}')
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 8.0.15
+  version: 8.0.16
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-23 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails