@mergeapi/merge-node-client 1.0.6 → 1.0.7

package/api/resources/filestorage/resources/scopes/client/Client.js

@@ -49,7 +49,7 @@ class Scopes {
         this._options = _options;
     }
     /**
-     * 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).
+     * 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).
      *
      * @example
      *     await merge.filestorage.scopes.defaultScopesRetrieve()
@@ -58,7 +58,7 @@ class Scopes {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/default-scopes"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/default-scopes"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -67,7 +67,7 @@ class Scopes {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
@@ -103,7 +103,7 @@ class Scopes {
         });
     }
     /**
-     * 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).
+     * 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).
      *
      * @example
      *     await merge.filestorage.scopes.linkedAccountScopesRetrieve()
@@ -112,7 +112,7 @@ class Scopes {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/linked-account-scopes"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/linked-account-scopes"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -121,7 +121,7 @@ class Scopes {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
@@ -157,18 +157,20 @@ class Scopes {
         });
     }
     /**
-     * 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)
+     * 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)
      *
      * @example
      *     await merge.filestorage.scopes.linkedAccountScopesCreate({
-     *         commonModels: []
+     *         commonModels: [{
+     *                 modelName: "model_name"
+     *             }]
      *     })
      */
     linkedAccountScopesCreate(request, requestOptions) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/linked-account-scopes"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/linked-account-scopes"),
                 method: "POST",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -177,7 +179,7 @@ class Scopes {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 body: yield serializers.filestorage.LinkedAccountCommonModelScopeDeserializerRequest.jsonOrThrow(request, {

package/api/resources/filestorage/resources/scopes/client/requests/LinkedAccountCommonModelScopeDeserializerRequest.d.ts

@@ -5,7 +5,9 @@ import * as Merge from "../../../../../..";
 /**
  * @example
  *     {
- *         commonModels: []
+ *         commonModels: [{
+ *                 modelName: "model_name"
+ *             }]
  *     }
  */
 export interface LinkedAccountCommonModelScopeDeserializerRequest {

package/api/resources/filestorage/resources/selectiveSync/client/Client.d.ts

@@ -30,7 +30,9 @@ export declare class SelectiveSync {
      *
      * @example
      *     await merge.filestorage.selectiveSync.configurationsUpdate({
-     *         syncConfigurations: []
+     *         syncConfigurations: [{
+     *                 linkedAccountConditions: []
+     *             }]
      *     })
      */
     configurationsUpdate(request: Merge.filestorage.LinkedAccountSelectiveSyncConfigurationListRequest, requestOptions?: SelectiveSync.RequestOptions): Promise<Merge.filestorage.LinkedAccountSelectiveSyncConfiguration[]>;

package/api/resources/filestorage/resources/selectiveSync/client/Client.js

@@ -58,7 +58,7 @@ class SelectiveSync {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/selective-sync/configurations"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/selective-sync/configurations"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -67,7 +67,7 @@ class SelectiveSync {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
@@ -107,14 +107,16 @@ class SelectiveSync {
      *
      * @example
      *     await merge.filestorage.selectiveSync.configurationsUpdate({
-     *         syncConfigurations: []
+     *         syncConfigurations: [{
+     *                 linkedAccountConditions: []
+     *             }]
      *     })
      */
     configurationsUpdate(request, requestOptions) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/selective-sync/configurations"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/selective-sync/configurations"),
                 method: "PUT",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -123,7 +125,7 @@ class SelectiveSync {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 body: yield serializers.filestorage.LinkedAccountSelectiveSyncConfigurationListRequest.jsonOrThrow(request, { unrecognizedObjectKeys: "strip" }),
@@ -180,7 +182,7 @@ class SelectiveSync {
                 _queryParams["page_size"] = pageSize.toString();
             }
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/selective-sync/meta"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/selective-sync/meta"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -189,7 +191,7 @@ class SelectiveSync {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 queryParameters: _queryParams,

package/api/resources/filestorage/resources/selectiveSync/client/requests/LinkedAccountSelectiveSyncConfigurationListRequest.d.ts

@@ -5,7 +5,9 @@ import * as Merge from "../../../../../..";
 /**
  * @example
  *     {
- *         syncConfigurations: []
+ *         syncConfigurations: [{
+ *                 linkedAccountConditions: []
+ *             }]
  *     }
  */
 export interface LinkedAccountSelectiveSyncConfigurationListRequest {

package/api/resources/filestorage/resources/syncStatus/client/Client.js

@@ -66,7 +66,7 @@ class SyncStatus {
                 _queryParams["page_size"] = pageSize.toString();
             }
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/sync-status"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/sync-status"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -75,7 +75,7 @@ class SyncStatus {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 queryParameters: _queryParams,

package/api/resources/filestorage/resources/users/client/Client.d.ts

@@ -29,7 +29,7 @@ export declare class Users {
      * Returns a `User` object with the given `id`.
      *
      * @example
-     *     await merge.filestorage.users.retrieve("string", {})
+     *     await merge.filestorage.users.retrieve("id", {})
      */
     retrieve(id: string, request?: Merge.filestorage.UsersRetrieveRequest, requestOptions?: Users.RequestOptions): Promise<Merge.filestorage.User>;
     protected _getAuthorizationHeader(): Promise<string>;

package/api/resources/filestorage/resources/users/client/Client.js

@@ -90,7 +90,7 @@ class Users {
                 _queryParams["remote_id"] = remoteId;
             }
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/users"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/users"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -99,7 +99,7 @@ class Users {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 queryParameters: _queryParams,
@@ -139,7 +139,7 @@ class Users {
      * Returns a `User` object with the given `id`.
      *
      * @example
-     *     await merge.filestorage.users.retrieve("string", {})
+     *     await merge.filestorage.users.retrieve("id", {})
      */
     retrieve(id, request = {}, requestOptions) {
         var _a;
@@ -150,7 +150,7 @@ class Users {
                 _queryParams["include_remote_data"] = includeRemoteData.toString();
             }
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, `api/filestorage/v1/users/${id}`),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, `filestorage/v1/users/${id}`),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -159,7 +159,7 @@ class Users {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 queryParameters: _queryParams,

package/api/resources/filestorage/resources/webhookReceivers/client/Client.d.ts

@@ -30,7 +30,7 @@ export declare class WebhookReceivers {
      *
      * @example
      *     await merge.filestorage.webhookReceivers.create({
-     *         event: "string",
+     *         event: "event",
      *         isActive: true
      *     })
      */

package/api/resources/filestorage/resources/webhookReceivers/client/Client.js

@@ -58,7 +58,7 @@ class WebhookReceivers {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/webhook-receivers"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/webhook-receivers"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -67,7 +67,7 @@ class WebhookReceivers {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,
@@ -107,7 +107,7 @@ class WebhookReceivers {
      *
      * @example
      *     await merge.filestorage.webhookReceivers.create({
-     *         event: "string",
+     *         event: "event",
      *         isActive: true
      *     })
      */
@@ -115,7 +115,7 @@ class WebhookReceivers {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/filestorage/v1/webhook-receivers"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "filestorage/v1/webhook-receivers"),
                 method: "POST",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -124,7 +124,7 @@ class WebhookReceivers {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 body: yield serializers.filestorage.WebhookReceiverRequest.jsonOrThrow(request, {

package/api/resources/filestorage/resources/webhookReceivers/client/requests/WebhookReceiverRequest.d.ts

@@ -4,7 +4,7 @@
 /**
  * @example
  *     {
- *         event: "string",
+ *         event: "event",
  *         isActive: true
  *     }
  */

package/api/resources/filestorage/types/AccountDetailsAndActions.d.ts

@@ -21,6 +21,8 @@ export interface AccountDetailsAndActions {
     endUserOriginId?: string;
     endUserOrganizationName: string;
     endUserEmailAddress: string;
+    /** The tenant or domain the customer has provided access to. */
+    subdomain?: string;
     webhookListenerUrl: string;
     /** Whether a Production Linked Account's credentials match another existing Production Linked Account. This field is `null` for Test Linked Accounts, incomplete Production Linked Accounts, and ignored duplicate Production Linked Account sets. */
     isDuplicate?: boolean;

package/api/resources/filestorage/types/AuditLogEvent.d.ts

@@ -54,6 +54,9 @@ export interface AuditLogEvent {
      * - `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
+     * - `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC
+     * - `MUTED_ISSUE` - MUTED_ISSUE
+     * - `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK
      */
     eventType: Merge.filestorage.AuditLogEventEventType;
     eventDescription: string;

package/api/resources/filestorage/types/AuditLogEventEventType.d.ts

@@ -36,5 +36,8 @@ import * as Merge from "../../..";
  * - `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
+ * - `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC
+ * - `MUTED_ISSUE` - MUTED_ISSUE
+ * - `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK
  */
 export declare type AuditLogEventEventType = Merge.filestorage.EventTypeEnum | string;

package/api/resources/filestorage/types/ConditionSchema.d.ts

@@ -7,9 +7,7 @@ export interface ConditionSchema {
     id: string;
     /** The common model for which a condition schema is defined. */
     commonModel?: string;
-    /** User-facing _native condition_ name. e.g. "Skip Manager". */
     nativeName?: string;
-    /** The name of the field on the common model that this condition corresponds to, if they conceptually match. e.g. "location_type". */
     fieldName?: string;
     /** Whether this condition can only be applied once. If false, the condition can be AND'd together multiple times. */
     isUnique?: boolean;

package/api/resources/filestorage/types/DataPassthroughRequest.d.ts

@@ -15,8 +15,11 @@ import * as Merge from "../../..";
  */
 export interface DataPassthroughRequest {
     method: Merge.filestorage.MethodEnum;
+    /** The path of the request in the third party's platform. */
     path: string;
+    /** An optional override of the third party's base url for the request. */
     baseUrlOverride?: string;
+    /** The data with the request. You must include a `request_format` parameter matching the data's format */
     data?: string;
     /** Pass an array of `MultipartFormField` objects in here instead of using the `data` param if `request_format` is set to `MULTIPART`. */
     multipartFormData?: Merge.filestorage.MultipartFormFieldRequest[];

package/api/resources/filestorage/types/Drive.d.ts

@@ -16,6 +16,9 @@ export interface Drive {
     id?: string;
     /** The third-party API ID of the matching object. */
     remoteId?: string;
+    createdAt?: Date;
+    /** This is the datetime that this object was last updated by Merge */
+    modifiedAt?: Date;
     /** The drive's name. */
     name?: string;
     /** When the third party's drive was created. */
@@ -24,9 +27,6 @@ export interface Drive {
     driveUrl?: string;
     /** Indicates whether or not this object has been deleted in the third party platform. */
     remoteWasDeleted?: boolean;
-    createdAt?: Date;
-    /** This is the datetime that this object was last updated by Merge */
-    modifiedAt?: Date;
     fieldMappings?: Record<string, unknown>;
     remoteData?: (Record<string, unknown> | undefined)[];
 }

package/api/resources/filestorage/types/EventTypeEnum.d.ts

@@ -33,8 +33,11 @@
  * - `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
+ * - `FORCED_LINKED_ACCOUNT_RESYNC` - FORCED_LINKED_ACCOUNT_RESYNC
+ * - `MUTED_ISSUE` - MUTED_ISSUE
+ * - `GENERATED_MAGIC_LINK` - GENERATED_MAGIC_LINK
  */
-export declare type EventTypeEnum = "CREATED_REMOTE_PRODUCTION_API_KEY" | "DELETED_REMOTE_PRODUCTION_API_KEY" | "CREATED_TEST_API_KEY" | "DELETED_TEST_API_KEY" | "REGENERATED_PRODUCTION_API_KEY" | "INVITED_USER" | "TWO_FACTOR_AUTH_ENABLED" | "TWO_FACTOR_AUTH_DISABLED" | "DELETED_LINKED_ACCOUNT" | "CREATED_DESTINATION" | "DELETED_DESTINATION" | "CHANGED_DESTINATION" | "CHANGED_SCOPES" | "CHANGED_PERSONAL_INFORMATION" | "CHANGED_ORGANIZATION_SETTINGS" | "ENABLED_INTEGRATION" | "DISABLED_INTEGRATION" | "ENABLED_CATEGORY" | "DISABLED_CATEGORY" | "CHANGED_PASSWORD" | "RESET_PASSWORD" | "ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION" | "ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT" | "DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION" | "DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT" | "CREATED_INTEGRATION_WIDE_FIELD_MAPPING" | "CREATED_LINKED_ACCOUNT_FIELD_MAPPING" | "CHANGED_INTEGRATION_WIDE_FIELD_MAPPING" | "CHANGED_LINKED_ACCOUNT_FIELD_MAPPING" | "DELETED_INTEGRATION_WIDE_FIELD_MAPPING" | "DELETED_LINKED_ACCOUNT_FIELD_MAPPING";
+export declare type EventTypeEnum = "CREATED_REMOTE_PRODUCTION_API_KEY" | "DELETED_REMOTE_PRODUCTION_API_KEY" | "CREATED_TEST_API_KEY" | "DELETED_TEST_API_KEY" | "REGENERATED_PRODUCTION_API_KEY" | "INVITED_USER" | "TWO_FACTOR_AUTH_ENABLED" | "TWO_FACTOR_AUTH_DISABLED" | "DELETED_LINKED_ACCOUNT" | "CREATED_DESTINATION" | "DELETED_DESTINATION" | "CHANGED_DESTINATION" | "CHANGED_SCOPES" | "CHANGED_PERSONAL_INFORMATION" | "CHANGED_ORGANIZATION_SETTINGS" | "ENABLED_INTEGRATION" | "DISABLED_INTEGRATION" | "ENABLED_CATEGORY" | "DISABLED_CATEGORY" | "CHANGED_PASSWORD" | "RESET_PASSWORD" | "ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION" | "ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT" | "DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION" | "DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT" | "CREATED_INTEGRATION_WIDE_FIELD_MAPPING" | "CREATED_LINKED_ACCOUNT_FIELD_MAPPING" | "CHANGED_INTEGRATION_WIDE_FIELD_MAPPING" | "CHANGED_LINKED_ACCOUNT_FIELD_MAPPING" | "DELETED_INTEGRATION_WIDE_FIELD_MAPPING" | "DELETED_LINKED_ACCOUNT_FIELD_MAPPING" | "FORCED_LINKED_ACCOUNT_RESYNC" | "MUTED_ISSUE" | "GENERATED_MAGIC_LINK";
 export declare const EventTypeEnum: {
     readonly CreatedRemoteProductionApiKey: "CREATED_REMOTE_PRODUCTION_API_KEY";
     readonly DeletedRemoteProductionApiKey: "DELETED_REMOTE_PRODUCTION_API_KEY";
@@ -67,4 +70,7 @@ export declare const EventTypeEnum: {
     readonly ChangedLinkedAccountFieldMapping: "CHANGED_LINKED_ACCOUNT_FIELD_MAPPING";
     readonly DeletedIntegrationWideFieldMapping: "DELETED_INTEGRATION_WIDE_FIELD_MAPPING";
     readonly DeletedLinkedAccountFieldMapping: "DELETED_LINKED_ACCOUNT_FIELD_MAPPING";
+    readonly ForcedLinkedAccountResync: "FORCED_LINKED_ACCOUNT_RESYNC";
+    readonly MutedIssue: "MUTED_ISSUE";
+    readonly GeneratedMagicLink: "GENERATED_MAGIC_LINK";
 };

package/api/resources/filestorage/types/EventTypeEnum.js

@@ -36,4 +36,7 @@ exports.EventTypeEnum = {
     ChangedLinkedAccountFieldMapping: "CHANGED_LINKED_ACCOUNT_FIELD_MAPPING",
     DeletedIntegrationWideFieldMapping: "DELETED_INTEGRATION_WIDE_FIELD_MAPPING",
     DeletedLinkedAccountFieldMapping: "DELETED_LINKED_ACCOUNT_FIELD_MAPPING",
+    ForcedLinkedAccountResync: "FORCED_LINKED_ACCOUNT_RESYNC",
+    MutedIssue: "MUTED_ISSUE",
+    GeneratedMagicLink: "GENERATED_MAGIC_LINK",
 };

package/api/resources/filestorage/types/File_.d.ts

@@ -17,6 +17,9 @@ export interface File_ {
     id?: string;
     /** The third-party API ID of the matching object. */
     remoteId?: string;
+    createdAt?: Date;
+    /** This is the datetime that this object was last updated by Merge */
+    modifiedAt?: Date;
     /** The file's name. */
     name?: string;
     /** The URL to access the file. */
@@ -41,9 +44,6 @@ export interface File_ {
     remoteUpdatedAt?: Date;
     /** Indicates whether or not this object has been deleted in the third party platform. */
     remoteWasDeleted?: boolean;
-    createdAt?: Date;
-    /** This is the datetime that this object was last updated by Merge */
-    modifiedAt?: Date;
     fieldMappings?: Record<string, unknown>;
     remoteData?: (Record<string, unknown> | undefined)[];
 }

package/api/resources/filestorage/types/Folder.d.ts

@@ -17,6 +17,9 @@ export interface Folder {
     id?: string;
     /** The third-party API ID of the matching object. */
     remoteId?: string;
+    createdAt?: Date;
+    /** This is the datetime that this object was last updated by Merge */
+    modifiedAt?: Date;
     /** The folder's name. */
     name?: string;
     /** The URL to access the folder. */
@@ -37,9 +40,6 @@ export interface Folder {
     remoteUpdatedAt?: Date;
     /** Indicates whether or not this object has been deleted in the third party platform. */
     remoteWasDeleted?: boolean;
-    createdAt?: Date;
-    /** This is the datetime that this object was last updated by Merge */
-    modifiedAt?: Date;
     fieldMappings?: Record<string, unknown>;
     remoteData?: (Record<string, unknown> | undefined)[];
 }

package/api/resources/filestorage/types/Group.d.ts

@@ -16,15 +16,15 @@ export interface Group {
     id?: string;
     /** The third-party API ID of the matching object. */
     remoteId?: string;
+    createdAt?: Date;
+    /** This is the datetime that this object was last updated by Merge */
+    modifiedAt?: Date;
     /** The group's name. */
     name?: string;
     /** The users that belong in the group. If null, this typically means it's either a domain or the third-party platform does not surface this information. */
     users: string[];
     /** Indicates whether or not this object has been deleted in the third party platform. */
     remoteWasDeleted?: boolean;
-    createdAt?: Date;
-    /** This is the datetime that this object was last updated by Merge */
-    modifiedAt?: Date;
     fieldMappings?: Record<string, unknown>;
     remoteData?: (Record<string, unknown> | undefined)[];
 }

package/api/resources/filestorage/types/LinkedAccountCondition.d.ts

@@ -6,11 +6,9 @@ export interface LinkedAccountCondition {
     conditionSchemaId: string;
     /** The common model for a specific condition. */
     commonModel?: string;
-    /** User-facing _native condition_ name. e.g. "Skip Manager". */
     nativeName?: string;
     /** The operator for a specific condition. */
     operator: string;
     value?: unknown;
-    /** The name of the field on the common model that this condition corresponds to, if they conceptually match. e.g. "location_type". */
     fieldName?: string;
 }

package/api/resources/filestorage/types/LinkedAccountConditionRequest.d.ts

@@ -2,6 +2,8 @@
  * This file was auto-generated by Fern from our API Definition.
  */
 export interface LinkedAccountConditionRequest {
+    /** The ID indicating which Linked Account Condition this is. */
+    id?: string;
     /** The ID indicating which condition schema to use for a specific condition. */
     conditionSchemaId: string;
     /** The operator for a specific condition. */

package/api/resources/filestorage/types/Permission.d.ts

@@ -17,6 +17,9 @@ export interface Permission {
     id?: string;
     /** The third-party API ID of the matching object. */
     remoteId?: string;
+    createdAt?: Date;
+    /** This is the datetime that this object was last updated by Merge */
+    modifiedAt?: Date;
     /** The user that is granted this permission. */
     user?: Merge.filestorage.PermissionUser;
     /** The group that is granted this permission. */
@@ -32,7 +35,4 @@ export interface Permission {
     type?: Merge.filestorage.PermissionType;
     /** The permissions that the user or group has for the File or Folder. It is possible for a user or group to have multiple roles, such as viewing & uploading. Possible values include: `READ`, `WRITE`, `OWNER`. In cases where there is no clear mapping, the original value passed through will be returned. */
     roles?: (Merge.filestorage.PermissionRolesItem | undefined)[];
-    createdAt?: Date;
-    /** This is the datetime that this object was last updated by Merge */
-    modifiedAt?: Date;
 }

package/api/resources/filestorage/types/User.d.ts

@@ -16,6 +16,9 @@ export interface User {
     id?: string;
     /** The third-party API ID of the matching object. */
     remoteId?: string;
+    createdAt?: Date;
+    /** This is the datetime that this object was last updated by Merge */
+    modifiedAt?: Date;
     /** The user's name. */
     name?: string;
     /** The user's email address. This is typically used to identify a user across linked accounts. */
@@ -24,9 +27,6 @@ export interface User {
     isMe?: boolean;
     /** Indicates whether or not this object has been deleted in the third party platform. */
     remoteWasDeleted?: boolean;
-    createdAt?: Date;
-    /** This is the datetime that this object was last updated by Merge */
-    modifiedAt?: Date;
     fieldMappings?: Record<string, unknown>;
     remoteData?: (Record<string, unknown> | undefined)[];
 }

package/api/resources/hris/resources/accountDetails/client/Client.js

@@ -58,7 +58,7 @@ class AccountDetails {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "api/hris/v1/account-details"),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, "hris/v1/account-details"),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -67,7 +67,7 @@ class AccountDetails {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,

package/api/resources/hris/resources/accountToken/client/Client.d.ts

@@ -22,7 +22,7 @@ export declare class AccountToken {
      * Returns the account token for the end user with the provided public token.
      *
      * @example
-     *     await merge.hris.accountToken.retrieve("string")
+     *     await merge.hris.accountToken.retrieve("public_token")
      */
     retrieve(publicToken: string, requestOptions?: AccountToken.RequestOptions): Promise<Merge.hris.AccountToken>;
     protected _getAuthorizationHeader(): Promise<string>;

package/api/resources/hris/resources/accountToken/client/Client.js

@@ -52,13 +52,13 @@ class AccountToken {
      * Returns the account token for the end user with the provided public token.
      *
      * @example
-     *     await merge.hris.accountToken.retrieve("string")
+     *     await merge.hris.accountToken.retrieve("public_token")
      */
     retrieve(publicToken, requestOptions) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const _response = yield core.fetcher({
-                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, `api/hris/v1/account-token/${publicToken}`),
+                url: (0, url_join_1.default)((_a = (yield core.Supplier.get(this._options.environment))) !== null && _a !== void 0 ? _a : environments.MergeEnvironment.Production, `hris/v1/account-token/${publicToken}`),
                 method: "GET",
                 headers: {
                     Authorization: yield this._getAuthorizationHeader(),
@@ -67,7 +67,7 @@ class AccountToken {
                         : undefined,
                     "X-Fern-Language": "JavaScript",
                     "X-Fern-SDK-Name": "@mergeapi/merge-node-client",
-                    "X-Fern-SDK-Version": "1.0.6",
+                    "X-Fern-SDK-Version": "1.0.7",
                 },
                 contentType: "application/json",
                 timeoutMs: (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) != null ? requestOptions.timeoutInSeconds * 1000 : 60000,