@dynamic-labs/sdk-api 0.0.418 → 0.0.420

package/src/apis/SDKApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -21,7 +22,6 @@ import { CreateEmbeddedWalletsRequestToJSON } from '../models/CreateEmbeddedWall
 import '../models/UserIdentifierTypeEnum.js';
 import { CurrencyFromJSON } from '../models/Currency.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import { EmailProviderResponseFromJSON } from '../models/EmailProviderResponse.js';
 import { EmailVerificationCreateRequestToJSON } from '../models/EmailVerificationCreateRequest.js';
@@ -64,6 +64,7 @@ import { MFARegenRecoveryCodesResponseFromJSON } from '../models/MFARegenRecover
 import { MFARegisterTotpDeviceGetResponseFromJSON } from '../models/MFARegisterTotpDeviceGetResponse.js';
 import { MFARegisterTotpDevicePostRequestToJSON } from '../models/MFARegisterTotpDevicePostRequest.js';
 import { MFAUpdateDeviceRequestToJSON } from '../models/MFAUpdateDeviceRequest.js';
+import { MergeUserConflictResolutionsToJSON } from '../models/MergeUserConflictResolutions.js';
 import { NetworkConfigurationResponseFromJSON } from '../models/NetworkConfigurationResponse.js';
 import '../models/NextViewEnum.js';
 import { NonceResponseFromJSON } from '../models/NonceResponse.js';
@@ -3436,6 +3437,75 @@ class SDKApi extends BaseAPI {
             yield this.verifyLinkOptionsRaw(requestParameters, initOverrides);
         });
     }
+    /**
+     * Used to merge two users with user-chosen resolutions to conflicting data between the two users to be merged
+     * Merge users with conflict resolutions
+     */
+    verifyMergeUsersRaw(requestParameters, initOverrides) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (requestParameters.environmentId === null || requestParameters.environmentId === undefined) {
+                throw new RequiredError('environmentId', 'Required parameter requestParameters.environmentId was null or undefined when calling verifyMergeUsers.');
+            }
+            if (requestParameters.mergeUserConflictResolutions === null || requestParameters.mergeUserConflictResolutions === undefined) {
+                throw new RequiredError('mergeUserConflictResolutions', 'Required parameter requestParameters.mergeUserConflictResolutions was null or undefined when calling verifyMergeUsers.');
+            }
+            const queryParameters = {};
+            const headerParameters = {};
+            headerParameters['Content-Type'] = 'application/json';
+            if (this.configuration && this.configuration.accessToken) {
+                const token = this.configuration.accessToken;
+                const tokenString = yield token("bearerAuth", []);
+                if (tokenString) {
+                    headerParameters["Authorization"] = `Bearer ${tokenString}`;
+                }
+            }
+            const response = yield this.request({
+                path: `/sdk/{environmentId}/verify/merge`.replace(`{${"environmentId"}}`, encodeURIComponent(String(requestParameters.environmentId))),
+                method: 'POST',
+                headers: headerParameters,
+                query: queryParameters,
+                body: MergeUserConflictResolutionsToJSON(requestParameters.mergeUserConflictResolutions),
+            }, initOverrides);
+            return new JSONApiResponse(response, (jsonValue) => VerifyResponseFromJSON(jsonValue));
+        });
+    }
+    /**
+     * Used to merge two users with user-chosen resolutions to conflicting data between the two users to be merged
+     * Merge users with conflict resolutions
+     */
+    verifyMergeUsers(requestParameters, initOverrides) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.verifyMergeUsersRaw(requestParameters, initOverrides);
+            return yield response.value();
+        });
+    }
+    /**
+     * Options call for this endpoint
+     */
+    verifyMergeUsersOptionsRaw(requestParameters, initOverrides) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (requestParameters.environmentId === null || requestParameters.environmentId === undefined) {
+                throw new RequiredError('environmentId', 'Required parameter requestParameters.environmentId was null or undefined when calling verifyMergeUsersOptions.');
+            }
+            const queryParameters = {};
+            const headerParameters = {};
+            const response = yield this.request({
+                path: `/sdk/{environmentId}/verify/merge`.replace(`{${"environmentId"}}`, encodeURIComponent(String(requestParameters.environmentId))),
+                method: 'OPTIONS',
+                headers: headerParameters,
+                query: queryParameters,
+            }, initOverrides);
+            return new VoidApiResponse(response);
+        });
+    }
+    /**
+     * Options call for this endpoint
+     */
+    verifyMergeUsersOptions(requestParameters, initOverrides) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.verifyMergeUsersOptionsRaw(requestParameters, initOverrides);
+        });
+    }
     /**
      * Options call for this endpoint
      */

package/src/apis/SDKViewsApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 require('../models/UnprocessableEntityErrorCode.cjs');
@@ -21,7 +22,6 @@ require('../models/ChainalysisCheckResultEnum.cjs');
 require('../models/EmbeddedWalletProviderEnum.cjs');
 require('../models/UserIdentifierTypeEnum.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/SDKViewsApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -17,7 +18,6 @@ import '../models/ChainalysisCheckResultEnum.js';
 import '../models/EmbeddedWalletProviderEnum.js';
 import '../models/UserIdentifierTypeEnum.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/apis/SessionsApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 require('../models/UnprocessableEntityErrorCode.cjs');
@@ -22,7 +23,6 @@ var Session = require('../models/Session.cjs');
 require('../models/EmbeddedWalletProviderEnum.cjs');
 require('../models/UserIdentifierTypeEnum.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/SessionsApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -18,7 +19,6 @@ import { SessionFromJSON } from '../models/Session.js';
 import '../models/EmbeddedWalletProviderEnum.js';
 import '../models/UserIdentifierTypeEnum.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/apis/SettingsApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 require('../models/UnprocessableEntityErrorCode.cjs');
@@ -21,7 +22,6 @@ require('../models/ChainalysisCheckResultEnum.cjs');
 require('../models/EmbeddedWalletProviderEnum.cjs');
 require('../models/UserIdentifierTypeEnum.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/SettingsApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -17,7 +18,6 @@ import '../models/ChainalysisCheckResultEnum.js';
 import '../models/EmbeddedWalletProviderEnum.js';
 import '../models/UserIdentifierTypeEnum.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/apis/TokensApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 require('../models/UnprocessableEntityErrorCode.cjs');
@@ -22,7 +23,6 @@ require('../models/EmbeddedWalletProviderEnum.cjs');
 var CreateTokenResponse = require('../models/CreateTokenResponse.cjs');
 require('../models/UserIdentifierTypeEnum.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/TokensApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -18,7 +19,6 @@ import '../models/EmbeddedWalletProviderEnum.js';
 import { CreateTokenResponseFromJSON } from '../models/CreateTokenResponse.js';
 import '../models/UserIdentifierTypeEnum.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/apis/UsersApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 var BulkUserCreateResponse = require('../models/BulkUserCreateResponse.cjs');
@@ -22,7 +23,6 @@ require('../models/ChainalysisCheckResultEnum.cjs');
 require('../models/EmbeddedWalletProviderEnum.cjs');
 require('../models/UserIdentifierTypeEnum.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/UsersApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import { BulkUserCreateResponseFromJSON } from '../models/BulkUserCreateResponse.js';
@@ -18,7 +19,6 @@ import '../models/ChainalysisCheckResultEnum.js';
 import '../models/EmbeddedWalletProviderEnum.js';
 import '../models/UserIdentifierTypeEnum.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/apis/VisitsApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 require('../models/UnprocessableEntityErrorCode.cjs');
@@ -21,7 +22,6 @@ require('../models/ChainalysisCheckResultEnum.cjs');
 require('../models/EmbeddedWalletProviderEnum.cjs');
 require('../models/UserIdentifierTypeEnum.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/VisitsApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -17,7 +18,6 @@ import '../models/ChainalysisCheckResultEnum.js';
 import '../models/EmbeddedWalletProviderEnum.js';
 import '../models/UserIdentifierTypeEnum.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/apis/WalletsApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 require('../models/UnprocessableEntityErrorCode.cjs');
@@ -24,7 +25,6 @@ var CreateUserEmbeddedWalletsFromFarcasterRequest = require('../models/CreateUse
 var CreateUserEmbeddedWalletsRequest = require('../models/CreateUserEmbeddedWalletsRequest.cjs');
 var CreateWalletRequest = require('../models/CreateWalletRequest.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/WalletsApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -20,7 +21,6 @@ import { CreateUserEmbeddedWalletsFromFarcasterRequestToJSON } from '../models/C
 import { CreateUserEmbeddedWalletsRequestToJSON } from '../models/CreateUserEmbeddedWalletsRequest.js';
 import { CreateWalletRequestToJSON } from '../models/CreateWalletRequest.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/apis/WebhooksApi.cjs

@@ -13,6 +13,7 @@ require('../models/WalletAddressType.cjs');
 require('../models/HardwareWalletEnum.cjs');
 require('../models/PasswordSourceTypeEnum.cjs');
 require('../models/WalletProviderEnum.cjs');
+require('../models/CustomFieldType.cjs');
 require('../models/KycFieldType.cjs');
 require('../models/BillingSubscriptionPlanTypeEnum.cjs');
 require('../models/UnprocessableEntityErrorCode.cjs');
@@ -21,7 +22,6 @@ require('../models/ChainalysisCheckResultEnum.cjs');
 require('../models/EmbeddedWalletProviderEnum.cjs');
 require('../models/UserIdentifierTypeEnum.cjs');
 require('../models/CurrencyType.cjs');
-require('../models/CustomFieldType.cjs');
 require('../models/TimeUnitEnum.cjs');
 require('../models/EmbeddedWalletAuthType.cjs');
 require('../models/EmbeddedWalletSecurityMethod.cjs');

package/src/apis/WebhooksApi.js

@@ -9,6 +9,7 @@ import '../models/WalletAddressType.js';
 import '../models/HardwareWalletEnum.js';
 import '../models/PasswordSourceTypeEnum.js';
 import '../models/WalletProviderEnum.js';
+import '../models/CustomFieldType.js';
 import '../models/KycFieldType.js';
 import '../models/BillingSubscriptionPlanTypeEnum.js';
 import '../models/UnprocessableEntityErrorCode.js';
@@ -17,7 +18,6 @@ import '../models/ChainalysisCheckResultEnum.js';
 import '../models/EmbeddedWalletProviderEnum.js';
 import '../models/UserIdentifierTypeEnum.js';
 import '../models/CurrencyType.js';
-import '../models/CustomFieldType.js';
 import '../models/TimeUnitEnum.js';
 import '../models/EmbeddedWalletAuthType.js';
 import '../models/EmbeddedWalletSecurityMethod.js';

package/src/index.cjs

@@ -155,6 +155,10 @@ var MFARegenRecoveryCodesResponse = require('./models/MFARegenRecoveryCodesRespo
 var MFARegisterTotpDeviceGetResponse = require('./models/MFARegisterTotpDeviceGetResponse.cjs');
 var MFARegisterTotpDevicePostRequest = require('./models/MFARegisterTotpDevicePostRequest.cjs');
 var MFAUpdateDeviceRequest = require('./models/MFAUpdateDeviceRequest.cjs');
+var MergeUser = require('./models/MergeUser.cjs');
+var MergeUserConflict = require('./models/MergeUserConflict.cjs');
+var MergeUserConflictResolution = require('./models/MergeUserConflictResolution.cjs');
+var MergeUserConflictResolutions = require('./models/MergeUserConflictResolutions.cjs');
 var MethodNotAllowed = require('./models/MethodNotAllowed.cjs');
 var MinifiedDynamicJwt = require('./models/MinifiedDynamicJwt.cjs');
 var NameService = require('./models/NameService.cjs');
@@ -812,6 +816,18 @@ exports.MFARegisterTotpDevicePostRequestToJSON = MFARegisterTotpDevicePostReques
 exports.MFAUpdateDeviceRequestFromJSON = MFAUpdateDeviceRequest.MFAUpdateDeviceRequestFromJSON;
 exports.MFAUpdateDeviceRequestFromJSONTyped = MFAUpdateDeviceRequest.MFAUpdateDeviceRequestFromJSONTyped;
 exports.MFAUpdateDeviceRequestToJSON = MFAUpdateDeviceRequest.MFAUpdateDeviceRequestToJSON;
+exports.MergeUserFromJSON = MergeUser.MergeUserFromJSON;
+exports.MergeUserFromJSONTyped = MergeUser.MergeUserFromJSONTyped;
+exports.MergeUserToJSON = MergeUser.MergeUserToJSON;
+exports.MergeUserConflictFromJSON = MergeUserConflict.MergeUserConflictFromJSON;
+exports.MergeUserConflictFromJSONTyped = MergeUserConflict.MergeUserConflictFromJSONTyped;
+exports.MergeUserConflictToJSON = MergeUserConflict.MergeUserConflictToJSON;
+exports.MergeUserConflictResolutionFromJSON = MergeUserConflictResolution.MergeUserConflictResolutionFromJSON;
+exports.MergeUserConflictResolutionFromJSONTyped = MergeUserConflictResolution.MergeUserConflictResolutionFromJSONTyped;
+exports.MergeUserConflictResolutionToJSON = MergeUserConflictResolution.MergeUserConflictResolutionToJSON;
+exports.MergeUserConflictResolutionsFromJSON = MergeUserConflictResolutions.MergeUserConflictResolutionsFromJSON;
+exports.MergeUserConflictResolutionsFromJSONTyped = MergeUserConflictResolutions.MergeUserConflictResolutionsFromJSONTyped;
+exports.MergeUserConflictResolutionsToJSON = MergeUserConflictResolutions.MergeUserConflictResolutionsToJSON;
 exports.MethodNotAllowedFromJSON = MethodNotAllowed.MethodNotAllowedFromJSON;
 exports.MethodNotAllowedFromJSONTyped = MethodNotAllowed.MethodNotAllowedFromJSONTyped;
 exports.MethodNotAllowedToJSON = MethodNotAllowed.MethodNotAllowedToJSON;

package/src/index.js

@@ -151,6 +151,10 @@ export { MFARegenRecoveryCodesResponseFromJSON, MFARegenRecoveryCodesResponseFro
 export { MFARegisterTotpDeviceGetResponseFromJSON, MFARegisterTotpDeviceGetResponseFromJSONTyped, MFARegisterTotpDeviceGetResponseToJSON } from './models/MFARegisterTotpDeviceGetResponse.js';
 export { MFARegisterTotpDevicePostRequestFromJSON, MFARegisterTotpDevicePostRequestFromJSONTyped, MFARegisterTotpDevicePostRequestToJSON } from './models/MFARegisterTotpDevicePostRequest.js';
 export { MFAUpdateDeviceRequestFromJSON, MFAUpdateDeviceRequestFromJSONTyped, MFAUpdateDeviceRequestToJSON } from './models/MFAUpdateDeviceRequest.js';
+export { MergeUserFromJSON, MergeUserFromJSONTyped, MergeUserToJSON } from './models/MergeUser.js';
+export { MergeUserConflictFromJSON, MergeUserConflictFromJSONTyped, MergeUserConflictToJSON } from './models/MergeUserConflict.js';
+export { MergeUserConflictResolutionFromJSON, MergeUserConflictResolutionFromJSONTyped, MergeUserConflictResolutionToJSON } from './models/MergeUserConflictResolution.js';
+export { MergeUserConflictResolutionsFromJSON, MergeUserConflictResolutionsFromJSONTyped, MergeUserConflictResolutionsToJSON } from './models/MergeUserConflictResolutions.js';
 export { MethodNotAllowedFromJSON, MethodNotAllowedFromJSONTyped, MethodNotAllowedToJSON } from './models/MethodNotAllowed.js';
 export { MinifiedDynamicJwtFromJSON, MinifiedDynamicJwtFromJSONTyped, MinifiedDynamicJwtToJSON } from './models/MinifiedDynamicJwt.js';
 export { NameServiceFromJSON, NameServiceFromJSONTyped, NameServiceToJSON } from './models/NameService.js';

package/src/models/MergeUser.cjs

@@ -0,0 +1,45 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Dashboard API
+ * Dashboard API documentation
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+function MergeUserFromJSON(json) {
+    return MergeUserFromJSONTyped(json);
+}
+function MergeUserFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'userId': json['userId'],
+        'value': json['value'],
+    };
+}
+function MergeUserToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'userId': value.userId,
+        'value': value.value,
+    };
+}
+
+exports.MergeUserFromJSON = MergeUserFromJSON;
+exports.MergeUserFromJSONTyped = MergeUserFromJSONTyped;
+exports.MergeUserToJSON = MergeUserToJSON;

package/src/models/MergeUser.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Dashboard API
+ * Dashboard API documentation
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/**
+ * Contains the current field value for the user.
+ * @export
+ * @interface MergeUser
+ */
+export interface MergeUser {
+    /**
+     *
+     * @type {string}
+     * @memberof MergeUser
+     */
+    userId: string;
+    /**
+     *
+     * @type {string}
+     * @memberof MergeUser
+     */
+    value: string;
+}
+export declare function MergeUserFromJSON(json: any): MergeUser;
+export declare function MergeUserFromJSONTyped(json: any, ignoreDiscriminator: boolean): MergeUser;
+export declare function MergeUserToJSON(value?: MergeUser | null): any;

package/src/models/MergeUser.js

@@ -0,0 +1,39 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Dashboard API
+ * Dashboard API documentation
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+function MergeUserFromJSON(json) {
+    return MergeUserFromJSONTyped(json);
+}
+function MergeUserFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'userId': json['userId'],
+        'value': json['value'],
+    };
+}
+function MergeUserToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'userId': value.userId,
+        'value': value.value,
+    };
+}
+
+export { MergeUserFromJSON, MergeUserFromJSONTyped, MergeUserToJSON };

package/src/models/MergeUserConflict.cjs

@@ -0,0 +1,38 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var MergeUser = require('./MergeUser.cjs');
+var ProjectSettingsKyc = require('./ProjectSettingsKyc.cjs');
+
+/* tslint:disable */
+function MergeUserConflictFromJSON(json) {
+    return MergeUserConflictFromJSONTyped(json);
+}
+function MergeUserConflictFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'field': ProjectSettingsKyc.ProjectSettingsKycFromJSON(json['field']),
+        'fromUser': MergeUser.MergeUserFromJSON(json['fromUser']),
+        'currentUser': MergeUser.MergeUserFromJSON(json['currentUser']),
+    };
+}
+function MergeUserConflictToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'field': ProjectSettingsKyc.ProjectSettingsKycToJSON(value.field),
+        'fromUser': MergeUser.MergeUserToJSON(value.fromUser),
+        'currentUser': MergeUser.MergeUserToJSON(value.currentUser),
+    };
+}
+
+exports.MergeUserConflictFromJSON = MergeUserConflictFromJSON;
+exports.MergeUserConflictFromJSONTyped = MergeUserConflictFromJSONTyped;
+exports.MergeUserConflictToJSON = MergeUserConflictToJSON;

package/src/models/MergeUserConflict.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Dashboard API
+ * Dashboard API documentation
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import { MergeUser } from './MergeUser';
+import { ProjectSettingsKyc } from './ProjectSettingsKyc';
+/**
+ * Contains a merge conflict between two users with different values for the same user field data
+ * @export
+ * @interface MergeUserConflict
+ */
+export interface MergeUserConflict {
+    /**
+     *
+     * @type {ProjectSettingsKyc}
+     * @memberof MergeUserConflict
+     */
+    field: ProjectSettingsKyc;
+    /**
+     *
+     * @type {MergeUser}
+     * @memberof MergeUserConflict
+     */
+    fromUser: MergeUser;
+    /**
+     *
+     * @type {MergeUser}
+     * @memberof MergeUserConflict
+     */
+    currentUser: MergeUser;
+}
+export declare function MergeUserConflictFromJSON(json: any): MergeUserConflict;
+export declare function MergeUserConflictFromJSONTyped(json: any, ignoreDiscriminator: boolean): MergeUserConflict;
+export declare function MergeUserConflictToJSON(value?: MergeUserConflict | null): any;

package/src/models/MergeUserConflict.js

@@ -0,0 +1,32 @@
+import { MergeUserFromJSON, MergeUserToJSON } from './MergeUser.js';
+import { ProjectSettingsKycFromJSON, ProjectSettingsKycToJSON } from './ProjectSettingsKyc.js';
+
+/* tslint:disable */
+function MergeUserConflictFromJSON(json) {
+    return MergeUserConflictFromJSONTyped(json);
+}
+function MergeUserConflictFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'field': ProjectSettingsKycFromJSON(json['field']),
+        'fromUser': MergeUserFromJSON(json['fromUser']),
+        'currentUser': MergeUserFromJSON(json['currentUser']),
+    };
+}
+function MergeUserConflictToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'field': ProjectSettingsKycToJSON(value.field),
+        'fromUser': MergeUserToJSON(value.fromUser),
+        'currentUser': MergeUserToJSON(value.currentUser),
+    };
+}
+
+export { MergeUserConflictFromJSON, MergeUserConflictFromJSONTyped, MergeUserConflictToJSON };