merge_ruby_client 0.1.3 → 1.0.0

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
@@ -48,7 +47,7 @@ module Merge
       # @param is_test_account [String] If included, will only include test linked accounts. If not included, will only
       #  include non-test linked accounts.
       # @param page_size [Integer] Number of results to return per page.
-      # @param status [String] Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
+      # @param status [String] Filter by status. Options: `COMPLETE`, `IDLE`, `INCOMPLETE`, `RELINK_NEEDED`
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::PaginatedAccountDetailsAndActionsList]
       # @example
@@ -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
@@ -135,7 +133,7 @@ module Merge
       # @param is_test_account [String] If included, will only include test linked accounts. If not included, will only
       #  include non-test linked accounts.
       # @param page_size [Integer] Number of results to return per page.
-      # @param status [String] Filter by status. Options: `COMPLETE`, `INCOMPLETE`, `RELINK_NEEDED`
+      # @param status [String] Filter by status. Options: `COMPLETE`, `IDLE`, `INCOMPLETE`, `RELINK_NEEDED`
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::PaginatedAccountDetailsAndActionsList]
       # @example

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

@@ -19,7 +19,7 @@ module Merge
 
       # Get the default permissions for Merge Common Models and fields across all Linked
       #  Accounts of a given category. [Learn
-      #  more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
+      #  more](https://help.merge.dev/en/articles/5950052-common-model-and-field-scopes).
       #
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::CommonModelScopeApi]
@@ -53,7 +53,7 @@ module Merge
 
       # Get all available permissions for Merge Common Models and fields for a single
       #  Linked Account. [Learn
-      #  more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
+      #  more](https://help.merge.dev/en/articles/5950052-common-model-and-field-scopes).
       #
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::CommonModelScopeApi]
@@ -87,14 +87,14 @@ module Merge
 
       # Update permissions for any Common Model or field for a single Linked Account.
       #  Any Scopes not set in this POST request will inherit the default Scopes. [Learn
-      #  more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
+      #  more](https://help.merge.dev/en/articles/5950052-common-model-and-field-scopes)
       #
       # @param common_models [Array<Hash>] The common models you want to update the scopes forRequest of type Array<Merge::Filestorage::IndividualCommonModelScopeDeserializerRequest>, as a Hash
       #   * :model_name (String)
       #   * :model_permissions (Hash{String => Merge::Filestorage::ModelPermissionDeserializerRequest})
       #   * :field_permissions (Hash)
-      #     * :enabled (Array<Object>)
-      #     * :disabled (Array<Object>)
+      #     * :enabled_fields (Array<Object>)
+      #     * :disabled_fields (Array<Object>)
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::CommonModelScopeApi]
       # @example
@@ -103,7 +103,7 @@ module Merge
       #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.scopes.linked_account_scopes_create(common_models: [{ model_name: "Employee", model_permissions: { "READ": { is_enabled: true }, "WRITE": { is_enabled: false } } }, { model_name: "Benefit", model_permissions: { "WRITE": { is_enabled: false } } }])
+      #  api.filestorage.scopes.linked_account_scopes_create(common_models: [{ model_name: "Employee", model_permissions: { "READ": { is_enabled: true }, "WRITE": { is_enabled: false } }, field_permissions: { enabled_fields: ["avatar", "home_location"], disabled_fields: ["work_location"] } }, { model_name: "Benefit", model_permissions: { "WRITE": { is_enabled: false } } }])
       def linked_account_scopes_create(common_models:, 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?
@@ -136,7 +136,7 @@ module Merge
 
       # Get the default permissions for Merge Common Models and fields across all Linked
       #  Accounts of a given category. [Learn
-      #  more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
+      #  more](https://help.merge.dev/en/articles/5950052-common-model-and-field-scopes).
       #
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::CommonModelScopeApi]
@@ -172,7 +172,7 @@ module Merge
 
       # Get all available permissions for Merge Common Models and fields for a single
       #  Linked Account. [Learn
-      #  more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes).
+      #  more](https://help.merge.dev/en/articles/5950052-common-model-and-field-scopes).
       #
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::CommonModelScopeApi]
@@ -208,14 +208,14 @@ module Merge
 
       # Update permissions for any Common Model or field for a single Linked Account.
       #  Any Scopes not set in this POST request will inherit the default Scopes. [Learn
-      #  more](https://help.merge.dev/en/articles/8828211-common-model-and-field-scopes)
+      #  more](https://help.merge.dev/en/articles/5950052-common-model-and-field-scopes)
       #
       # @param common_models [Array<Hash>] The common models you want to update the scopes forRequest of type Array<Merge::Filestorage::IndividualCommonModelScopeDeserializerRequest>, as a Hash
       #   * :model_name (String)
       #   * :model_permissions (Hash{String => Merge::Filestorage::ModelPermissionDeserializerRequest})
       #   * :field_permissions (Hash)
-      #     * :enabled (Array<Object>)
-      #     * :disabled (Array<Object>)
+      #     * :enabled_fields (Array<Object>)
+      #     * :disabled_fields (Array<Object>)
       # @param request_options [Merge::RequestOptions]
       # @return [Merge::Filestorage::CommonModelScopeApi]
       # @example
@@ -224,7 +224,7 @@ module Merge
       #    environment: Merge::Environment::PRODUCTION,
       #    api_key: "YOUR_AUTH_TOKEN"
       #  )
-      #  api.filestorage.scopes.linked_account_scopes_create(common_models: [{ model_name: "Employee", model_permissions: { "READ": { is_enabled: true }, "WRITE": { is_enabled: false } } }, { model_name: "Benefit", model_permissions: { "WRITE": { is_enabled: false } } }])
+      #  api.filestorage.scopes.linked_account_scopes_create(common_models: [{ model_name: "Employee", model_permissions: { "READ": { is_enabled: true }, "WRITE": { is_enabled: false } }, field_permissions: { enabled_fields: ["avatar", "home_location"], disabled_fields: ["work_location"] } }, { model_name: "Benefit", model_permissions: { "WRITE": { is_enabled: false } } }])
       def linked_account_scopes_create(common_models:, request_options: nil)
         Async do
           response = @request_client.conn.post do |req|

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "category_enum"
+require "date"
 require "ostruct"
 require "json"
 
@@ -32,6 +33,8 @@ module Merge
       attr_reader :is_duplicate
       # @return [String]
       attr_reader :account_type
+      # @return [DateTime] The time at which account completes the linking flow.
+      attr_reader :completed_at
       # @return [OpenStruct] Additional properties unmapped to the current class definition
       attr_reader :additional_properties
       # @return [Object]
@@ -54,10 +57,11 @@ module Merge
       #  incomplete Production Linked Accounts, and ignored duplicate Production Linked
       #  Account sets.
       # @param account_type [String]
+      # @param completed_at [DateTime] The time at which account completes the linking flow.
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::AccountDetails]
       def initialize(id: OMIT, integration: OMIT, integration_slug: OMIT, category: OMIT, end_user_origin_id: OMIT,
-                     end_user_organization_name: OMIT, end_user_email_address: OMIT, status: OMIT, webhook_listener_url: OMIT, is_duplicate: OMIT, account_type: OMIT, additional_properties: nil)
+                     end_user_organization_name: OMIT, end_user_email_address: OMIT, status: OMIT, webhook_listener_url: OMIT, is_duplicate: OMIT, account_type: OMIT, completed_at: OMIT, additional_properties: nil)
         @id = id if id != OMIT
         @integration = integration if integration != OMIT
         @integration_slug = integration_slug if integration_slug != OMIT
@@ -69,6 +73,7 @@ module Merge
         @webhook_listener_url = webhook_listener_url if webhook_listener_url != OMIT
         @is_duplicate = is_duplicate if is_duplicate != OMIT
         @account_type = account_type if account_type != OMIT
+        @completed_at = completed_at if completed_at != OMIT
         @additional_properties = additional_properties
         @_field_set = {
           "id": id,
@@ -81,7 +86,8 @@ module Merge
           "status": status,
           "webhook_listener_url": webhook_listener_url,
           "is_duplicate": is_duplicate,
-          "account_type": account_type
+          "account_type": account_type,
+          "completed_at": completed_at
         }.reject do |_k, v|
           v == OMIT
         end
@@ -105,6 +111,7 @@ module Merge
         webhook_listener_url = parsed_json["webhook_listener_url"]
         is_duplicate = parsed_json["is_duplicate"]
         account_type = parsed_json["account_type"]
+        completed_at = (DateTime.parse(parsed_json["completed_at"]) unless parsed_json["completed_at"].nil?)
         new(
           id: id,
           integration: integration,
@@ -117,6 +124,7 @@ module Merge
           webhook_listener_url: webhook_listener_url,
           is_duplicate: is_duplicate,
           account_type: account_type,
+          completed_at: completed_at,
           additional_properties: struct
         )
       end
@@ -146,6 +154,7 @@ module Merge
         obj.webhook_listener_url&.is_a?(String) != false || raise("Passed value for field obj.webhook_listener_url is not the expected type, validation failed.")
         obj.is_duplicate&.is_a?(Boolean) != false || raise("Passed value for field obj.is_duplicate is not the expected type, validation failed.")
         obj.account_type&.is_a?(String) != false || raise("Passed value for field obj.account_type is not the expected type, validation failed.")
+        obj.completed_at&.is_a?(DateTime) != false || raise("Passed value for field obj.completed_at is not the expected type, validation failed.")
       end
     end
   end

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

@@ -3,6 +3,7 @@
 require_relative "category_enum"
 require_relative "account_details_and_actions_status_enum"
 require_relative "account_details_and_actions_integration"
+require "date"
 require "ostruct"
 require "json"
 
@@ -42,6 +43,8 @@ module Merge
       attr_reader :integration
       # @return [String]
       attr_reader :account_type
+      # @return [DateTime]
+      attr_reader :completed_at
       # @return [OpenStruct] Additional properties unmapped to the current class definition
       attr_reader :additional_properties
       # @return [Object]
@@ -65,10 +68,11 @@ module Merge
       #  Account sets.
       # @param integration [Merge::Filestorage::AccountDetailsAndActionsIntegration]
       # @param account_type [String]
+      # @param completed_at [DateTime]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::AccountDetailsAndActions]
       def initialize(id:, status:, end_user_organization_name:, end_user_email_address:, webhook_listener_url:,
-                     account_type:, category: OMIT, status_detail: OMIT, end_user_origin_id: OMIT, subdomain: OMIT, is_duplicate: OMIT, integration: OMIT, additional_properties: nil)
+                     account_type:, completed_at:, category: OMIT, status_detail: OMIT, end_user_origin_id: OMIT, subdomain: OMIT, is_duplicate: OMIT, integration: OMIT, additional_properties: nil)
         @id = id
         @category = category if category != OMIT
         @status = status
@@ -81,6 +85,7 @@ module Merge
         @is_duplicate = is_duplicate if is_duplicate != OMIT
         @integration = integration if integration != OMIT
         @account_type = account_type
+        @completed_at = completed_at
         @additional_properties = additional_properties
         @_field_set = {
           "id": id,
@@ -94,7 +99,8 @@ module Merge
           "webhook_listener_url": webhook_listener_url,
           "is_duplicate": is_duplicate,
           "integration": integration,
-          "account_type": account_type
+          "account_type": account_type,
+          "completed_at": completed_at
         }.reject do |_k, v|
           v == OMIT
         end
@@ -124,6 +130,7 @@ module Merge
           integration = Merge::Filestorage::AccountDetailsAndActionsIntegration.from_json(json_object: integration)
         end
         account_type = parsed_json["account_type"]
+        completed_at = (DateTime.parse(parsed_json["completed_at"]) unless parsed_json["completed_at"].nil?)
         new(
           id: id,
           category: category,
@@ -137,6 +144,7 @@ module Merge
           is_duplicate: is_duplicate,
           integration: integration,
           account_type: account_type,
+          completed_at: completed_at,
           additional_properties: struct
         )
       end
@@ -167,6 +175,7 @@ module Merge
         obj.is_duplicate&.is_a?(Boolean) != false || raise("Passed value for field obj.is_duplicate is not the expected type, validation failed.")
         obj.integration.nil? || Merge::Filestorage::AccountDetailsAndActionsIntegration.validate_raw(obj: obj.integration)
         obj.account_type.is_a?(String) != false || raise("Passed value for field obj.account_type is not the expected type, validation failed.")
+        obj.completed_at.is_a?(DateTime) != false || raise("Passed value for field obj.completed_at is not the expected type, validation failed.")
       end
     end
   end

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

@@ -5,10 +5,12 @@ module Merge
     # - `COMPLETE` - COMPLETE
     #  - `INCOMPLETE` - INCOMPLETE
     #  - `RELINK_NEEDED` - RELINK_NEEDED
+    #  - `IDLE` - IDLE
     class AccountDetailsAndActionsStatusEnum
       COMPLETE = "COMPLETE"
       INCOMPLETE = "INCOMPLETE"
       RELINK_NEEDED = "RELINK_NEEDED"
+      IDLE = "IDLE"
     end
   end
 end

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

@@ -9,13 +9,17 @@ 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
-      # @return [String] Company logo in rectangular shape. <b>Upload an image with a clear
-      #  background.</b>
+      # @return [String] Company logo in rectangular shape.
       attr_reader :image
-      # @return [String] Company logo in square shape. <b>Upload an image with a white background.</b>
+      # @return [String] Company logo in square shape.
       attr_reader :square_image
       # @return [String] The color of this integration used for buttons and text throughout the app and
       #  landing pages. <b>Choose a darker, saturated color.</b>
@@ -41,11 +45,14 @@ 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
-      #  background.</b>
-      # @param square_image [String] Company logo in square shape. <b>Upload an image with a white background.</b>
+      # @param image [String] Company logo in rectangular shape.
+      # @param square_image [String] Company logo in square shape.
       # @param color [String] The color of this integration used for buttons and text throughout the app and
       #  landing pages. <b>Choose a darker, saturated color.</b>
       # @param slug [String]
@@ -58,9 +65,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 +82,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 +104,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 +115,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 +143,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

@@ -65,12 +65,19 @@ module Merge
       #  - `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` -
       #  DELETED_INTEGRATION_WIDE_FIELD_MAPPING
       #  - `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
+      #  - `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+      #  CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
+      #  - `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+      #  CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
+      #  - `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+      #  DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
       #  - `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC
       #  - `MUTED_ISSUE` - MUTED_ISSUE
       #  - `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK
       #  - `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
@@ -135,12 +142,19 @@ module Merge
       #  - `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` -
       #  DELETED_INTEGRATION_WIDE_FIELD_MAPPING
       #  - `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
+      #  - `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+      #  CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
+      #  - `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+      #  CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
+      #  - `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+      #  DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
       #  - `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC
       #  - `MUTED_ISSUE` - MUTED_ISSUE
       #  - `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK
       #  - `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/drive.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "date"
+require_relative "remote_data"
 require "ostruct"
 require "json"
 
@@ -28,11 +29,13 @@ module Merge
       # @return [String] The drive's url.
       attr_reader :drive_url
       # @return [Boolean] Indicates whether or not this object has been deleted in the third party
-      #  platform.
+      #  platform. Full coverage deletion detection is a premium add-on. Native deletion
+      #  detection is offered for free with limited coverage. [Learn
+      #  more](https://docs.merge.dev/integrations/hris/supported-features/).
       attr_reader :remote_was_deleted
       # @return [Hash{String => Object}]
       attr_reader :field_mappings
-      # @return [Array<Hash{String => Object}>]
+      # @return [Array<Merge::Filestorage::RemoteData>]
       attr_reader :remote_data
       # @return [OpenStruct] Additional properties unmapped to the current class definition
       attr_reader :additional_properties
@@ -50,9 +53,11 @@ module Merge
       # @param remote_created_at [DateTime] When the third party's drive was created.
       # @param drive_url [String] The drive's url.
       # @param remote_was_deleted [Boolean] Indicates whether or not this object has been deleted in the third party
-      #  platform.
+      #  platform. Full coverage deletion detection is a premium add-on. Native deletion
+      #  detection is offered for free with limited coverage. [Learn
+      #  more](https://docs.merge.dev/integrations/hris/supported-features/).
       # @param field_mappings [Hash{String => Object}]
-      # @param remote_data [Array<Hash{String => Object}>]
+      # @param remote_data [Array<Merge::Filestorage::RemoteData>]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::Drive]
       def initialize(id: OMIT, remote_id: OMIT, created_at: OMIT, modified_at: OMIT, name: OMIT,
@@ -102,7 +107,10 @@ module Merge
         drive_url = parsed_json["drive_url"]
         remote_was_deleted = parsed_json["remote_was_deleted"]
         field_mappings = parsed_json["field_mappings"]
-        remote_data = parsed_json["remote_data"]
+        remote_data = parsed_json["remote_data"]&.map do |item|
+          item = item.to_json
+          Merge::Filestorage::RemoteData.from_json(json_object: item)
+        end
         new(
           id: id,
           remote_id: remote_id,

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

@@ -40,12 +40,19 @@ module Merge
     #  - `DELETED_INTEGRATION_WIDE_FIELD_MAPPING` -
     #  DELETED_INTEGRATION_WIDE_FIELD_MAPPING
     #  - `DELETED_LINKED_ACCOUNT_FIELD_MAPPING` - DELETED_LINKED_ACCOUNT_FIELD_MAPPING
+    #  - `CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+    #  CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
+    #  - `CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+    #  CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
+    #  - `DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE` -
+    #  DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE
     #  - `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC
     #  - `MUTED_ISSUE` - MUTED_ISSUE
     #  - `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK
     #  - `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"
@@ -78,12 +85,16 @@ module Merge
       CHANGED_LINKED_ACCOUNT_FIELD_MAPPING = "CHANGED_LINKED_ACCOUNT_FIELD_MAPPING"
       DELETED_INTEGRATION_WIDE_FIELD_MAPPING = "DELETED_INTEGRATION_WIDE_FIELD_MAPPING"
       DELETED_LINKED_ACCOUNT_FIELD_MAPPING = "DELETED_LINKED_ACCOUNT_FIELD_MAPPING"
+      CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE = "CREATED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE"
+      CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE = "CHANGED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE"
+      DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE = "DELETED_LINKED_ACCOUNT_COMMON_MODEL_OVERRIDE"
       FORCED_LINKED_ACCOUNT_RESYNC = "FORCED_LINKED_ACCOUNT_RESYNC"
       MUTED_ISSUE = "MUTED_ISSUE"
       GENERATED_MAGIC_LINK = "GENERATED_MAGIC_LINK"
       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/field_mapping_api_instance_remote_field.rb

@@ -26,16 +26,18 @@ module Merge
       # @param remote_endpoint_info [Merge::Filestorage::FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::FieldMappingApiInstanceRemoteField]
-      def initialize(remote_key_name:, schema:, remote_endpoint_info:, additional_properties: nil)
-        @remote_key_name = remote_key_name
-        @schema = schema
+      def initialize(remote_endpoint_info:, remote_key_name: OMIT, schema: OMIT, additional_properties: nil)
+        @remote_key_name = remote_key_name if remote_key_name != OMIT
+        @schema = schema if schema != OMIT
         @remote_endpoint_info = remote_endpoint_info
         @additional_properties = additional_properties
         @_field_set = {
           "remote_key_name": remote_key_name,
           "schema": schema,
           "remote_endpoint_info": remote_endpoint_info
-        }
+        }.reject do |_k, v|
+          v == OMIT
+        end
       end
 
       # Deserialize a JSON object to an instance of FieldMappingApiInstanceRemoteField
@@ -75,8 +77,8 @@ module Merge
       # @param obj [Object]
       # @return [Void]
       def self.validate_raw(obj:)
-        obj.remote_key_name.is_a?(String) != false || raise("Passed value for field obj.remote_key_name is not the expected type, validation failed.")
-        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.")
+        obj.schema&.is_a?(Hash) != false || raise("Passed value for field obj.schema is not the expected type, validation failed.")
         Merge::Filestorage::FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo.validate_raw(obj: obj.remote_endpoint_info)
       end
     end

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

@@ -7,9 +7,9 @@ module Merge
   module Filestorage
     class FieldPermissionDeserializer
       # @return [Array<Object>]
-      attr_reader :enabled
+      attr_reader :enabled_fields
       # @return [Array<Object>]
-      attr_reader :disabled
+      attr_reader :disabled_fields
       # @return [OpenStruct] Additional properties unmapped to the current class definition
       attr_reader :additional_properties
       # @return [Object]
@@ -18,15 +18,15 @@ module Merge
 
       OMIT = Object.new
 
-      # @param enabled [Array<Object>]
-      # @param disabled [Array<Object>]
+      # @param enabled_fields [Array<Object>]
+      # @param disabled_fields [Array<Object>]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::FieldPermissionDeserializer]
-      def initialize(enabled: OMIT, disabled: OMIT, additional_properties: nil)
-        @enabled = enabled if enabled != OMIT
-        @disabled = disabled if disabled != OMIT
+      def initialize(enabled_fields: OMIT, disabled_fields: OMIT, additional_properties: nil)
+        @enabled_fields = enabled_fields if enabled_fields != OMIT
+        @disabled_fields = disabled_fields if disabled_fields != OMIT
         @additional_properties = additional_properties
-        @_field_set = { "enabled": enabled, "disabled": disabled }.reject do |_k, v|
+        @_field_set = { "enabled_fields": enabled_fields, "disabled_fields": disabled_fields }.reject do |_k, v|
           v == OMIT
         end
       end
@@ -38,11 +38,11 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        enabled = parsed_json["enabled"]
-        disabled = parsed_json["disabled"]
+        enabled_fields = parsed_json["enabled_fields"]
+        disabled_fields = parsed_json["disabled_fields"]
         new(
-          enabled: enabled,
-          disabled: disabled,
+          enabled_fields: enabled_fields,
+          disabled_fields: disabled_fields,
           additional_properties: struct
         )
       end
@@ -61,8 +61,8 @@ module Merge
       # @param obj [Object]
       # @return [Void]
       def self.validate_raw(obj:)
-        obj.enabled&.is_a?(Array) != false || raise("Passed value for field obj.enabled is not the expected type, validation failed.")
-        obj.disabled&.is_a?(Array) != false || raise("Passed value for field obj.disabled is not the expected type, validation failed.")
+        obj.enabled_fields&.is_a?(Array) != false || raise("Passed value for field obj.enabled_fields is not the expected type, validation failed.")
+        obj.disabled_fields&.is_a?(Array) != false || raise("Passed value for field obj.disabled_fields is not the expected type, validation failed.")
       end
     end
   end

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

@@ -7,9 +7,9 @@ module Merge
   module Filestorage
     class FieldPermissionDeserializerRequest
       # @return [Array<Object>]
-      attr_reader :enabled
+      attr_reader :enabled_fields
       # @return [Array<Object>]
-      attr_reader :disabled
+      attr_reader :disabled_fields
       # @return [OpenStruct] Additional properties unmapped to the current class definition
       attr_reader :additional_properties
       # @return [Object]
@@ -18,15 +18,15 @@ module Merge
 
       OMIT = Object.new
 
-      # @param enabled [Array<Object>]
-      # @param disabled [Array<Object>]
+      # @param enabled_fields [Array<Object>]
+      # @param disabled_fields [Array<Object>]
       # @param additional_properties [OpenStruct] Additional properties unmapped to the current class definition
       # @return [Merge::Filestorage::FieldPermissionDeserializerRequest]
-      def initialize(enabled: OMIT, disabled: OMIT, additional_properties: nil)
-        @enabled = enabled if enabled != OMIT
-        @disabled = disabled if disabled != OMIT
+      def initialize(enabled_fields: OMIT, disabled_fields: OMIT, additional_properties: nil)
+        @enabled_fields = enabled_fields if enabled_fields != OMIT
+        @disabled_fields = disabled_fields if disabled_fields != OMIT
         @additional_properties = additional_properties
-        @_field_set = { "enabled": enabled, "disabled": disabled }.reject do |_k, v|
+        @_field_set = { "enabled_fields": enabled_fields, "disabled_fields": disabled_fields }.reject do |_k, v|
           v == OMIT
         end
       end
@@ -38,11 +38,11 @@ module Merge
       def self.from_json(json_object:)
         struct = JSON.parse(json_object, object_class: OpenStruct)
         parsed_json = JSON.parse(json_object)
-        enabled = parsed_json["enabled"]
-        disabled = parsed_json["disabled"]
+        enabled_fields = parsed_json["enabled_fields"]
+        disabled_fields = parsed_json["disabled_fields"]
         new(
-          enabled: enabled,
-          disabled: disabled,
+          enabled_fields: enabled_fields,
+          disabled_fields: disabled_fields,
           additional_properties: struct
         )
       end
@@ -61,8 +61,8 @@ module Merge
       # @param obj [Object]
       # @return [Void]
       def self.validate_raw(obj:)
-        obj.enabled&.is_a?(Array) != false || raise("Passed value for field obj.enabled is not the expected type, validation failed.")
-        obj.disabled&.is_a?(Array) != false || raise("Passed value for field obj.disabled is not the expected type, validation failed.")
+        obj.enabled_fields&.is_a?(Array) != false || raise("Passed value for field obj.enabled_fields is not the expected type, validation failed.")
+        obj.disabled_fields&.is_a?(Array) != false || raise("Passed value for field obj.disabled_fields is not the expected type, validation failed.")
       end
     end
   end