forest_admin_agent 1.0.0.pre.beta.31 → 1.0.0.pre.beta.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4743393dc5a51698d6ec25932119d4aae31242217e544edec5f4e20a9b6ef59f
-  data.tar.gz: 6a392b579969712a8ecf97c40b937b61525c716d871283704247f05d4ad2758c
+  metadata.gz: a943d6f4ac59186bf4a2b032ffdd301d41239636408457c0d4f809633cc3ad49
+  data.tar.gz: a292ad6d5ffc8d1c65734729f0c31212a7a5157ffd5c93be2552cc19c3fbb092
 SHA512:
-  metadata.gz: aadfe844b717ad56d665970d67c06d56116b3801aa3014e6ceabb4461f911a33622836f336e19d8300a179f8389df9c86adf9a3fcbf3891082be4b0bca2575db
-  data.tar.gz: b07c6856de135844267526f7d091becdba8a7f72be56cbdd669b0a9297dd2e70eddec4f3238387295e1bbceadced2bdf292a08ab28b29c92a5f16113049593a2
+  metadata.gz: 407664d61c301ddaa40c049f52b7e58c5373ad73990f031e64f986349ca32dd45550787a3252d85f881486c61557507bfd09ec861f0f41d51bcb646250f80b56
+  data.tar.gz: 4b62bea51c7f25aaf6d2902e686b1280e8dcc019864c8c6848795846b2c9ee9aee92e0b0e53cb897b1485dbda2ed29161ea43ec0eccf4a45ec110e19c8440e38

data/lib/forest_admin_agent/http/Exceptions/conflict_error.rb

@@ -5,8 +5,7 @@ module ForestAdminAgent
         attr_reader :name
 
         def initialize(message, name = 'ConflictError')
-          @name = name
-          super(429, 'Conflict', message)
+          super(429, message, name)
         end
       end
     end

data/lib/forest_admin_agent/http/Exceptions/forbidden_error.rb

@@ -5,8 +5,7 @@ module ForestAdminAgent
         attr_reader :name
 
         def initialize(message, name = 'ForbiddenError')
-          @name = name
-          super(403, 'Forbidden', message)
+          super(403, message, name)
         end
       end
     end

data/lib/forest_admin_agent/http/Exceptions/http_exception.rb

@@ -2,11 +2,10 @@ module ForestAdminAgent
   module Http
     module Exceptions
       class HttpException < StandardError
-        attr_reader :code, :status, :message, :name
+        attr_reader :status, :message, :name
 
-        def initialize(code, status, message, name = nil)
+        def initialize(status, message, name = nil)
           super(message)
-          @code = code
           @status = status
           @message = message
           @name = name

data/lib/forest_admin_agent/http/Exceptions/require_approval.rb

@@ -5,9 +5,8 @@ module ForestAdminAgent
         attr_reader :name, :data
 
         def initialize(message, name = 'RequireApproval', data = [])
-          @name = name
+          super(403, message, name)
           @data = data
-          super(403, 'Forbidden', message)
         end
       end
     end

data/lib/forest_admin_agent/http/Exceptions/unprocessable_error.rb

@@ -0,0 +1,13 @@
+module ForestAdminAgent
+  module Http
+    module Exceptions
+      class UnprocessableError < HttpException
+        attr_reader :name
+
+        def initialize(message = '', name = 'UnprocessableError')
+          super(422, message, name)
+        end
+      end
+    end
+  end
+end

data/lib/forest_admin_agent/routes/action/action.rb

@@ -1,5 +1,6 @@
 require 'jsonapi-serializers'
 require 'active_support/inflector'
+require 'jwt'
 
 module ForestAdminAgent
   module Routes
@@ -41,10 +42,11 @@ module ForestAdminAgent
 
         def handle_request(args = {})
           build(args)
+          args = middleware_custom_action_approval_request_data(args)
           filter_for_caller = get_record_selection(args)
           get_record_selection(args, include_user_scope: false)
 
-          # TODO: permission
+          @permissions.can_smart_action?(args, @collection, filter_for_caller)
 
           raw_data = args.dig(:params, :data, :attributes, :values)
 
@@ -94,6 +96,25 @@ module ForestAdminAgent
 
         private
 
+        def middleware_custom_action_approval_request_data(args)
+          raise Http::Exceptions::UnprocessableError if args.dig(:params, :data, :attributes, :requester_id)
+
+          if (signed_request = args.dig(:params, :data, :attributes, :signed_approval_request))
+            args[:params][:data][:attributes][:signed_approval_request] = decode_signed_approval_request(signed_request)
+          end
+
+          args
+        end
+
+        def decode_signed_approval_request(signed_request)
+          ForestAdminDatasourceToolkit::Utils::HashHelper.convert_keys(JWT.decode(
+            signed_request,
+            Facades::Container.cache(:env_secret),
+            true,
+            { algorithm: 'HS256' }
+          )[0])
+        end
+
         def get_record_selection(args, include_user_scope: true)
           attributes = args.dig(:params, :data, :attributes)
 

data/lib/forest_admin_agent/services/permissions.rb

@@ -86,7 +86,7 @@ module ForestAdminAgent
         smart_action_approval = SmartActionChecker.new(
           request[:params],
           collection,
-          collections_data[collection.name.to_sym][:actions][action[:name]],
+          collections_data[collection.name.to_sym][:actions][action['name'].to_sym],
           caller,
           user_data[:roleId],
           filter
@@ -103,6 +103,9 @@ module ForestAdminAgent
 
         return nil if scope.nil?
 
+        team = get_team(caller.rendering_id)
+        user = get_user_data(caller.id)
+
         context_variables = ContextVariables.new(team, user)
 
         ContextVariablesInjector.inject_context_in_filter(scope, context_variables)
@@ -211,7 +214,7 @@ module ForestAdminAgent
 
         return nil if actions.nil? || actions.empty?
 
-        action = actions.find { |a| a['endpoint'] == endpoint && a['http_method'].casecmp(http_method).zero? }
+        action = actions.find { |a| a['endpoint'] == endpoint && a['httpMethod'].casecmp(http_method).zero? }
 
         raise ForestException, "The collection #{collection_name} does not have this smart action" if action.nil?
 

data/lib/forest_admin_agent/services/smart_action_checker.rb

@@ -38,7 +38,8 @@ module ForestAdminAgent
       def can_approve?
         if smart_action[:userApprovalEnabled].include?(role_id) &&
            (smart_action[:userApprovalConditions].empty? || match_conditions(:userApprovalConditions)) &&
-           (attributes[:requester_id] != caller.id || smart_action[:selfApprovalEnabled].include?(role_id))
+           (attributes[:signed_approval_request][:data][:attributes][:requester_id] != caller.id ||
+             smart_action[:selfApprovalEnabled].include?(role_id))
           return true
         end
 
@@ -70,8 +71,7 @@ module ForestAdminAgent
                            else
                              Nodes::ConditionTreeLeaf.new(pk, 'IN', attributes[:ids])
                            end
-
-        condition = smart_action[condition_name][0]['filter']
+        condition = smart_action[condition_name][0][:filter]
         conditional_filter = filter.override(
           condition_tree: ConditionTreeFactory.intersect(
             [
@@ -81,9 +81,9 @@ module ForestAdminAgent
             ]
           )
         )
-        rows = collection.aggregate(caller, conditional_filter, Aggregation.new(operation: 'Count'))
 
-        (rows[0]['value'] || 0) == attributes[:ids].count
+        rows = collection.aggregate(caller, conditional_filter, Aggregation.new(operation: 'Count'))
+        (rows.empty? ? 0 : rows[0]['value']) == attributes[:ids].count
       rescue StandardError
         raise ConflictError.new(
           'The conditions to trigger this action cannot be verified. Please contact an administrator.',

data/lib/forest_admin_agent/utils/condition_tree_parser.rb

@@ -11,16 +11,16 @@ module ForestAdminAgent
 
       def self.from_plain_object(collection, filters)
         if leaf?(filters)
-          operator = filters['operator'].titleize.tr(' ', '_')
+          operator = filters[:operator].titleize.tr(' ', '_')
           value = parse_value(collection, filters)
 
-          return ConditionTreeLeaf.new(filters['field'], operator, value)
+          return ConditionTreeLeaf.new(filters[:field], operator, value)
         end
 
         if branch?(filters)
-          aggregator = filters['aggregator'].capitalize
+          aggregator = filters[:aggregator].capitalize
           conditions = []
-          filters['conditions'].each do |sub_tree|
+          filters[:conditions].each do |sub_tree|
             conditions << from_plain_object(collection, sub_tree)
           end
 
@@ -31,11 +31,11 @@ module ForestAdminAgent
       end
 
       def self.parse_value(collection, leaf)
-        schema = Collection.get_field_schema(collection, leaf['field'])
-        operator = leaf['operator'].titleize.tr(' ', '_')
+        schema = Collection.get_field_schema(collection, leaf[:field])
+        operator = leaf[:operator].titleize.tr(' ', '_')
 
-        if operator == Operators::IN && leaf['field'].is_a?(String)
-          values = leaf['value'].split(',').map(&:strip)
+        if operator == Operators::IN && leaf[:field].is_a?(String)
+          values = leaf[:value].split(',').map(&:strip)
 
           return values.map { |item| !%w[false 0 no].include?(item) } if schema.column_type == 'Boolean'
 
@@ -44,15 +44,15 @@ module ForestAdminAgent
           return values
         end
 
-        leaf['value']
+        leaf[:value]
       end
 
       def self.leaf?(filters)
-        filters.key?('field') && filters.key?('operator')
+        filters.key?(:field) && filters.key?(:operator)
       end
 
       def self.branch?(filters)
-        filters.key?('aggregator') && filters.key?('conditions')
+        filters.key?(:aggregator) && filters.key?(:conditions)
       end
     end
   end

data/lib/forest_admin_agent/utils/context_variables.rb

@@ -29,7 +29,10 @@ module ForestAdminAgent
         end
 
         if context_variable_key.start_with?(USER_VALUE_TAG_PREFIX)
-          return user[:tags][context_variable_key[USER_VALUE_TAG_PREFIX.length..]]
+          user[:tags].each do |tag|
+            match_key = context_variable_key[USER_VALUE_TAG_PREFIX.length..]
+            return tag[match_key] if tag.key?(match_key)
+          end
         end
 
         user[context_variable_key[USER_VALUE_PREFIX.length..].to_sym]

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -22,7 +22,9 @@ module ForestAdminAgent
 
         return if filters.nil?
 
-        filters = JSON.parse(filters) if filters.is_a? String
+        filters = JSON.parse(filters, symbolize_names: true) if filters.is_a? String
+        # TODO: add else for convert all keys to sym
+
         ConditionTreeParser.from_plain_object(collection, filters)
         # TODO: ConditionTreeValidator::validate($conditionTree, $collection);
       end
@@ -102,6 +104,18 @@ module ForestAdminAgent
 
         extended != '0'
       end
+
+      def self.parse_sort(collection, args)
+        sort_string = args.dig(:params, :sort)
+
+        return SortUtils::SortFactory.by_primary_keys(collection) unless sort_string
+
+        sort = Sort.new([
+                          { field: sort_string.gsub(/^-/, '').tr('.', ':'), ascending: !sort_string.start_with?('-') }
+                        ])
+
+        ForestAdminDatasourceToolkit::Validations::SortValidator.validate(collection, sort)
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module ForestAdminAgent
       class SchemaEmitter
         LIANA_NAME = "forest-rails"
 
-        LIANA_VERSION = "1.0.0-beta.31"
+        LIANA_VERSION = "1.0.0-beta.33"
 
         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.31"
+  VERSION = "1.0.0-beta.33"
 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.31
+  version: 1.0.0.pre.beta.33
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -237,6 +237,7 @@ files:
 - lib/forest_admin_agent/http/Exceptions/http_exception.rb
 - lib/forest_admin_agent/http/Exceptions/not_found_error.rb
 - lib/forest_admin_agent/http/Exceptions/require_approval.rb
+- lib/forest_admin_agent/http/Exceptions/unprocessable_error.rb
 - lib/forest_admin_agent/http/forest_admin_api_requester.rb
 - lib/forest_admin_agent/http/router.rb
 - lib/forest_admin_agent/routes/abstract_authenticated_route.rb