merge_ruby_client 0.1.2 → 0.1.4

data/lib/merge_ruby_client/filestorage/generate_key/client.rb

@@ -23,17 +23,24 @@ module Merge
       # @return [Merge::Filestorage::RemoteKey]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.create(name: "Remote Deployment Key 1")
+      #  api.filestorage.generate_key.create(name: "Remote Deployment Key 1")
       def create(name:, request_options: nil)
         response = @request_client.conn.post do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
+          unless request_options.nil? || request_options&.additional_query_parameters.nil?
+            req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+          end
           req.body = { **(request_options&.additional_body_parameters || {}), name: name }.compact
           req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/generate-key"
         end
@@ -58,18 +65,25 @@ module Merge
       # @return [Merge::Filestorage::RemoteKey]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.create(name: "Remote Deployment Key 1")
+      #  api.filestorage.generate_key.create(name: "Remote Deployment Key 1")
       def create(name:, request_options: nil)
         Async do
           response = @request_client.conn.post do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
+            unless request_options.nil? || request_options&.additional_query_parameters.nil?
+              req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+            end
             req.body = { **(request_options&.additional_body_parameters || {}), name: name }.compact
             req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/generate-key"
           end

data/lib/merge_ruby_client/filestorage/groups/client.rb

@@ -35,18 +35,22 @@ module Merge
       # @return [Merge::Filestorage::PaginatedGroupList]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.list
+      #  api.filestorage.groups.list
       def list(created_after: nil, created_before: nil, cursor: nil, include_deleted_data: nil,
                include_remote_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
           req.params = {
             **(request_options&.additional_query_parameters || {}),
             "created_after": created_after,
@@ -59,6 +63,9 @@ module Merge
             "page_size": page_size,
             "remote_id": remote_id
           }.compact
+          unless request_options.nil? || request_options&.additional_body_parameters.nil?
+            req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+          end
           req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/groups"
         end
         Merge::Filestorage::PaginatedGroupList.from_json(json_object: response.body)
@@ -73,21 +80,28 @@ module Merge
       # @return [Merge::Filestorage::Group]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.retrieve(id: "id")
+      #  api.filestorage.groups.retrieve(id: "id")
       def retrieve(id:, include_remote_data: nil, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
           req.params = {
             **(request_options&.additional_query_parameters || {}),
             "include_remote_data": include_remote_data
           }.compact
+          unless request_options.nil? || request_options&.additional_body_parameters.nil?
+            req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+          end
           req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/groups/#{id}"
         end
         Merge::Filestorage::Group.from_json(json_object: response.body)
@@ -121,11 +135,11 @@ module Merge
       # @return [Merge::Filestorage::PaginatedGroupList]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.list
+      #  api.filestorage.groups.list
       def list(created_after: nil, created_before: nil, cursor: nil, include_deleted_data: nil,
                include_remote_data: nil, modified_after: nil, modified_before: nil, page_size: nil, remote_id: nil, request_options: nil)
         Async do
@@ -133,7 +147,11 @@ module Merge
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
             req.params = {
               **(request_options&.additional_query_parameters || {}),
               "created_after": created_after,
@@ -146,6 +164,9 @@ module Merge
               "page_size": page_size,
               "remote_id": remote_id
             }.compact
+            unless request_options.nil? || request_options&.additional_body_parameters.nil?
+              req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+            end
             req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/groups"
           end
           Merge::Filestorage::PaginatedGroupList.from_json(json_object: response.body)
@@ -161,22 +182,29 @@ module Merge
       # @return [Merge::Filestorage::Group]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.retrieve(id: "id")
+      #  api.filestorage.groups.retrieve(id: "id")
       def retrieve(id:, include_remote_data: nil, request_options: nil)
         Async do
           response = @request_client.conn.get do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
             req.params = {
               **(request_options&.additional_query_parameters || {}),
               "include_remote_data": include_remote_data
             }.compact
+            unless request_options.nil? || request_options&.additional_body_parameters.nil?
+              req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+            end
             req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/groups/#{id}"
           end
           Merge::Filestorage::Group.from_json(json_object: response.body)

data/lib/merge_ruby_client/filestorage/issues/client.rb

@@ -19,7 +19,7 @@ module Merge
         @request_client = request_client
       end
 
-      # Gets issues.
+      # Gets all issues for Organization.
       #
       # @param account_token [String]
       # @param cursor [String] The pagination cursor value.
@@ -36,6 +36,8 @@ module Merge
       #  datetime.
       # @param last_incident_time_before [DateTime] If provided, will only return issues whose last incident time was before this
       #  datetime.
+      # @param linked_account_id [String] If provided, will only include issues pertaining to the linked account passed
+      #  in.
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include issues whose most recent action occurred after
       #  this time
@@ -46,18 +48,22 @@ module Merge
       # @return [Merge::Filestorage::PaginatedIssueList]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.list
+      #  api.filestorage.issues.list
       def list(account_token: nil, cursor: nil, end_date: nil, end_user_organization_name: nil,
-               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
+               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, linked_account_id: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
           req.params = {
             **(request_options&.additional_query_parameters || {}),
             "account_token": account_token,
@@ -70,10 +76,14 @@ module Merge
             "integration_name": integration_name,
             "last_incident_time_after": last_incident_time_after,
             "last_incident_time_before": last_incident_time_before,
+            "linked_account_id": linked_account_id,
             "page_size": page_size,
             "start_date": start_date,
             "status": status
           }.compact
+          unless request_options.nil? || request_options&.additional_body_parameters.nil?
+            req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+          end
           req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/issues"
         end
         Merge::Filestorage::PaginatedIssueList.from_json(json_object: response.body)
@@ -86,17 +96,27 @@ module Merge
       # @return [Merge::Filestorage::Issue]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.retrieve(id: "id")
+      #  api.filestorage.issues.retrieve(id: "id")
       def retrieve(id:, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
+          unless request_options.nil? || request_options&.additional_query_parameters.nil?
+            req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+          end
+          unless request_options.nil? || request_options&.additional_body_parameters.nil?
+            req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+          end
           req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/issues/#{id}"
         end
         Merge::Filestorage::Issue.from_json(json_object: response.body)
@@ -113,7 +133,7 @@ module Merge
         @request_client = request_client
       end
 
-      # Gets issues.
+      # Gets all issues for Organization.
       #
       # @param account_token [String]
       # @param cursor [String] The pagination cursor value.
@@ -130,6 +150,8 @@ module Merge
       #  datetime.
       # @param last_incident_time_before [DateTime] If provided, will only return issues whose last incident time was before this
       #  datetime.
+      # @param linked_account_id [String] If provided, will only include issues pertaining to the linked account passed
+      #  in.
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include issues whose most recent action occurred after
       #  this time
@@ -140,19 +162,23 @@ module Merge
       # @return [Merge::Filestorage::PaginatedIssueList]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.list
+      #  api.filestorage.issues.list
       def list(account_token: nil, cursor: nil, end_date: nil, end_user_organization_name: nil,
-               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
+               first_incident_time_after: nil, first_incident_time_before: nil, include_muted: nil, integration_name: nil, last_incident_time_after: nil, last_incident_time_before: nil, linked_account_id: nil, page_size: nil, start_date: nil, status: nil, request_options: nil)
         Async do
           response = @request_client.conn.get do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
             req.params = {
               **(request_options&.additional_query_parameters || {}),
               "account_token": account_token,
@@ -165,10 +191,14 @@ module Merge
               "integration_name": integration_name,
               "last_incident_time_after": last_incident_time_after,
               "last_incident_time_before": last_incident_time_before,
+              "linked_account_id": linked_account_id,
               "page_size": page_size,
               "start_date": start_date,
               "status": status
             }.compact
+            unless request_options.nil? || request_options&.additional_body_parameters.nil?
+              req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+            end
             req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/issues"
           end
           Merge::Filestorage::PaginatedIssueList.from_json(json_object: response.body)
@@ -182,18 +212,28 @@ module Merge
       # @return [Merge::Filestorage::Issue]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.retrieve(id: "id")
+      #  api.filestorage.issues.retrieve(id: "id")
       def retrieve(id:, request_options: nil)
         Async do
           response = @request_client.conn.get do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
+            unless request_options.nil? || request_options&.additional_query_parameters.nil?
+              req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+            end
+            unless request_options.nil? || request_options&.additional_body_parameters.nil?
+              req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+            end
             req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/issues/#{id}"
           end
           Merge::Filestorage::Issue.from_json(json_object: response.body)

data/lib/merge_ruby_client/filestorage/link_token/client.rb

@@ -35,6 +35,9 @@ module Merge
       # @param should_create_magic_link_url [Boolean] Whether to generate a Magic Link URL. Defaults to false. For more information on
       #  Magic Link, see
       #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
+      # @param hide_admin_magic_link [Boolean] Whether to generate a Magic Link URL on the Admin Needed screen during the
+      #  linking flow. Defaults to false. For more information on Magic Link, see
+      #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
       # @param common_models [Array<Hash>] An array of objects to specify the models and fields that will be disabled for a
       #  given Linked Account. Each object uses model_id, enabled_actions, and
       #  disabled_fields to specify the model, method, and fields that are scoped for a
@@ -51,23 +54,30 @@ module Merge
       # @return [Merge::Filestorage::LinkToken]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.create(
+      #  api.filestorage.link_token.create(
       #    end_user_email_address: "example@gmail.com",
       #    end_user_organization_name: "Test Organization",
       #    end_user_origin_id: "12345",
       #    categories: [HRIS, ATS]
       #  )
       def create(end_user_email_address:, end_user_organization_name:, end_user_origin_id:, categories:,
-                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
+                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, hide_admin_magic_link: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
         response = @request_client.conn.post do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
+          unless request_options.nil? || request_options&.additional_query_parameters.nil?
+            req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+          end
           req.body = {
             **(request_options&.additional_body_parameters || {}),
             end_user_email_address: end_user_email_address,
@@ -77,6 +87,7 @@ module Merge
             integration: integration,
             link_expiry_mins: link_expiry_mins,
             should_create_magic_link_url: should_create_magic_link_url,
+            hide_admin_magic_link: hide_admin_magic_link,
             common_models: common_models,
             category_common_model_scopes: category_common_model_scopes,
             language: language,
@@ -115,6 +126,9 @@ module Merge
       # @param should_create_magic_link_url [Boolean] Whether to generate a Magic Link URL. Defaults to false. For more information on
       #  Magic Link, see
       #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
+      # @param hide_admin_magic_link [Boolean] Whether to generate a Magic Link URL on the Admin Needed screen during the
+      #  linking flow. Defaults to false. For more information on Magic Link, see
+      #  https://merge.dev/blog/integrations-fast-say-hello-to-magic-link.
       # @param common_models [Array<Hash>] An array of objects to specify the models and fields that will be disabled for a
       #  given Linked Account. Each object uses model_id, enabled_actions, and
       #  disabled_fields to specify the model, method, and fields that are scoped for a
@@ -131,24 +145,31 @@ module Merge
       # @return [Merge::Filestorage::LinkToken]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.create(
+      #  api.filestorage.link_token.create(
       #    end_user_email_address: "example@gmail.com",
       #    end_user_organization_name: "Test Organization",
       #    end_user_origin_id: "12345",
       #    categories: [HRIS, ATS]
       #  )
       def create(end_user_email_address:, end_user_organization_name:, end_user_origin_id:, categories:,
-                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
+                 integration: nil, link_expiry_mins: nil, should_create_magic_link_url: nil, hide_admin_magic_link: nil, common_models: nil, category_common_model_scopes: nil, language: nil, integration_specific_config: nil, request_options: nil)
         Async do
           response = @request_client.conn.post do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
+            unless request_options.nil? || request_options&.additional_query_parameters.nil?
+              req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+            end
             req.body = {
               **(request_options&.additional_body_parameters || {}),
               end_user_email_address: end_user_email_address,
@@ -158,6 +179,7 @@ module Merge
               integration: integration,
               link_expiry_mins: link_expiry_mins,
               should_create_magic_link_url: should_create_magic_link_url,
+              hide_admin_magic_link: hide_admin_magic_link,
               common_models: common_models,
               category_common_model_scopes: category_common_model_scopes,
               language: language,

data/lib/merge_ruby_client/filestorage/linked_accounts/client.rb

@@ -19,8 +19,7 @@ module Merge
 
       # List linked accounts for your organization.
       #
-      # @param category [Merge::Filestorage::LinkedAccounts::LinkedAccountsListRequestCategory] Options: ('hris', 'ats', 'accounting', 'ticketing', 'crm', 'mktg',
-      #  'filestorage')
+      # @param category [Merge::Filestorage::LinkedAccounts::LinkedAccountsListRequestCategory] Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
       #  - `hris` - hris
       #  - `ats` - ats
       #  - `accounting` - accounting
@@ -53,18 +52,22 @@ module Merge
       # @return [Merge::Filestorage::PaginatedAccountDetailsAndActionsList]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.list
+      #  api.filestorage.linked_accounts.list
       def list(category: nil, cursor: nil, end_user_email_address: nil, end_user_organization_name: nil,
                end_user_origin_id: nil, end_user_origin_ids: nil, id: nil, ids: nil, include_duplicates: nil, integration_name: nil, is_test_account: nil, page_size: nil, status: nil, request_options: nil)
         response = @request_client.conn.get do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
           req.params = {
             **(request_options&.additional_query_parameters || {}),
             "category": category,
@@ -81,6 +84,9 @@ module Merge
             "page_size": page_size,
             "status": status
           }.compact
+          unless request_options.nil? || request_options&.additional_body_parameters.nil?
+            req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+          end
           req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/linked-accounts"
         end
         Merge::Filestorage::PaginatedAccountDetailsAndActionsList.from_json(json_object: response.body)
@@ -99,8 +105,7 @@ module Merge
 
       # List linked accounts for your organization.
       #
-      # @param category [Merge::Filestorage::LinkedAccounts::LinkedAccountsListRequestCategory] Options: ('hris', 'ats', 'accounting', 'ticketing', 'crm', 'mktg',
-      #  'filestorage')
+      # @param category [Merge::Filestorage::LinkedAccounts::LinkedAccountsListRequestCategory] Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
       #  - `hris` - hris
       #  - `ats` - ats
       #  - `accounting` - accounting
@@ -133,11 +138,11 @@ module Merge
       # @return [Merge::Filestorage::PaginatedAccountDetailsAndActionsList]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.list
+      #  api.filestorage.linked_accounts.list
       def list(category: nil, cursor: nil, end_user_email_address: nil, end_user_organization_name: nil,
                end_user_origin_id: nil, end_user_origin_ids: nil, id: nil, ids: nil, include_duplicates: nil, integration_name: nil, is_test_account: nil, page_size: nil, status: nil, request_options: nil)
         Async do
@@ -145,7 +150,11 @@ module Merge
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
             req.params = {
               **(request_options&.additional_query_parameters || {}),
               "category": category,
@@ -162,6 +171,9 @@ module Merge
               "page_size": page_size,
               "status": status
             }.compact
+            unless request_options.nil? || request_options&.additional_body_parameters.nil?
+              req.body = { **(request_options&.additional_body_parameters || {}) }.compact
+            end
             req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/linked-accounts"
           end
           Merge::Filestorage::PaginatedAccountDetailsAndActionsList.from_json(json_object: response.body)

data/lib/merge_ruby_client/filestorage/passthrough/client.rb

@@ -32,17 +32,24 @@ module Merge
       # @return [Merge::Filestorage::RemoteResponse]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.create(request: { method: GET, path: "/scooters" })
+      #  api.filestorage.passthrough.create(request: { method: GET, path: "/scooters" })
       def create(request:, request_options: nil)
         response = @request_client.conn.post do |req|
           req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
           req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
           req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-          req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+          req.headers = {
+        **(req.headers || {}),
+        **@request_client.get_headers,
+        **(request_options&.additional_headers || {})
+          }.compact
+          unless request_options.nil? || request_options&.additional_query_parameters.nil?
+            req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+          end
           req.body = { **(request || {}), **(request_options&.additional_body_parameters || {}) }.compact
           req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/passthrough"
         end
@@ -75,18 +82,25 @@ module Merge
       # @return [Merge::Filestorage::RemoteResponse]
       # @example
       #  api = Merge::Client.new(
-      #    environment: Environment::PRODUCTION,
       #    base_url: "https://api.example.com",
+      #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.create(request: { method: GET, path: "/scooters" })
+      #  api.filestorage.passthrough.create(request: { method: GET, path: "/scooters" })
       def create(request:, request_options: nil)
         Async do
           response = @request_client.conn.post do |req|
             req.options.timeout = request_options.timeout_in_seconds unless request_options&.timeout_in_seconds.nil?
             req.headers["Authorization"] = request_options.api_key unless request_options&.api_key.nil?
             req.headers["X-Account-Token"] = request_options.account_token unless request_options&.account_token.nil?
-            req.headers = { **req.headers, **(request_options&.additional_headers || {}) }.compact
+            req.headers = {
+          **(req.headers || {}),
+          **@request_client.get_headers,
+          **(request_options&.additional_headers || {})
+            }.compact
+            unless request_options.nil? || request_options&.additional_query_parameters.nil?
+              req.params = { **(request_options&.additional_query_parameters || {}) }.compact
+            end
             req.body = { **(request || {}), **(request_options&.additional_body_parameters || {}) }.compact
             req.url "#{@request_client.get_url(request_options: request_options)}/filestorage/v1/passthrough"
           end