@dynamic-labs/sdk-api-core 0.0.419 → 0.0.420

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-api-core",
-  "version": "0.0.419",
+  "version": "0.0.420",
   "author": "Dynamic Labs",
   "license": "Apache-2.0",
   "publishConfig": {

package/src/apis/SDKApi.cjs

@@ -55,6 +55,7 @@ var MFARegenRecoveryCodesResponse = require('../models/MFARegenRecoveryCodesResp
 var MFARegisterTotpDeviceGetResponse = require('../models/MFARegisterTotpDeviceGetResponse.cjs');
 var MFARegisterTotpDevicePostRequest = require('../models/MFARegisterTotpDevicePostRequest.cjs');
 var MFAUpdateDeviceRequest = require('../models/MFAUpdateDeviceRequest.cjs');
+var MergeUserConflictResolutions = require('../models/MergeUserConflictResolutions.cjs');
 var NetworkConfigurationResponse = require('../models/NetworkConfigurationResponse.cjs');
 require('../models/NextViewEnum.cjs');
 var NonceResponse = require('../models/NonceResponse.cjs');
@@ -3376,6 +3377,75 @@ class SDKApi extends runtime.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 _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (requestParameters.environmentId === null || requestParameters.environmentId === undefined) {
+                throw new runtime.RequiredError('environmentId', 'Required parameter requestParameters.environmentId was null or undefined when calling verifyMergeUsers.');
+            }
+            if (requestParameters.mergeUserConflictResolutions === null || requestParameters.mergeUserConflictResolutions === undefined) {
+                throw new runtime.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: MergeUserConflictResolutions.MergeUserConflictResolutionsToJSON(requestParameters.mergeUserConflictResolutions),
+            }, initOverrides);
+            return new runtime.JSONApiResponse(response, (jsonValue) => VerifyResponse.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 _tslib.__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 _tslib.__awaiter(this, void 0, void 0, function* () {
+            if (requestParameters.environmentId === null || requestParameters.environmentId === undefined) {
+                throw new runtime.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 runtime.VoidApiResponse(response);
+        });
+    }
+    /**
+     * Options call for this endpoint
+     */
+    verifyMergeUsersOptions(requestParameters, initOverrides) {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            yield this.verifyMergeUsersOptionsRaw(requestParameters, initOverrides);
+        });
+    }
     /**
      * Options call for this endpoint
      */

package/src/apis/SDKApi.d.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import * as runtime from '../runtime';
-import { CompletePasskeyRecoveryRequest, ConnectRequest, CreateEmbeddedWalletsRequest, EmailProviderResponse, EmailVerificationCreateRequest, EmailVerificationCreateResponse, EmailVerificationRetryRequest, EmailVerificationVerifyRequest, EmbeddedWalletAuthToken, EmbeddedWalletAuthType, EmbeddedWalletPasscodeClaimRequest, EmbeddedWalletSecret, ExportEmbeddedWalletResponse, FarcasterSignInRequest, FarcasterSignInResponse, GetUserPasskeysResponse, HealthcheckResponse, InitEmailAuthRequest, InitEmailAuthResponse, InitPasskeyRecoveryRequest, InitPasskeyRecoveryResponse, JwksResponse, MFAAuthRecoveryDevicePostRequest, MFAAuthResponse, MFAAuthTotpDevicePostRequest, MFADevice, MFAGetRecoveryCodesResponse, MFAListDevicesResponse, MFARegenRecoveryCodesResponse, MFARegisterTotpDeviceGetResponse, MFARegisterTotpDevicePostRequest, MFAUpdateDeviceRequest, NetworkConfigurationResponse, NonceResponse, OauthProviderLoginUrl, OauthRequest, OauthResultRequest, OauthResultResponse, PrefetchRequest, ProjectSettings, ProviderEnum, PublishEvents, SdkSettingsRequest, SmsVerificationCreateRequest, SmsVerificationCreateResponse, SmsVerificationRetryRequest, SmsVerificationVerifyRequest, SupportedOnrampsResponse, UpdateRecoveryEmailRequest, UpdateSelfResponse, UpdateUserPasskeyRequest, UserFields, UserPasskey, VerifyRequest, VerifyResponse, VerifyUnlinkRequest } from '../models';
+import { CompletePasskeyRecoveryRequest, ConnectRequest, CreateEmbeddedWalletsRequest, EmailProviderResponse, EmailVerificationCreateRequest, EmailVerificationCreateResponse, EmailVerificationRetryRequest, EmailVerificationVerifyRequest, EmbeddedWalletAuthToken, EmbeddedWalletAuthType, EmbeddedWalletPasscodeClaimRequest, EmbeddedWalletSecret, ExportEmbeddedWalletResponse, FarcasterSignInRequest, FarcasterSignInResponse, GetUserPasskeysResponse, HealthcheckResponse, InitEmailAuthRequest, InitEmailAuthResponse, InitPasskeyRecoveryRequest, InitPasskeyRecoveryResponse, JwksResponse, MFAAuthRecoveryDevicePostRequest, MFAAuthResponse, MFAAuthTotpDevicePostRequest, MFADevice, MFAGetRecoveryCodesResponse, MFAListDevicesResponse, MFARegenRecoveryCodesResponse, MFARegisterTotpDeviceGetResponse, MFARegisterTotpDevicePostRequest, MFAUpdateDeviceRequest, MergeUserConflictResolutions, NetworkConfigurationResponse, NonceResponse, OauthProviderLoginUrl, OauthRequest, OauthResultRequest, OauthResultResponse, PrefetchRequest, ProjectSettings, ProviderEnum, PublishEvents, SdkSettingsRequest, SmsVerificationCreateRequest, SmsVerificationCreateResponse, SmsVerificationRetryRequest, SmsVerificationVerifyRequest, SupportedOnrampsResponse, UpdateRecoveryEmailRequest, UpdateSelfResponse, UpdateUserPasskeyRequest, UserFields, UserPasskey, VerifyRequest, VerifyResponse, VerifyUnlinkRequest } from '../models';
 export interface AuthMfaRecoveryRequest {
     environmentId: string;
     mFAAuthRecoveryDevicePostRequest: MFAAuthRecoveryDevicePostRequest;
@@ -385,6 +385,13 @@ export interface VerifyLinkRequest {
 export interface VerifyLinkOptionsRequest {
     environmentId: string;
 }
+export interface VerifyMergeUsersRequest {
+    environmentId: string;
+    mergeUserConflictResolutions: MergeUserConflictResolutions;
+}
+export interface VerifyMergeUsersOptionsRequest {
+    environmentId: string;
+}
 export interface VerifyOptionsRequest {
     environmentId: string;
 }
@@ -1254,6 +1261,24 @@ export declare class SDKApi extends runtime.BaseAPI {
      * Options call for this endpoint
      */
     verifyLinkOptions(requestParameters: VerifyLinkOptionsRequest, initOverrides?: RequestInit): Promise<void>;
+    /**
+     * 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: VerifyMergeUsersRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<VerifyResponse>>;
+    /**
+     * 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: VerifyMergeUsersRequest, initOverrides?: RequestInit): Promise<VerifyResponse>;
+    /**
+     * Options call for this endpoint
+     */
+    verifyMergeUsersOptionsRaw(requestParameters: VerifyMergeUsersOptionsRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<void>>;
+    /**
+     * Options call for this endpoint
+     */
+    verifyMergeUsersOptions(requestParameters: VerifyMergeUsersOptionsRequest, initOverrides?: RequestInit): Promise<void>;
     /**
      * Options call for this endpoint
      */

package/src/apis/SDKApi.js

@@ -51,6 +51,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';
@@ -3372,6 +3373,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/index.cjs

@@ -77,6 +77,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');
@@ -457,6 +461,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

@@ -73,6 +73,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/DynamicJwt.cjs

@@ -37,7 +37,6 @@ function DynamicJwtFromJSONTyped(json, ignoreDiscriminator) {
         'phoneNumber': !runtime.exists(json, 'phone_number') ? undefined : json['phone_number'],
         'missingFields': (json['missing_fields'].map(ProjectSettingsKyc.ProjectSettingsKycFromJSON)),
         'scope': !runtime.exists(json, 'scope') ? undefined : json['scope'],
-        'requestedScope': !runtime.exists(json, 'requestedScope') ? undefined : json['requestedScope'],
         'tShirtSize': !runtime.exists(json, 't_shirt_size') ? undefined : json['t_shirt_size'],
         'team': !runtime.exists(json, 'team') ? undefined : json['team'],
         'username': !runtime.exists(json, 'username') ? undefined : json['username'],
@@ -90,7 +89,6 @@ function DynamicJwtToJSON(value) {
         'phone_number': value.phoneNumber,
         'missing_fields': (value.missingFields.map(ProjectSettingsKyc.ProjectSettingsKycToJSON)),
         'scope': value.scope,
-        'requestedScope': value.requestedScope,
         't_shirt_size': value.tShirtSize,
         'team': value.team,
         'username': value.username,

package/src/models/DynamicJwt.d.ts

@@ -139,12 +139,6 @@ export interface DynamicJwt {
      * @memberof DynamicJwt
      */
     scope?: string;
-    /**
-     * A whitespace-separate list of permissions associated with the JWT token issued. This conforms to the JWT standard for scope claims: https://datatracker.ietf.org/doc/html/rfc8693#section-4.2
-     * @type {string}
-     * @memberof DynamicJwt
-     */
-    requestedScope?: string;
     /**
      *
      * @type {string}

package/src/models/DynamicJwt.js

@@ -33,7 +33,6 @@ function DynamicJwtFromJSONTyped(json, ignoreDiscriminator) {
         'phoneNumber': !exists(json, 'phone_number') ? undefined : json['phone_number'],
         'missingFields': (json['missing_fields'].map(ProjectSettingsKycFromJSON)),
         'scope': !exists(json, 'scope') ? undefined : json['scope'],
-        'requestedScope': !exists(json, 'requestedScope') ? undefined : json['requestedScope'],
         'tShirtSize': !exists(json, 't_shirt_size') ? undefined : json['t_shirt_size'],
         'team': !exists(json, 'team') ? undefined : json['team'],
         'username': !exists(json, 'username') ? undefined : json['username'],
@@ -86,7 +85,6 @@ function DynamicJwtToJSON(value) {
         'phone_number': value.phoneNumber,
         'missing_fields': (value.missingFields.map(ProjectSettingsKycToJSON)),
         'scope': value.scope,
-        'requestedScope': value.requestedScope,
         't_shirt_size': value.tShirtSize,
         'team': value.team,
         'username': value.username,

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 };

package/src/models/MergeUserConflictResolution.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 MergeUserConflictResolutionFromJSON(json) {
+    return MergeUserConflictResolutionFromJSONTyped(json);
+}
+function MergeUserConflictResolutionFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'userId': json['userId'],
+        'fieldKey': json['fieldKey'],
+    };
+}
+function MergeUserConflictResolutionToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'userId': value.userId,
+        'fieldKey': value.fieldKey,
+    };
+}
+
+exports.MergeUserConflictResolutionFromJSON = MergeUserConflictResolutionFromJSON;
+exports.MergeUserConflictResolutionFromJSONTyped = MergeUserConflictResolutionFromJSONTyped;
+exports.MergeUserConflictResolutionToJSON = MergeUserConflictResolutionToJSON;

package/src/models/MergeUserConflictResolution.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 field key and the userId for whose information we need to keep
+ * @export
+ * @interface MergeUserConflictResolution
+ */
+export interface MergeUserConflictResolution {
+    /**
+     *
+     * @type {string}
+     * @memberof MergeUserConflictResolution
+     */
+    userId: string;
+    /**
+     *
+     * @type {string}
+     * @memberof MergeUserConflictResolution
+     */
+    fieldKey: string;
+}
+export declare function MergeUserConflictResolutionFromJSON(json: any): MergeUserConflictResolution;
+export declare function MergeUserConflictResolutionFromJSONTyped(json: any, ignoreDiscriminator: boolean): MergeUserConflictResolution;
+export declare function MergeUserConflictResolutionToJSON(value?: MergeUserConflictResolution | null): any;

package/src/models/MergeUserConflictResolution.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 MergeUserConflictResolutionFromJSON(json) {
+    return MergeUserConflictResolutionFromJSONTyped(json);
+}
+function MergeUserConflictResolutionFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'userId': json['userId'],
+        'fieldKey': json['fieldKey'],
+    };
+}
+function MergeUserConflictResolutionToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'userId': value.userId,
+        'fieldKey': value.fieldKey,
+    };
+}
+
+export { MergeUserConflictResolutionFromJSON, MergeUserConflictResolutionFromJSONTyped, MergeUserConflictResolutionToJSON };

package/src/models/MergeUserConflictResolutions.cjs

@@ -0,0 +1,34 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var runtime = require('../runtime.cjs');
+var MergeUserConflictResolution = require('./MergeUserConflictResolution.cjs');
+
+/* tslint:disable */
+function MergeUserConflictResolutionsFromJSON(json) {
+    return MergeUserConflictResolutionsFromJSONTyped(json);
+}
+function MergeUserConflictResolutionsFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'mergeUserResolutions': !runtime.exists(json, 'mergeUserResolutions') ? undefined : (json['mergeUserResolutions'].map(MergeUserConflictResolution.MergeUserConflictResolutionFromJSON)),
+    };
+}
+function MergeUserConflictResolutionsToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'mergeUserResolutions': value.mergeUserResolutions === undefined ? undefined : (value.mergeUserResolutions.map(MergeUserConflictResolution.MergeUserConflictResolutionToJSON)),
+    };
+}
+
+exports.MergeUserConflictResolutionsFromJSON = MergeUserConflictResolutionsFromJSON;
+exports.MergeUserConflictResolutionsFromJSONTyped = MergeUserConflictResolutionsFromJSONTyped;
+exports.MergeUserConflictResolutionsToJSON = MergeUserConflictResolutionsToJSON;

package/src/models/MergeUserConflictResolutions.d.ts

@@ -0,0 +1,28 @@
+/**
+ * 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 { MergeUserConflictResolution } from './MergeUserConflictResolution';
+/**
+ * Contains the resolutions for merging two users
+ * @export
+ * @interface MergeUserConflictResolutions
+ */
+export interface MergeUserConflictResolutions {
+    /**
+     *
+     * @type {Array<MergeUserConflictResolution>}
+     * @memberof MergeUserConflictResolutions
+     */
+    mergeUserResolutions?: Array<MergeUserConflictResolution>;
+}
+export declare function MergeUserConflictResolutionsFromJSON(json: any): MergeUserConflictResolutions;
+export declare function MergeUserConflictResolutionsFromJSONTyped(json: any, ignoreDiscriminator: boolean): MergeUserConflictResolutions;
+export declare function MergeUserConflictResolutionsToJSON(value?: MergeUserConflictResolutions | null): any;

package/src/models/MergeUserConflictResolutions.js

@@ -0,0 +1,28 @@
+import { exists } from '../runtime.js';
+import { MergeUserConflictResolutionFromJSON, MergeUserConflictResolutionToJSON } from './MergeUserConflictResolution.js';
+
+/* tslint:disable */
+function MergeUserConflictResolutionsFromJSON(json) {
+    return MergeUserConflictResolutionsFromJSONTyped(json);
+}
+function MergeUserConflictResolutionsFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'mergeUserResolutions': !exists(json, 'mergeUserResolutions') ? undefined : (json['mergeUserResolutions'].map(MergeUserConflictResolutionFromJSON)),
+    };
+}
+function MergeUserConflictResolutionsToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'mergeUserResolutions': value.mergeUserResolutions === undefined ? undefined : (value.mergeUserResolutions.map(MergeUserConflictResolutionToJSON)),
+    };
+}
+
+export { MergeUserConflictResolutionsFromJSON, MergeUserConflictResolutionsFromJSONTyped, MergeUserConflictResolutionsToJSON };

package/src/models/MinifiedDynamicJwt.cjs

@@ -24,7 +24,6 @@ function MinifiedDynamicJwtFromJSONTyped(json, ignoreDiscriminator) {
         'lastVerifiedCredentialId': json['last_verified_credential_id'],
         'memberEnvironmentIds': !runtime.exists(json, 'member_environment_ids') ? undefined : json['member_environment_ids'],
         'scope': !runtime.exists(json, 'scope') ? undefined : json['scope'],
-        'requestedScope': !runtime.exists(json, 'requestedScope') ? undefined : json['requestedScope'],
     };
 }
 function MinifiedDynamicJwtToJSON(value) {
@@ -46,7 +45,6 @@ function MinifiedDynamicJwtToJSON(value) {
         'last_verified_credential_id': value.lastVerifiedCredentialId,
         'member_environment_ids': value.memberEnvironmentIds,
         'scope': value.scope,
-        'requestedScope': value.requestedScope,
     };
 }
 

package/src/models/MinifiedDynamicJwt.d.ts

@@ -81,12 +81,6 @@ export interface MinifiedDynamicJwt {
      * @memberof MinifiedDynamicJwt
      */
     scope?: string;
-    /**
-     * A whitespace-separate list of permissions associated with the JWT token issued. This conforms to the JWT standard for scope claims: https://datatracker.ietf.org/doc/html/rfc8693#section-4.2
-     * @type {string}
-     * @memberof MinifiedDynamicJwt
-     */
-    requestedScope?: string;
 }
 export declare function MinifiedDynamicJwtFromJSON(json: any): MinifiedDynamicJwt;
 export declare function MinifiedDynamicJwtFromJSONTyped(json: any, ignoreDiscriminator: boolean): MinifiedDynamicJwt;

package/src/models/MinifiedDynamicJwt.js

@@ -20,7 +20,6 @@ function MinifiedDynamicJwtFromJSONTyped(json, ignoreDiscriminator) {
         'lastVerifiedCredentialId': json['last_verified_credential_id'],
         'memberEnvironmentIds': !exists(json, 'member_environment_ids') ? undefined : json['member_environment_ids'],
         'scope': !exists(json, 'scope') ? undefined : json['scope'],
-        'requestedScope': !exists(json, 'requestedScope') ? undefined : json['requestedScope'],
     };
 }
 function MinifiedDynamicJwtToJSON(value) {
@@ -42,7 +41,6 @@ function MinifiedDynamicJwtToJSON(value) {
         'last_verified_credential_id': value.lastVerifiedCredentialId,
         'member_environment_ids': value.memberEnvironmentIds,
         'scope': value.scope,
-        'requestedScope': value.requestedScope,
     };
 }
 

package/src/models/UnprocessableEntityErrorCode.cjs

@@ -90,6 +90,7 @@ exports.UnprocessableEntityErrorCode = void 0;
     UnprocessableEntityErrorCode["InvalidPhone"] = "invalid_phone";
     UnprocessableEntityErrorCode["GateExists"] = "gate_exists";
     UnprocessableEntityErrorCode["InvalidEmbeddedWalletChainsConfiguration"] = "invalid_embedded_wallet_chains_configuration";
+    UnprocessableEntityErrorCode["MergeAccountsConfirmation"] = "merge_accounts_confirmation";
 })(exports.UnprocessableEntityErrorCode || (exports.UnprocessableEntityErrorCode = {}));
 function UnprocessableEntityErrorCodeFromJSON(json) {
     return UnprocessableEntityErrorCodeFromJSONTyped(json);

package/src/models/UnprocessableEntityErrorCode.d.ts

@@ -82,7 +82,8 @@ export declare enum UnprocessableEntityErrorCode {
     MfaInvalidRequest = "mfa_invalid_request",
     InvalidPhone = "invalid_phone",
     GateExists = "gate_exists",
-    InvalidEmbeddedWalletChainsConfiguration = "invalid_embedded_wallet_chains_configuration"
+    InvalidEmbeddedWalletChainsConfiguration = "invalid_embedded_wallet_chains_configuration",
+    MergeAccountsConfirmation = "merge_accounts_confirmation"
 }
 export declare function UnprocessableEntityErrorCodeFromJSON(json: any): UnprocessableEntityErrorCode;
 export declare function UnprocessableEntityErrorCodeFromJSONTyped(json: any, ignoreDiscriminator: boolean): UnprocessableEntityErrorCode;

package/src/models/UnprocessableEntityErrorCode.js

@@ -86,6 +86,7 @@ var UnprocessableEntityErrorCode;
     UnprocessableEntityErrorCode["InvalidPhone"] = "invalid_phone";
     UnprocessableEntityErrorCode["GateExists"] = "gate_exists";
     UnprocessableEntityErrorCode["InvalidEmbeddedWalletChainsConfiguration"] = "invalid_embedded_wallet_chains_configuration";
+    UnprocessableEntityErrorCode["MergeAccountsConfirmation"] = "merge_accounts_confirmation";
 })(UnprocessableEntityErrorCode || (UnprocessableEntityErrorCode = {}));
 function UnprocessableEntityErrorCodeFromJSON(json) {
     return UnprocessableEntityErrorCodeFromJSONTyped(json);

package/src/models/UnprocessableEntityErrorPayload.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var runtime = require('../runtime.cjs');
+var MergeUserConflict = require('./MergeUserConflict.cjs');
 var ProviderEnum = require('./ProviderEnum.cjs');
 
 /* tslint:disable */
@@ -18,6 +19,7 @@ function UnprocessableEntityErrorPayloadFromJSONTyped(json, ignoreDiscriminator)
         'loginProvider': !runtime.exists(json, 'loginProvider') ? undefined : ProviderEnum.ProviderEnumFromJSON(json['loginProvider']),
         'embeddedWalletName': !runtime.exists(json, 'embeddedWalletName') ? undefined : json['embeddedWalletName'],
         'embeddedSocialSigninProvider': !runtime.exists(json, 'embeddedSocialSigninProvider') ? undefined : ProviderEnum.ProviderEnumFromJSON(json['embeddedSocialSigninProvider']),
+        'mergeUserConflicts': !runtime.exists(json, 'mergeUserConflicts') ? undefined : (json['mergeUserConflicts'].map(MergeUserConflict.MergeUserConflictFromJSON)),
     };
 }
 function UnprocessableEntityErrorPayloadToJSON(value) {
@@ -32,6 +34,7 @@ function UnprocessableEntityErrorPayloadToJSON(value) {
         'loginProvider': ProviderEnum.ProviderEnumToJSON(value.loginProvider),
         'embeddedWalletName': value.embeddedWalletName,
         'embeddedSocialSigninProvider': ProviderEnum.ProviderEnumToJSON(value.embeddedSocialSigninProvider),
+        'mergeUserConflicts': value.mergeUserConflicts === undefined ? undefined : (value.mergeUserConflicts.map(MergeUserConflict.MergeUserConflictToJSON)),
     };
 }
 

package/src/models/UnprocessableEntityErrorPayload.d.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { MergeUserConflict } from './MergeUserConflict';
 import { ProviderEnum } from './ProviderEnum';
 /**
  * Contains information which the integrating client of this API can use to tailor an experience to a customer to fix the underlying issue that triggered this error.
@@ -40,6 +41,12 @@ export interface UnprocessableEntityErrorPayload {
      * @memberof UnprocessableEntityErrorPayload
      */
     embeddedSocialSigninProvider?: ProviderEnum;
+    /**
+     *
+     * @type {Array<MergeUserConflict>}
+     * @memberof UnprocessableEntityErrorPayload
+     */
+    mergeUserConflicts?: Array<MergeUserConflict>;
 }
 export declare function UnprocessableEntityErrorPayloadFromJSON(json: any): UnprocessableEntityErrorPayload;
 export declare function UnprocessableEntityErrorPayloadFromJSONTyped(json: any, ignoreDiscriminator: boolean): UnprocessableEntityErrorPayload;

package/src/models/UnprocessableEntityErrorPayload.js

@@ -1,4 +1,5 @@
 import { exists } from '../runtime.js';
+import { MergeUserConflictFromJSON, MergeUserConflictToJSON } from './MergeUserConflict.js';
 import { ProviderEnumFromJSON, ProviderEnumToJSON } from './ProviderEnum.js';
 
 /* tslint:disable */
@@ -14,6 +15,7 @@ function UnprocessableEntityErrorPayloadFromJSONTyped(json, ignoreDiscriminator)
         'loginProvider': !exists(json, 'loginProvider') ? undefined : ProviderEnumFromJSON(json['loginProvider']),
         'embeddedWalletName': !exists(json, 'embeddedWalletName') ? undefined : json['embeddedWalletName'],
         'embeddedSocialSigninProvider': !exists(json, 'embeddedSocialSigninProvider') ? undefined : ProviderEnumFromJSON(json['embeddedSocialSigninProvider']),
+        'mergeUserConflicts': !exists(json, 'mergeUserConflicts') ? undefined : (json['mergeUserConflicts'].map(MergeUserConflictFromJSON)),
     };
 }
 function UnprocessableEntityErrorPayloadToJSON(value) {
@@ -28,6 +30,7 @@ function UnprocessableEntityErrorPayloadToJSON(value) {
         'loginProvider': ProviderEnumToJSON(value.loginProvider),
         'embeddedWalletName': value.embeddedWalletName,
         'embeddedSocialSigninProvider': ProviderEnumToJSON(value.embeddedSocialSigninProvider),
+        'mergeUserConflicts': value.mergeUserConflicts === undefined ? undefined : (value.mergeUserConflicts.map(MergeUserConflictToJSON)),
     };
 }
 

package/src/models/index.d.ts

@@ -71,6 +71,10 @@ export * from './MFARegenRecoveryCodesResponse';
 export * from './MFARegisterTotpDeviceGetResponse';
 export * from './MFARegisterTotpDevicePostRequest';
 export * from './MFAUpdateDeviceRequest';
+export * from './MergeUser';
+export * from './MergeUserConflict';
+export * from './MergeUserConflictResolution';
+export * from './MergeUserConflictResolutions';
 export * from './MethodNotAllowed';
 export * from './MinifiedDynamicJwt';
 export * from './NameService';