forest_admin_agent 1.0.0.pre.beta.45 → 1.0.0.pre.beta.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d61e45333bea735ec3c47b19b761f8081bc6bf3cb7e78f2df61ed43eecf4ce9
-  data.tar.gz: 833560b6f78019008a1f7c8dd8a640b65cb1870ae7f341a10d22986d244bc300
+  metadata.gz: 56cd6d9f71a53bee234570bccd942191684758b3a0b261549c8cf504f02d7b64
+  data.tar.gz: 5e1ef6098d3e45feccf9e521a4e1ee0684a76eaa0c7b19fcd3a09a1a565604b1
 SHA512:
-  metadata.gz: 00a941a6b5c3417233a5a141451d145282e4a1dd6765dd782742d886ed8f10eadea02cdcb92285f614f6c04deb6b1359a43ba2ae2f286f110bde6f8ebf717d04
-  data.tar.gz: 07db816bfdc85d3228f11515a4e9ba56be78425b6cba049176f837c72e3555cc325cc5481409ef302eadc81781efcad44d9648a1dcc7e363df39ab2cd3eef12e
+  metadata.gz: 34525c9a9648c71da21fd815b4a16608db211fc897fbe8def79445c3d800b56ac6339f8a3e6e4ae6f9b5043da9c735bd5c3ebd4fed434dc7c279dc6781531c3c
+  data.tar.gz: 1fd874f037ef715a8f1f8cc9a887abc97311c304c5171c37a94f6b9499cb5fc8b1d57d3fcfca6734f3b129d91a1af2dfebe8b1231d6a747feada2ff7b4a026da

data/lib/forest_admin_agent/auth/oidc_client_manager.rb

@@ -9,6 +9,12 @@ module ForestAdminAgent
       TTL = 60 * 60 * 24
 
       def make_forest_provider(rendering_id)
+        if Facades::Container.cache(:debug)
+          OpenIDConnect.http_config do |options|
+            options.ssl.verify = false
+          end
+        end
+
         config_agent = Facades::Container.config_from_cache
         cache_key = "#{config_agent[:env_secret]}-client-data"
         cache = setup_cache(cache_key, config_agent)

data/lib/forest_admin_agent/http/forest_admin_api_requester.rb

@@ -13,7 +13,8 @@ module ForestAdminAgent
         @client = Faraday.new(
           Facades::Container.cache(:forest_server_url),
           {
-            headers: @headers
+            headers: @headers,
+            ssl: { verify: !Facades::Container.cache(:debug) }
           }
         )
       end

data/lib/forest_admin_agent/services/ip_whitelist.rb

@@ -1,5 +1,4 @@
 require 'ipaddress'
-require 'net/http'
 
 module ForestAdminAgent
   module Services
@@ -8,15 +7,19 @@ module ForestAdminAgent
       RULE_MATCH_RANGE = 1
       RULE_MATCH_SUBNET = 2
 
+      attr_reader :forest_api
+
       def initialize
-        fetch_rules
+        @forest_api = ForestAdminAgent::Http::ForestAdminApiRequester.new
       end
 
       def use_ip_whitelist
+        fetch_rules if @use_ip_whitelist.nil?
         @use_ip_whitelist ||= false
       end
 
       def rules
+        fetch_rules if @rules.nil?
         @rules ||= []
       end
 
@@ -82,18 +85,15 @@ module ForestAdminAgent
       private
 
       def fetch_rules
-        response = Net::HTTP.get_response(
-          URI("#{Facades::Container.cache(:forest_server_url)}/liana/v1/ip-whitelist-rules"),
-          { 'Content-Type' => 'application/json', 'forest-secret-key' => Facades::Container.cache(:env_secret) }
-        )
-
-        raise Error, ForestAdminAgent::Utils::ErrorMessages::UNEXPECTED unless response.is_a?(Net::HTTPSuccess)
+        response = forest_api.get('/liana/v1/ip-whitelist-rules')
 
         body = JSON.parse(response.body)
         ip_whitelist_data = body['data']['attributes']
 
         @use_ip_whitelist = ip_whitelist_data['use_ip_whitelist']
         @rules = ip_whitelist_data['rules']
+      rescue StandardError
+        raise Error, ForestAdminAgent::Utils::ErrorMessages::UNEXPECTED
       end
     end
   end

data/lib/forest_admin_agent/utils/query_string_parser.rb

@@ -106,15 +106,24 @@ module ForestAdminAgent
       end
 
       def self.parse_sort(collection, args)
-        sort_string = args.dig(:params, :sort)
+        raw_sort_string = args.dig(:params, :sort)
 
-        return SortUtils::SortFactory.by_primary_keys(collection) unless sort_string
+        return SortUtils::SortFactory.by_primary_keys(collection) unless raw_sort_string
 
-        sort = Sort.new([
-                          { field: sort_string.gsub(/^-/, '').tr('.', ':'), ascending: !sort_string.start_with?('-') }
-                        ])
+        sort_list = []
+        raw_sort_string.split(',').map do |sort_string|
+          field = sort_string.tr('.', ':')
+          ascending = !sort_string.start_with?('-')
+          field = field[1..] unless ascending
+
+          sort_list.push({ field: field, ascending: ascending })
+        end
+
+        sort = Sort.new(sort_list)
 
         ForestAdminDatasourceToolkit::Validations::SortValidator.validate(collection, sort)
+
+        sort
       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.45"
+        LIANA_VERSION = "1.0.0-beta.47"
 
         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.45"
+  VERSION = "1.0.0-beta.47"
 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.45
+  version: 1.0.0.pre.beta.47
 platform: ruby
 authors:
 - Matthieu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport