forest_admin_agent 1.0.0.pre.beta.88 → 1.0.0.pre.beta.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba603df0dd8d88da6e6f10f251d3c24a682e9085799bbe097533863db88e1691
-  data.tar.gz: 3552261f4d9113775875d559886f53fd2370a018994cb03be83605135f51306f
+  metadata.gz: ae621695f9deebb0ba410f6791f9549bc0cec956a54d636c2801ed688fbf83a1
+  data.tar.gz: 034c2154d956922e1c1c4bb35055e986bb0632290bac0e868e830b8710d1ace4
 SHA512:
-  metadata.gz: cff8663ff0b641b59b695b3bff3400438082f86ba99bfd8138413fff16aa5cb76f5995e254dbd2d7b39a2885ad499afe80f046adb123007ec9307c15b8c78e9d
-  data.tar.gz: fe61ddd0ca3110d4904f012a379e03507fd415561c22a12f04587bc5e0b9031b1987dc304ca940678dbdbb11698fd1cf4b712c66fe3529e47458f6ae4ca1157c
+  metadata.gz: 209de7100f34731b01703bd09034b194f3a39f65244894e4fcf19bc2be329da0f6ede35ecab2ac49be648020d354cf34860090ecec79c7bab5788603c1b78820
+  data.tar.gz: d11e6d45f101036ebcaadf3e04889ac8135177a9891c6516c31aa37832075e2efa9302a1cd5e1e9d066922c33210965d150604d7013fe21d0483b33246be6323

data/lib/forest_admin_agent/routes/resources/delete.rb

@@ -39,7 +39,7 @@ module ForestAdminAgent
           condition_tree_ids = condition_tree_ids.inverse if selection_ids[:are_excluded]
 
           @collection.schema[:fields].each_value do |field_schema|
-            next unless field_schema.type == 'PolymorphicOneToOne' || field_schema.type == 'PolymorphicOneToMany'
+            next unless ['PolymorphicOneToOne', 'PolymorphicOneToMany'].include?(field_schema.type)
 
             condition_tree = Nodes::ConditionTreeBranch.new(
               'And',

data/lib/forest_admin_agent/routes/resources/related/dissociate_related.rb

@@ -34,7 +34,7 @@ module ForestAdminAgent
             filter = get_base_foreign_filter(args)
             relation = Schema.get_to_many_relation(@collection, args[:params]['relation_name'])
 
-            if relation.type == 'OneToMany' || relation.type == 'PolymorphicOneToMany'
+            if ['OneToMany', 'PolymorphicOneToMany'].include?(relation.type)
               dissociate_or_delete_one_to_many(relation, args[:params]['relation_name'], parent_id, is_delete_mode,
                                                filter)
             else

data/lib/forest_admin_agent/routes/resources/store.rb

@@ -40,7 +40,7 @@ module ForestAdminAgent
         def link_one_to_one_relations(args, record)
           args[:params][:data][:relationships]&.map do |field, value|
             schema = @collection.schema[:fields][field]
-            next unless schema.type == 'OneToOne' || schema.type == 'PolymorphicOneToOne'
+            next unless ['OneToOne', 'PolymorphicOneToOne'].include?(schema.type)
 
             id = Utils::Id.unpack_id(@collection, value['data']['id'], with_key: true)
             foreign_collection = @datasource.get_collection(schema.foreign_collection)

data/lib/forest_admin_agent/utils/caller_parser.rb

@@ -0,0 +1,68 @@
+require 'jwt'
+require 'active_support'
+require 'active_support/time'
+
+module ForestAdminAgent
+  module Utils
+    class CallerParser
+      include ForestAdminDatasourceToolkit::Exceptions
+
+      def initialize(args)
+        @args = args
+        @token_data = {}
+      end
+
+      def parse
+        validate_headers
+        @token_data = decode_token
+        @token_data[:timezone] = extract_timezone
+        @token_data[:request] = { ip: @args[:headers]['action_dispatch.remote_ip'].to_s }
+        project, environment = extract_forest_context
+        @token_data[:project] = project
+        @token_data[:environment] = environment
+
+        ForestAdminDatasourceToolkit::Components::Caller.new(**@token_data.transform_keys(&:to_sym))
+      end
+
+      private
+
+      def validate_headers
+        return if @args.dig(:headers, 'HTTP_AUTHORIZATION')
+
+        raise Http::Exceptions::HttpException.new(
+          401,
+          'You must be logged in to access at this resource.'
+        )
+      end
+
+      def extract_timezone
+        timezone = @args[:params]['timezone']
+        raise ForestException, 'Missing timezone' unless timezone
+        raise ForestException, "Invalid timezone: #{timezone}" unless Time.find_zone(timezone)
+
+        timezone
+      end
+
+      def decode_token
+        token = @args[:headers]['HTTP_AUTHORIZATION'].split[1]
+        JWT.decode(
+          token,
+          Facades::Container.cache(:auth_secret),
+          true,
+          { algorithm: 'HS256' }
+        )[0].tap { |data| data.delete('exp') }
+      end
+
+      def extract_forest_context
+        match_data = %r{https://[^/]*/([^/]*)/([^/]*)/([^/]*)}.match(@args[:headers]['HTTP_FOREST_CONTEXT_URL'])
+        return [nil, nil] unless match_data
+
+        project = match_data[1]
+        environment = match_data[2]
+        [project, environment]
+      rescue StandardError
+        [nil, nil]
+      end
+    end
+  end
+end

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -1,7 +1,3 @@
-require 'jwt'
-require 'active_support'
-require 'active_support/time'
-
 module ForestAdminAgent
   module Utils
     class QueryStringParser
@@ -31,30 +27,7 @@ module ForestAdminAgent
       end
 
       def self.parse_caller(args)
-        unless args.dig(:headers, 'HTTP_AUTHORIZATION')
-          raise Http::Exceptions::HttpException.new(
-            401,
-            'You must be logged in to access at this resource.'
-          )
-        end
-
-        timezone = args[:params]['timezone']
-        raise ForestException, 'Missing timezone' unless timezone
-
-        raise ForestException, "Invalid timezone: #{timezone}" unless Time.find_zone(timezone)
-
-        token = args[:headers]['HTTP_AUTHORIZATION'].split[1]
-        token_data = JWT.decode(
-          token,
-          Facades::Container.cache(:auth_secret),
-          true,
-          { algorithm: 'HS256' }
-        )[0]
-        token_data.delete('exp')
-        token_data[:timezone] = timezone
-        token_data[:request] = { ip: args[:headers]['action_dispatch.remote_ip'].to_s }
-
-        Caller.new(**token_data.transform_keys(&:to_sym))
+        CallerParser.new(args).parse
       end
 
       def self.parse_projection(collection, args)

data/lib/forest_admin_agent/utils/schema/schema_emitter.rb

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "agent-ruby"
 
-        LIANA_VERSION = "1.0.0-beta.88"
+        LIANA_VERSION = "1.0.0-beta.90"
 
         def self.get_serialized_schema(datasource)
           schema_path = Facades::Container.cache(:schema_path)

data/lib/forest_admin_agent/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminAgent
-  VERSION = "1.0.0-beta.88"
+  VERSION = "1.0.0-beta.90"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.88
+  version: 1.0.0.pre.beta.90
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -275,6 +275,7 @@ files:
 - lib/forest_admin_agent/services/permissions.rb
 - lib/forest_admin_agent/services/smart_action_checker.rb
 - lib/forest_admin_agent/services/sse_cache_invalidation.rb
+- lib/forest_admin_agent/utils/caller_parser.rb
 - lib/forest_admin_agent/utils/condition_tree_parser.rb
 - lib/forest_admin_agent/utils/context_variables.rb
 - lib/forest_admin_agent/utils/context_variables_injector.rb