forest_liana 6.0.0.pre.beta.2 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f88ccbd15c18a78b06d08ad2a17dfa2075d2b586728033cbe03564c95dd92e
-  data.tar.gz: e78f4892dc9ea07b8dbabb67d3183920f8ef41b6cb7ebe1edd8cb3d0c3b7ee2b
+  metadata.gz: 6a5fa2377990f8fa7bbbf8267b3250a6b5f29f44e1b9f37d82f152281851875e
+  data.tar.gz: 9115346647db03749473cf9b7ed6b9fa9c7afa0a678551db264cae781533311c
 SHA512:
-  metadata.gz: 2a1dfc618f2723448b2fea3b39a48be64fad619c87a3b7d9257e3be8292f1ae86632c38563a7c9d938fd9699a0d78bac50e521d390bb40077ab824996b987ed2
-  data.tar.gz: d1a6401e8e236b718f488e1a1b5641fb953a912c719a5ea1010f7f307c99e7b96fd9f153fc483ebd7dbef5861a5daf9c12e2bdc03f846b62850662ee1837209a
+  metadata.gz: 14a06f171447f52515131ecfbfe308caacea813dad47d67eee45af086b134ac73677580a0e1f5a65bbbfdde1d078410d8cf3e7adb48ed588aab5049ef4fa3e50
+  data.tar.gz: 93469f1d98a053c685f9fde26d106907d4f89e3244d7f46abc99a2a0265b4bf22f63f5b652736658880968ac9d48ef4f5aae0a90c80b9d5ce2c8c03677ec6153

data/app/controllers/forest_liana/actions_controller.rb

@@ -1,7 +1,112 @@
 module ForestLiana
   class ActionsController < ForestLiana::BaseController
+
     def values
       render serializer: nil, json: {}, status: :ok
     end
+
+    def get_collection(collection_name)
+      ForestLiana.apimap.find { |collection| collection.name.to_s == collection_name }
+    end
+
+    def get_action(collection_name)
+      collection = get_collection(collection_name)
+      begin
+         collection.actions.find {|action| ActiveSupport::Inflector.parameterize(action.name) == params[:action_name]}
+      rescue => error
+        FOREST_LOGGER.error "Smart Action get action retrieval error: #{error}"
+        nil
+      end
+    end
+    
+    def get_record
+      model = ForestLiana::SchemaUtils.find_model_from_collection_name(params[:collectionName])
+      redord_getter = ForestLiana::ResourceGetter.new(model, {:id => params[:recordIds][0]})
+      redord_getter.perform
+      redord_getter.record
+    end
+
+    def get_smart_action_load_ctx(fields)
+      fields = fields.reduce({}) do |p, c|
+        ForestLiana::WidgetsHelper.set_field_widget(c)
+        p.update(c[:field] => c.merge!(value: nil))
+      end
+      {:record => get_record, :fields => fields}
+    end
+
+    def get_smart_action_change_ctx(fields)
+      fields = fields.reduce({}) do |p, c|
+        field = c.permit!.to_h.symbolize_keys
+        ForestLiana::WidgetsHelper.set_field_widget(field)
+        p.update(c[:field] => field)
+      end
+      {:record => get_record, :fields => fields}
+    end
+
+    def handle_result(result, formatted_fields, action)
+      if result.nil? || !result.is_a?(Hash)
+        return render status: 500, json: { error: 'Error in smart action load hook: hook must return an object' }
+      end
+      is_same_data_structure = ForestLiana::IsSameDataStructureHelper::Analyser.new(formatted_fields, result, 1)
+      unless is_same_data_structure.perform
+        return render status: 500, json: { error: 'Error in smart action hook: fields must be unchanged (no addition nor deletion allowed)' }
+      end
+
+      # Apply result on fields (transform the object back to an array), preserve order.
+      fields = action.fields.map do |field|
+        updated_field = result[field[:field]]
+
+        # Reset `value` when not present in `enums` (which means `enums` has changed).
+        if updated_field[:enums].is_a?(Array)
+          # `value` can be an array if the type of fields is `[x]`
+          if updated_field[:type].is_a?(Array) && updated_field[:value].is_a?(Array) && !(updated_field[:value] - updated_field[:enums]).empty?
+            updated_field[:value] = nil
+          end
+
+          # `value` can be any other value
+          if !updated_field[:type].is_a?(Array) && !updated_field[:enums].include?(updated_field[:value])
+            updated_field[:value] = nil
+          end
+        end
+
+        updated_field
+      end
+
+      render serializer: nil, json: { fields: fields}, status: :ok
+    end
+
+    def load
+      action = get_action(params[:collectionName])
+
+      if !action
+        render status: 500, json: {error: 'Error in smart action load hook: cannot retrieve action from collection'}
+      else
+        # Transform fields from array to an object to ease usage in hook, adds null value.
+        context = get_smart_action_load_ctx(action.fields)
+        formatted_fields = context[:fields].clone # clone for following test on is_same_data_structure
+
+        # Call the user-defined load hook.
+        result = action.hooks[:load].(context)
+
+        handle_result(result, formatted_fields, action)
+      end
+    end
+
+    def change
+      action = get_action(params[:collectionName])
+
+      if !action
+        render status: 500, json: {error: 'Error in smart action change hook: cannot retrieve action from collection'}
+      else
+        # Transform fields from array to an object to ease usage in hook.
+        context = get_smart_action_change_ctx(params[:fields])
+        formatted_fields = context[:fields].clone # clone for following test on is_same_data_structure
+
+        # Call the user-defined change hook.
+        result = action.hooks[:change][params[:changedField]].(context)
+
+        handle_result(result, formatted_fields, action)
+      end
+    end
   end
 end

data/app/controllers/forest_liana/authentication_controller.rb

@@ -46,7 +46,7 @@ module ForestLiana
           { 'renderingId' => rendering_id },
         )
 
-        redirect_to(result['authorization_url'])
+        render json: { authorizationUrl: result['authorization_url']}, status: 200
       rescue => error
         render json: { errors: [{ status: 500, detail: error.message }] },
           status: :internal_server_error, serializer: nil
@@ -69,7 +69,7 @@ module ForestLiana
             httponly: true,
             secure: true,
             expires: ForestLiana::Token.expiration_in_days,
-            samesite: 'none',
+            same_site: :None,
             path: '/'
           },
         )
@@ -86,8 +86,8 @@ module ForestLiana
         render json: response_body, status: 200
 
       rescue => error
-        render json: { errors: [{ status: 500, detail: error.message }] },
-          status: :internal_server_error, serializer: nil
+        render json: { errors: [{ status: error.try(:error_code) || 500, detail: error.message }] },
+          status: error.status || :internal_server_error, serializer: nil
       end
     end
 
@@ -104,7 +104,7 @@ module ForestLiana
                 httponly: true,
                 secure: true,
                 expires: Time.at(0),
-                samesite: 'none',
+                same_site: :None,
                 path: '/'
               },
             )

data/app/controllers/forest_liana/resources_controller.rb

@@ -16,18 +16,15 @@ module ForestLiana
     def index
       begin
         if request.format == 'csv'
-          checker = ForestLiana::PermissionsChecker.new(@resource, 'export', @rendering_id)
-          return head :forbidden unless checker.is_authorized?
-        elsif params.has_key?(:searchToEdit)
-          checker = ForestLiana::PermissionsChecker.new(@resource, 'searchToEdit', @rendering_id)
+          checker = ForestLiana::PermissionsChecker.new(@resource, 'exportEnabled', @rendering_id, user_id: forest_user['id'])
           return head :forbidden unless checker.is_authorized?
         else
           checker = ForestLiana::PermissionsChecker.new(
             @resource,
-            'list',
+            'browseEnabled',
             @rendering_id,
-            nil,
-            get_collection_list_permission_info(forest_user, request)
+            user_id: forest_user['id'],
+            collection_list_parameters: get_collection_list_permission_info(forest_user, request)
           )
           return head :forbidden unless checker.is_authorized?
         end
@@ -59,10 +56,10 @@ module ForestLiana
       begin
         checker = ForestLiana::PermissionsChecker.new(
           @resource,
-          'list',
+          'browseEnabled',
           @rendering_id,
-          nil,
-          get_collection_list_permission_info(forest_user, request)
+          user_id: forest_user['id'],
+          collection_list_parameters: get_collection_list_permission_info(forest_user, request)
         )
         return head :forbidden unless checker.is_authorized?
 
@@ -89,7 +86,7 @@ module ForestLiana
 
     def show
       begin
-        checker = ForestLiana::PermissionsChecker.new(@resource, 'show', @rendering_id)
+        checker = ForestLiana::PermissionsChecker.new(@resource, 'readEnabled', @rendering_id, user_id: forest_user['id'])
         return head :forbidden unless checker.is_authorized?
 
         getter = ForestLiana::ResourceGetter.new(@resource, params)
@@ -104,7 +101,7 @@ module ForestLiana
 
     def create
       begin
-        checker = ForestLiana::PermissionsChecker.new(@resource, 'create', @rendering_id)
+        checker = ForestLiana::PermissionsChecker.new(@resource, 'addEnabled', @rendering_id, user_id: forest_user['id'])
         return head :forbidden unless checker.is_authorized?
 
         creator = ForestLiana::ResourceCreator.new(@resource, params)
@@ -127,7 +124,7 @@ module ForestLiana
 
     def update
       begin
-        checker = ForestLiana::PermissionsChecker.new(@resource, 'update', @rendering_id)
+        checker = ForestLiana::PermissionsChecker.new(@resource, 'editEnabled', @rendering_id, user_id: forest_user['id'])
         return head :forbidden unless checker.is_authorized?
 
         updater = ForestLiana::ResourceUpdater.new(@resource, params)
@@ -149,7 +146,7 @@ module ForestLiana
     end
 
     def destroy
-      checker = ForestLiana::PermissionsChecker.new(@resource, 'delete', @rendering_id)
+      checker = ForestLiana::PermissionsChecker.new(@resource, 'deleteEnabled', @rendering_id, user_id: forest_user['id'])
       return head :forbidden unless checker.is_authorized?
 
       @resource.destroy(params[:id]) if @resource.exists?(params[:id])
@@ -161,7 +158,7 @@ module ForestLiana
     end
 
     def destroy_bulk
-      checker = ForestLiana::PermissionsChecker.new(@resource, 'delete', @rendering_id)
+      checker = ForestLiana::PermissionsChecker.new(@resource, 'deleteEnabled', @rendering_id, user_id: forest_user['id'])
       return head :forbidden unless checker.is_authorized?
 
       ids = ForestLiana::ResourcesGetter.get_ids_from_request(params)
@@ -245,8 +242,8 @@ module ForestLiana
       @collection ||= ForestLiana.apimap.find { |collection| collection.name.to_s == collection_name }
     end
 
-    # NOTICE: Return a formatted object containing the request condition filters and 
-    #         the user id used by the scope validator class to validate if scope is 
+    # NOTICE: Return a formatted object containing the request condition filters and
+    #         the user id used by the scope validator class to validate if scope is
     #         in request
     def get_collection_list_permission_info(user, collection_list_request)
       {

data/app/controllers/forest_liana/smart_actions_controller.rb

@@ -19,14 +19,15 @@ module ForestLiana
 
     def check_permission_for_smart_route
       begin
-        
+
         smart_action_request = get_smart_action_request
         if !smart_action_request.nil? && smart_action_request.has_key?(:smart_action_id)
           checker = ForestLiana::PermissionsChecker.new(
             find_resource(smart_action_request[:collection_name]),
             'actions',
             @rendering_id,
-            get_smart_action_permission_info(forest_user, smart_action_request)
+            user_id: forest_user['id'],
+            smart_action_request_info: get_smart_action_request_info
           )
           return head :forbidden unless checker.is_authorized?
         else
@@ -54,10 +55,14 @@ module ForestLiana
       end
     end
 
-    def get_smart_action_permission_info(user, smart_action_request)
+    # smart action permissions are retrieved from the action's endpoint and http_method
+    def get_smart_action_request_info
+      endpoint = request.fullpath
+      # Trim starting '/'
+      endpoint[0] = '' if endpoint[0] == '/'
       {
-        user_id: user['id'],
-        action_id: smart_action_request[:smart_action_id],
+        endpoint: endpoint,
+        http_method: request.request_method
       }
     end
   end

data/app/helpers/forest_liana/is_same_data_structure_helper.rb

@@ -0,0 +1,44 @@
+require 'set'
+
+module ForestLiana
+  module IsSameDataStructureHelper
+    class Analyser
+      def initialize(object, other, deep = 0)
+        @object = object
+        @other = other
+        @deep = deep
+      end
+
+      def are_objects(object, other)
+        object && other && object.is_a?(Hash) && other.is_a?(Hash)
+      end
+
+      def check_keys(object, other, step = 0)
+        unless are_objects(object, other)
+          return false
+        end
+
+        object_keys = object.keys
+        other_keys = other.keys
+
+        if object_keys.length != other_keys.length
+          return false
+        end
+
+        object_keys_set = object_keys.to_set
+        other_keys.each { |key|
+          if !object_keys_set.member?(key) || (step + 1 <= @deep && !check_keys(object[key], other[key], step + 1))
+            return false
+          end
+        }
+
+        return true
+      end
+
+      def perform
+        check_keys(@object, @other)
+      end
+    end
+  end
+end
+

data/app/helpers/forest_liana/widgets_helper.rb

@@ -0,0 +1,59 @@
+require 'set'
+
+module ForestLiana
+  module WidgetsHelper
+
+    @widget_edit_list = [
+      'address editor',
+      'belongsto typeahead',
+      'belongsto dropdown',
+      'boolean editor',
+      'checkboxes',
+      'color editor',
+      'date editor',
+      'dropdown',
+      'embedded document editor',
+      'file picker',
+      'json code editor',
+      'input array',
+      'multiple select',
+      'number input',
+      'point editor',
+      'price editor',
+      'radio button',
+      'rich text',
+      'text area editor',
+      'text editor',
+      'time input',
+    ]
+
+    @v1_to_v2_edit_widgets_mapping = {
+      address: 'address editor',
+      'belongsto select': 'belongsto dropdown',
+      'color picker': 'color editor',
+      'date picker': 'date editor',
+      price: 'price editor',
+      'JSON editor': 'json code editor',
+      'rich text editor': 'rich text',
+      'text area': 'text area editor',
+      'text input': 'text editor',
+    }
+
+    def self.set_field_widget(field)
+
+      if field[:widget]
+        if @v1_to_v2_edit_widgets_mapping[field[:widget].to_sym]
+          field[:widgetEdit] = {name: @v1_to_v2_edit_widgets_mapping[field[:widget].to_sym], parameters: {}}
+        elsif @widget_edit_list.include?(field[:widget])
+          field[:widgetEdit] = {name: field[:widget], parameters: {}}
+        end
+      end
+
+      if !field.key?(:widgetEdit)
+        field[:widgetEdit] = nil
+      end
+
+      field.delete(:widget)
+    end
+  end
+end

data/app/models/forest_liana/model/action.rb

@@ -5,7 +5,7 @@ class ForestLiana::Model::Action
   extend ActiveModel::Naming
 
   attr_accessor :id, :name, :base_url, :endpoint, :http_method, :fields, :redirect,
-    :type, :download
+    :type, :download, :hooks
 
   def initialize(attributes = {})
     if attributes.key?(:global)
@@ -66,6 +66,7 @@ class ForestLiana::Model::Action
     @base_url ||= nil
     @type ||= "bulk"
     @download ||= false
+    @hooks = !@hooks.nil? ? @hooks.symbolize_keys : nil
   end
 
   def persisted?

data/app/serializers/forest_liana/stripe_invoice_serializer.rb

@@ -3,20 +3,20 @@ module ForestLiana
     include JSONAPI::Serializer
 
     attribute :amount_due
+    attribute :amount_paid
+    attribute :amount_remaining
+    attribute :application_fee_amount
     attribute :attempt_count
     attribute :attempted
-    attribute :closed
     attribute :currency
-    attribute :date
-    attribute :forgiven
+    attribute :due_date
     attribute :paid
     attribute :period_end
     attribute :period_start
+    attribute :status
     attribute :subtotal
     attribute :total
-    attribute :application_fee
     attribute :tax
-    attribute :tax_percent
 
     has_one :customer
 

data/app/services/forest_liana/apimap_sorter.rb

@@ -39,6 +39,7 @@ module ForestLiana
       'redirect',
       'download',
       'fields',
+      'hooks',
     ]
     KEYS_ACTION_FIELD = [
       'field',