forest_liana 9.6.3 → 9.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ba2b1f8d8557f9d5627817377b70bb733804ab8cba4f8f5c63868261f9e00ad
-  data.tar.gz: 8d493de4d0148d02e826338b6bb2287c1015094333dfe9891de39be17cc7de8b
+  metadata.gz: 8b9d6bfea5beec2a6a055816e4314893627e12c6be2edf1fdd6d94b1f7c01773
+  data.tar.gz: c335c707ec38d536cf260bf8e5c84108206424d49e48212132451ff805667e0b
 SHA512:
-  metadata.gz: 1e136b9bfe6ba3bb94a5c525f04c6db27a88989fa8b2bff0b2a4341266b8ae901c5cac8c53111d4d0e1b443a9b4dfffdb5954f40a72ac31d1a62ff89a8f2a83b
-  data.tar.gz: a8e80f6812a1146af8f3faaa5c20733d3cb731f9a0cd79e63bf93118daa1daadb4e6e5e18d5ae6c54d8f09c4bb567b953af474e63b29ffac365c89424c8fcc92
+  metadata.gz: e3831c01431c740f1b924875a7c8b7a6abe694d77f51a98934eb19c2fbc240d2f5d04d2fc089fc3f940eaaa0faf3c03de762606c0cce273d6bcfc7912dbd544d
+  data.tar.gz: a8bdf701edf00bb1188fdd986ee33dd13d0b89280dc3684a37bf32c2af4b636c3ae4f93f2f1f13f5bf4f6e476a78c9499e1691590562dd69cd7deec3d6755195

data/app/services/forest_liana/forest_api_requester.rb

@@ -9,11 +9,10 @@ module ForestLiana
           headers: base_headers.merge(headers),
           query: query,
         }).response
-      rescue
-        message = "Cannot reach Forest API at #{forest_api_url}#{route}, it seems to be down right now."
-        FOREST_LOGGER.error message
-        FOREST_REPORTER.report message
-        raise
+      rescue => error
+        FOREST_LOGGER.error "Cannot reach Forest API at #{forest_api_url}#{route}, it seems to be down right now."
+        FOREST_REPORTER.report error
+        raise error
       end
     end
 
@@ -31,11 +30,10 @@ module ForestLiana
           query: query,
           body: body.to_json,
         }).response
-      rescue
-        message = "Cannot reach Forest API at #{post_route}, it seems to be down right now."
-        FOREST_LOGGER.error message
-        FOREST_REPORTER.report message
-        raise
+      rescue => error
+        FOREST_LOGGER.error "Cannot reach Forest API at #{post_route}, it seems to be down right now."
+        FOREST_REPORTER.report error
+        raise error
       end
     end
 

data/app/services/forest_liana/resources_getter.rb

@@ -132,6 +132,8 @@ module ForestLiana
 
       begin
         segment_query = @params[:segmentQuery].gsub(/\;\s*$/, '')
+        ScopeManager.inject_context_variables_on_query(segment_query, @user)
+
         @records = @records.where(
           "#{@resource.table_name}.#{@resource.primary_key} IN (SELECT id FROM (#{segment_query}) as ids)"
         )

data/app/services/forest_liana/scope_manager.rb

@@ -37,13 +37,19 @@ module ForestLiana
 
     def self.inject_context_variables(filter, user, request_context_variables = nil)
       filter = JSON.parse(filter) if filter.is_a? String
-
       retrieve = fetch_scopes(user['rendering_id'])
       context_variables = Utils::ContextVariables.new(retrieve['team'], user, request_context_variables)
 
       Utils::ContextVariablesInjector.inject_context_in_filter(filter, context_variables)
     end
 
+    def self.inject_context_variables_on_query(query, user)
+      retrieve = fetch_scopes(user['rendering_id'])
+      context_variables = Utils::ContextVariables.new(retrieve['team'], user)
+
+      Utils::ContextVariablesInjector.inject_context_in_value(query, context_variables)
+    end
+
     def self.invalidate_scope_cache(rendering_id)
       Rails.cache.delete('forest.scopes.' + rendering_id.to_s)
     end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.6.3"
+  VERSION = "9.7.0"
 end

data/spec/services/forest_liana/scope_manager_spec.rb

@@ -326,6 +326,32 @@ module ForestLiana
           expect(filters_parser).to have_received(:apply_filters).once
         end
       end
+
+      describe '#inject_context_variables_on_query' do
+        let(:query) { "SELECT id FROM users WHERE email = '{{currentUser.email}}'" }
+        let(:filled_scope) {
+          JSON.generate(
+            {
+              'collections' => {
+                'User' => {}
+              },
+              'team' => {'id' => '1', 'name' => 'Operations'}
+            }
+          )
+        }
+        let(:api_call_response_success) { Net::HTTPOK.new({}, 200, filled_scope) }
+
+        before do
+          allow(ForestLiana::ForestApiRequester).to receive(:get).and_return(api_call_response_success)
+          allow(api_call_response_success).to receive(:body).and_return(filled_scope)
+        end
+
+        it 'should inject the context variables in the query' do
+          described_class.inject_context_variables_on_query(query, user)
+
+          expect(query).to eq "SELECT id FROM users WHERE email = 'jd@forestadmin.com'"
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.6.3
+  version: 9.7.0
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails