forest_admin_agent 1.0.0.pre.beta.88 → 1.0.0.pre.beta.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba603df0dd8d88da6e6f10f251d3c24a682e9085799bbe097533863db88e1691
-  data.tar.gz: 3552261f4d9113775875d559886f53fd2370a018994cb03be83605135f51306f
+  metadata.gz: c3a73a3d208b063c855a7c50485975d493306f1ae7e0d555911911abe2a4e998
+  data.tar.gz: ceb5d65a7cd575b94b68148bc43bfd8f77e8e97ee44469ecd3f2fff1e1b3801d
 SHA512:
-  metadata.gz: cff8663ff0b641b59b695b3bff3400438082f86ba99bfd8138413fff16aa5cb76f5995e254dbd2d7b39a2885ad499afe80f046adb123007ec9307c15b8c78e9d
-  data.tar.gz: fe61ddd0ca3110d4904f012a379e03507fd415561c22a12f04587bc5e0b9031b1987dc304ca940678dbdbb11698fd1cf4b712c66fe3529e47458f6ae4ca1157c
+  metadata.gz: 129490f5cc3070dcc7ed8e4519ecb4c73dd64f07828724621ba35cada83d12197455ac7056130efdbc321339adaaf06450fea3cc9c72db35513928b8a8380dcc
+  data.tar.gz: 71f0ff4729bd1c54178ae28aa7edae6c8c34a9e8b8b91d3c8e383e7fd5f2fea07e9ab7d2267d81837940fc6597d6d7a0a4db6d02a887fb47604e5ecfcd02dac2

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.89"
 
         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.89"
 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.89
 platform: ruby
 authors:
 - Matthieu
@@ -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