merge_ruby_client 0.1.3 → 0.1.4

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
@@ -52,7 +54,7 @@ module Merge
       #  )
       #  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?
@@ -74,6 +76,7 @@ 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
@@ -130,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.
@@ -147,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
@@ -163,7 +168,7 @@ module Merge
       #  )
       #  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?
@@ -186,6 +191,7 @@ 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

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
@@ -62,7 +65,7 @@ module Merge
       #    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?
@@ -84,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,
@@ -122,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
@@ -149,7 +156,7 @@ module Merge
       #    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?
@@ -172,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
@@ -106,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

data/lib/merge_ruby_client/filestorage/types/account_integration.rb

@@ -9,6 +9,11 @@ module Merge
     class AccountIntegration
       # @return [String] Company name.
       attr_reader :name
+      # @return [String] Optional. This shortened name appears in places with limited space, usually in
+      #  conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example:
+      #  <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP
+      #  SuccessFactors)</i>
+      attr_reader :abbreviated_name
       # @return [Array<Merge::Filestorage::CategoriesEnum>] Category or categories this integration belongs to. Multiple categories should
       #  be comma separated, i.e. [ats, hris].
       attr_reader :categories
@@ -41,6 +46,10 @@ module Merge
       OMIT = Object.new
 
       # @param name [String] Company name.
+      # @param abbreviated_name [String] Optional. This shortened name appears in places with limited space, usually in
+      #  conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example:
+      #  <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP
+      #  SuccessFactors)</i>
       # @param categories [Array<Merge::Filestorage::CategoriesEnum>] Category or categories this integration belongs to. Multiple categories should
       #  be comma separated, i.e. [ats, hris].
       # @param image [String] Company logo in rectangular shape. <b>Upload an image with a clear
@@ -58,9 +67,10 @@ module Merge
       # @param category_beta_status [Hash{String => Object}] Category or categories this integration is in beta status for.
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::AccountIntegration]
-      def initialize(name:, categories: OMIT, image: OMIT, square_image: OMIT, color: OMIT, slug: OMIT,
-                     api_endpoints_to_documentation_urls: OMIT, webhook_setup_guide_url: OMIT, category_beta_status: OMIT, additional_properties: nil)
+      def initialize(name:, abbreviated_name: OMIT, categories: OMIT, image: OMIT, square_image: OMIT, color: OMIT,
+                     slug: OMIT, api_endpoints_to_documentation_urls: OMIT, webhook_setup_guide_url: OMIT, category_beta_status: OMIT, additional_properties: nil)
         @name = name
+        @abbreviated_name = abbreviated_name if abbreviated_name != OMIT
         @categories = categories if categories != OMIT
         @image = image if image != OMIT
         @square_image = square_image if square_image != OMIT
@@ -74,6 +84,7 @@ module Merge
         @additional_properties = additional_properties
         @_field_set = {
           "name": name,
+          "abbreviated_name": abbreviated_name,
           "categories": categories,
           "image": image,
           "square_image": square_image,
@@ -95,6 +106,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
         name = parsed_json["name"]
+        abbreviated_name = parsed_json["abbreviated_name"]
         categories = parsed_json["categories"]
         image = parsed_json["image"]
         square_image = parsed_json["square_image"]
@@ -105,6 +117,7 @@ module Merge
         category_beta_status = parsed_json["category_beta_status"]
         new(
           name: name,
+          abbreviated_name: abbreviated_name,
           categories: categories,
           image: image,
           square_image: square_image,
@@ -132,6 +145,7 @@ module Merge
       # @return [Void]
       def self.validate_raw(obj:)
         obj.name.is_a?(String) != false || raise("Passed value for field obj.name is not the expected type, validation failed.")
+        obj.abbreviated_name&.is_a?(String) != false || raise("Passed value for field obj.abbreviated_name is not the expected type, validation failed.")
         obj.categories&.is_a?(Array) != false || raise("Passed value for field obj.categories is not the expected type, validation failed.")
         obj.image&.is_a?(String) != false || raise("Passed value for field obj.image is not the expected type, validation failed.")
         obj.square_image&.is_a?(String) != false || raise("Passed value for field obj.square_image is not the expected type, validation failed.")

data/lib/merge_ruby_client/filestorage/types/audit_log_event.rb

@@ -71,6 +71,7 @@ module Merge
       #  - `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK
       #  - `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK
       #  - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
+      #  - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
       attr_reader :event_type
       # @return [String]
       attr_reader :event_description
@@ -141,6 +142,7 @@ module Merge
       #  - `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK
       #  - `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK
       #  - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
+      #  - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
       # @param event_description [String]
       # @param created_at [DateTime]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition

data/lib/merge_ruby_client/filestorage/types/event_type_enum.rb

@@ -46,6 +46,7 @@ module Merge
     #  - `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK
     #  - `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK
     #  - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
+    #  - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
     class EventTypeEnum
       CREATED_REMOTE_PRODUCTION_API_KEY = "CREATED_REMOTE_PRODUCTION_API_KEY"
       DELETED_REMOTE_PRODUCTION_API_KEY = "DELETED_REMOTE_PRODUCTION_API_KEY"
@@ -84,6 +85,7 @@ module Merge
       ENABLED_MERGE_WEBHOOK = "ENABLED_MERGE_WEBHOOK"
       DISABLED_MERGE_WEBHOOK = "DISABLED_MERGE_WEBHOOK"
       MERGE_WEBHOOK_TARGET_CHANGED = "MERGE_WEBHOOK_TARGET_CHANGED"
+      END_USER_CREDENTIALS_ACCESSED = "END_USER_CREDENTIALS_ACCESSED"
     end
   end
 end

data/lib/merge_ruby_client/filestorage/types/group.rb

@@ -8,7 +8,7 @@ module Merge
   module Filestorage
     # # The Group Object
     #  ### Description
-    #  The `Group` object is used to represent any subset of `User`s. This can extend
+    #  The `Group` object is used to represent any subset of `Users`. This can extend
     #  to company domains as well.
     #  ### Usage Example
     #  Fetch from the `GET /api/filestorage/v1/groups` endpoint and view their groups.

data/lib/merge_ruby_client/filestorage/types/remote_field_api.rb

@@ -37,12 +37,12 @@ module Merge
       # @param coverage [Merge::Filestorage::RemoteFieldApiCoverage]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::RemoteFieldApi]
-      def initialize(schema:, remote_key_name:, remote_endpoint_info:, example_values:, advanced_metadata: OMIT,
+      def initialize(schema:, remote_key_name:, remote_endpoint_info:, example_values: OMIT, advanced_metadata: OMIT,
                      coverage: OMIT, additional_properties: nil)
         @schema = schema
         @remote_key_name = remote_key_name
         @remote_endpoint_info = remote_endpoint_info
-        @example_values = example_values
+        @example_values = example_values if example_values != OMIT
         @advanced_metadata = advanced_metadata if advanced_metadata != OMIT
         @coverage = coverage if coverage != OMIT
         @additional_properties = additional_properties
@@ -114,7 +114,7 @@ module Merge
         obj.schema.is_a?(Hash) != false || raise("Passed value for field obj.schema is not the expected type, validation failed.")
         obj.remote_key_name.is_a?(String) != false || raise("Passed value for field obj.remote_key_name is not the expected type, validation failed.")
         Merge::Filestorage::RemoteEndpointInfo.validate_raw(obj: obj.remote_endpoint_info)
-        obj.example_values.is_a?(Array) != false || raise("Passed value for field obj.example_values is not the expected type, validation failed.")
+        obj.example_values&.is_a?(Array) != false || raise("Passed value for field obj.example_values is not the expected type, validation failed.")
         obj.advanced_metadata.nil? || Merge::Filestorage::AdvancedMetadata.validate_raw(obj: obj.advanced_metadata)
         obj.coverage.nil? || Merge::Filestorage::RemoteFieldApiCoverage.validate_raw(obj: obj.coverage)
       end

data/lib/merge_ruby_client/hris/audit_trail/client.rb

@@ -40,7 +40,8 @@ module Merge
       #  `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`,
       #  `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`,
       #  `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`,
-      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
+      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`,
+      #  `END_USER_CREDENTIALS_ACCESSED`
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include audit trail events that occurred after this time
       # @param user_email [String] If provided, this will return events associated with the specified user email.
@@ -118,7 +119,8 @@ module Merge
       #  `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`,
       #  `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`,
       #  `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`,
-      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
+      #  `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`,
+      #  `END_USER_CREDENTIALS_ACCESSED`
       # @param page_size [Integer] Number of results to return per page.
       # @param start_date [String] If included, will only include audit trail events that occurred after this time
       # @param user_email [String] If provided, this will return events associated with the specified user email.

data/lib/merge_ruby_client/hris/bank_info/client.rb

@@ -39,7 +39,8 @@ module Merge
       # @param modified_after [DateTime] If provided, only objects synced by Merge after this date time will be returned.
       # @param modified_before [DateTime] If provided, only objects synced by Merge before this date time will be
       #  returned.
-      # @param order_by [Merge::Hris::BankInfo::BankInfoListRequestOrderBy] Overrides the default ordering for this endpoint.
+      # @param order_by [Merge::Hris::BankInfo::BankInfoListRequestOrderBy] Overrides the default ordering for this endpoint. Possible values include:
+      #  remote_created_at, -remote_created_at.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_fields [String] Deprecated. Use show_enum_origins.
       # @param remote_id [String] The API provider's ID for the given object.
@@ -169,7 +170,8 @@ module Merge
       # @param modified_after [DateTime] If provided, only objects synced by Merge after this date time will be returned.
       # @param modified_before [DateTime] If provided, only objects synced by Merge before this date time will be
       #  returned.
-      # @param order_by [Merge::Hris::BankInfo::BankInfoListRequestOrderBy] Overrides the default ordering for this endpoint.
+      # @param order_by [Merge::Hris::BankInfo::BankInfoListRequestOrderBy] Overrides the default ordering for this endpoint. Possible values include:
+      #  remote_created_at, -remote_created_at.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_fields [String] Deprecated. Use show_enum_origins.
       # @param remote_id [String] The API provider's ID for the given object.

data/lib/merge_ruby_client/hris/employments/client.rb

@@ -39,7 +39,8 @@ module Merge
       # @param modified_after [DateTime] If provided, only objects synced by Merge after this date time will be returned.
       # @param modified_before [DateTime] If provided, only objects synced by Merge before this date time will be
       #  returned.
-      # @param order_by [Merge::Hris::Employments::EmploymentsListRequestOrderBy] Overrides the default ordering for this endpoint.
+      # @param order_by [Merge::Hris::Employments::EmploymentsListRequestOrderBy] Overrides the default ordering for this endpoint. Possible values include:
+      #  effective_date, -effective_date.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_fields [Merge::Hris::Employments::EmploymentsListRequestRemoteFields] Deprecated. Use show_enum_origins.
       # @param remote_id [String] The API provider's ID for the given object.
@@ -162,7 +163,8 @@ module Merge
       # @param modified_after [DateTime] If provided, only objects synced by Merge after this date time will be returned.
       # @param modified_before [DateTime] If provided, only objects synced by Merge before this date time will be
       #  returned.
-      # @param order_by [Merge::Hris::Employments::EmploymentsListRequestOrderBy] Overrides the default ordering for this endpoint.
+      # @param order_by [Merge::Hris::Employments::EmploymentsListRequestOrderBy] Overrides the default ordering for this endpoint. Possible values include:
+      #  effective_date, -effective_date.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_fields [Merge::Hris::Employments::EmploymentsListRequestRemoteFields] Deprecated. Use show_enum_origins.
       # @param remote_id [String] The API provider's ID for the given object.

data/lib/merge_ruby_client/hris/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
@@ -52,7 +54,7 @@ module Merge
       #  )
       #  api.hris.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?
@@ -74,6 +76,7 @@ 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
@@ -130,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.
@@ -147,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
@@ -163,7 +168,7 @@ module Merge
       #  )
       #  api.hris.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?
@@ -186,6 +191,7 @@ 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

data/lib/merge_ruby_client/hris/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
@@ -62,7 +65,7 @@ module Merge
       #    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?
@@ -84,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,
@@ -122,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
@@ -149,7 +156,7 @@ module Merge
       #    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?
@@ -172,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/hris/linked_accounts/client.rb

@@ -19,8 +19,7 @@ module Merge
 
       # List linked accounts for your organization.
       #
-      # @param category [Merge::Hris::LinkedAccounts::LinkedAccountsListRequestCategory] Options: ('hris', 'ats', 'accounting', 'ticketing', 'crm', 'mktg',
-      #  'filestorage')
+      # @param category [Merge::Hris::LinkedAccounts::LinkedAccountsListRequestCategory] Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
       #  - `hris` - hris
       #  - `ats` - ats
       #  - `accounting` - accounting
@@ -106,8 +105,7 @@ module Merge
 
       # List linked accounts for your organization.
       #
-      # @param category [Merge::Hris::LinkedAccounts::LinkedAccountsListRequestCategory] Options: ('hris', 'ats', 'accounting', 'ticketing', 'crm', 'mktg',
-      #  'filestorage')
+      # @param category [Merge::Hris::LinkedAccounts::LinkedAccountsListRequestCategory] Options: `accounting`, `ats`, `crm`, `filestorage`, `hris`, `mktg`, `ticketing`
       #  - `hris` - hris
       #  - `ats` - ats
       #  - `accounting` - accounting

data/lib/merge_ruby_client/hris/timesheet_entries/client.rb

@@ -27,9 +27,9 @@ module Merge
       # @param created_after [DateTime] If provided, will only return objects created after this datetime.
       # @param created_before [DateTime] If provided, will only return objects created before this datetime.
       # @param cursor [String] The pagination cursor value.
-      # @param employee_id [String] If provided, will only return employee payroll runs for this employee.
-      # @param ended_after [String] If provided, will only return employee payroll runs ended after this datetime.
-      # @param ended_before [String] If provided, will only return employee payroll runs ended before this datetime.
+      # @param employee_id [String] If provided, will only return timesheet entries for this employee.
+      # @param ended_after [String] If provided, will only return timesheet entries ended after this datetime.
+      # @param ended_before [String] If provided, will only return timesheet entries ended before this datetime.
       # @param include_deleted_data [Boolean] Whether to include data that was marked as deleted by third party webhooks.
       # @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
       #  produce these models.
@@ -40,9 +40,8 @@ module Merge
       #  start_time, -start_time.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_id [String] The API provider's ID for the given object.
-      # @param started_after [String] If provided, will only return employee payroll runs started after this datetime.
-      # @param started_before [String] If provided, will only return employee payroll runs started before this
-      #  datetime.
+      # @param started_after [String] If provided, will only return timesheet entries started after this datetime.
+      # @param started_before [String] If provided, will only return timesheet entries started before this datetime.
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Hris::PaginatedTimesheetEntryList]
       # @example
@@ -214,9 +213,9 @@ module Merge
       # @param created_after [DateTime] If provided, will only return objects created after this datetime.
       # @param created_before [DateTime] If provided, will only return objects created before this datetime.
       # @param cursor [String] The pagination cursor value.
-      # @param employee_id [String] If provided, will only return employee payroll runs for this employee.
-      # @param ended_after [String] If provided, will only return employee payroll runs ended after this datetime.
-      # @param ended_before [String] If provided, will only return employee payroll runs ended before this datetime.
+      # @param employee_id [String] If provided, will only return timesheet entries for this employee.
+      # @param ended_after [String] If provided, will only return timesheet entries ended after this datetime.
+      # @param ended_before [String] If provided, will only return timesheet entries ended before this datetime.
       # @param include_deleted_data [Boolean] Whether to include data that was marked as deleted by third party webhooks.
       # @param include_remote_data [Boolean] Whether to include the original data Merge fetched from the third-party to
       #  produce these models.
@@ -227,9 +226,8 @@ module Merge
       #  start_time, -start_time.
       # @param page_size [Integer] Number of results to return per page.
       # @param remote_id [String] The API provider's ID for the given object.
-      # @param started_after [String] If provided, will only return employee payroll runs started after this datetime.
-      # @param started_before [String] If provided, will only return employee payroll runs started before this
-      #  datetime.
+      # @param started_after [String] If provided, will only return timesheet entries started after this datetime.
+      # @param started_before [String] If provided, will only return timesheet entries started before this datetime.
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Hris::PaginatedTimesheetEntryList]
       # @example

data/lib/merge_ruby_client/hris/types/account_integration.rb

@@ -9,6 +9,11 @@ module Merge
     class AccountIntegration
       # @return [String] Company name.
       attr_reader :name
+      # @return [String] Optional. This shortened name appears in places with limited space, usually in
+      #  conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example:
+      #  <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP
+      #  SuccessFactors)</i>
+      attr_reader :abbreviated_name
       # @return [Array<Merge::Hris::CategoriesEnum>] Category or categories this integration belongs to. Multiple categories should
       #  be comma separated, i.e. [ats, hris].
       attr_reader :categories
@@ -41,6 +46,10 @@ module Merge
       OMIT = Object.new
 
       # @param name [String] Company name.
+      # @param abbreviated_name [String] Optional. This shortened name appears in places with limited space, usually in
+      #  conjunction with the platform's logo (e.g., Merge Link menu).<br><br>Example:
+      #  <i>Workforce Now (in lieu of ADP Workforce Now), SuccessFactors (in lieu of SAP
+      #  SuccessFactors)</i>
       # @param categories [Array<Merge::Hris::CategoriesEnum>] Category or categories this integration belongs to. Multiple categories should
       #  be comma separated, i.e. [ats, hris].
       # @param image [String] Company logo in rectangular shape. <b>Upload an image with a clear
@@ -58,9 +67,10 @@ module Merge
       # @param category_beta_status [Hash{String => Object}] Category or categories this integration is in beta status for.
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Hris::AccountIntegration]
-      def initialize(name:, categories: OMIT, image: OMIT, square_image: OMIT, color: OMIT, slug: OMIT,
-                     api_endpoints_to_documentation_urls: OMIT, webhook_setup_guide_url: OMIT, category_beta_status: OMIT, additional_properties: nil)
+      def initialize(name:, abbreviated_name: OMIT, categories: OMIT, image: OMIT, square_image: OMIT, color: OMIT,
+                     slug: OMIT, api_endpoints_to_documentation_urls: OMIT, webhook_setup_guide_url: OMIT, category_beta_status: OMIT, additional_properties: nil)
         @name = name
+        @abbreviated_name = abbreviated_name if abbreviated_name != OMIT
         @categories = categories if categories != OMIT
         @image = image if image != OMIT
         @square_image = square_image if square_image != OMIT
@@ -74,6 +84,7 @@ module Merge
         @additional_properties = additional_properties
         @_field_set = {
           "name": name,
+          "abbreviated_name": abbreviated_name,
           "categories": categories,
           "image": image,
           "square_image": square_image,
@@ -95,6 +106,7 @@ module Merge
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
         name = parsed_json["name"]
+        abbreviated_name = parsed_json["abbreviated_name"]
         categories = parsed_json["categories"]
         image = parsed_json["image"]
         square_image = parsed_json["square_image"]
@@ -105,6 +117,7 @@ module Merge
         category_beta_status = parsed_json["category_beta_status"]
         new(
           name: name,
+          abbreviated_name: abbreviated_name,
           categories: categories,
           image: image,
           square_image: square_image,
@@ -132,6 +145,7 @@ module Merge
       # @return [Void]
       def self.validate_raw(obj:)
         obj.name.is_a?(String) != false || raise("Passed value for field obj.name is not the expected type, validation failed.")
+        obj.abbreviated_name&.is_a?(String) != false || raise("Passed value for field obj.abbreviated_name is not the expected type, validation failed.")
         obj.categories&.is_a?(Array) != false || raise("Passed value for field obj.categories is not the expected type, validation failed.")
         obj.image&.is_a?(String) != false || raise("Passed value for field obj.image is not the expected type, validation failed.")
         obj.square_image&.is_a?(String) != false || raise("Passed value for field obj.square_image is not the expected type, validation failed.")

data/lib/merge_ruby_client/hris/types/audit_log_event.rb

@@ -71,6 +71,7 @@ module Merge
       #  - `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK
       #  - `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK
       #  - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
+      #  - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
       attr_reader :event_type
       # @return [String]
       attr_reader :event_description
@@ -141,6 +142,7 @@ module Merge
       #  - `ENABLED_MERGE_WEBHOOK` - ENABLED_MERGE_WEBHOOK
       #  - `DISABLED_MERGE_WEBHOOK` - DISABLED_MERGE_WEBHOOK
       #  - `MERGE_WEBHOOK_TARGET_CHANGED` - MERGE_WEBHOOK_TARGET_CHANGED
+      #  - `END_USER_CREDENTIALS_ACCESSED` - END_USER_CREDENTIALS_ACCESSED
       # @param event_description [String]
       # @param created_at [DateTime]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition