@dynamic-labs-wallet/browser 0.0.239 → 0.0.241

package/index.cjs.js

@@ -658,16 +658,6 @@ const downloadStringAsFile = ({ filename, content, mimeType = 'application/json'
     URL.revokeObjectURL(url);
 };
 
-// CloudKit Web Services API token for public operations
-// This token only allows access to the iCloud.KeyShareBackup container
-// and is safe to include in client-side code
-const DEFAULT_CONFIG = {
-    containerIdentifier: 'iCloud.KeyShareBackup',
-    // apiToken: '1221c5ccdf2ddb9abdb035befe7c197b07102972b30bbcbe363f6d722f3127a1', // prod
-    apiToken: '332a46c457183332f8d2a3d94d2ac87e9e9ae2af81d8a6d1ea89c27bb2fc0e97',
-    // environment: 'production',
-    environment: 'development'
-};
 const CLOUDKIT_CDN_URL = 'https://cdn.apple-cloudkit.com/ck/2/cloudkit.js';
 const BACKUP_RECORD_TYPE = 'Backup';
 let cloudKitLoaded = false;
@@ -703,7 +693,6 @@ const loadCloudKit = ()=>{
         script.src = CLOUDKIT_CDN_URL;
         script.onload = ()=>{
             cloudKitLoaded = true;
-            logger.debug('[iCloud] CloudKit JS loaded successfully');
             resolve();
         };
         script.onerror = (error)=>{
@@ -717,17 +706,16 @@ const configureCloudKit = (config, signInButtonId)=>{
     if (cloudKitConfigured && currentSignInButtonId === signInButtonId) {
         return;
     }
-    const mergedConfig = _extends({}, DEFAULT_CONFIG, config);
+    if (!(config == null ? void 0 : config.containerIdentifier) || !(config == null ? void 0 : config.apiToken) || !(config == null ? void 0 : config.environment)) {
+        throw new Error('iCloud configuration is incomplete. Please configure iCloud settings in the dashboard.');
+    }
     const containerConfig = {
-        containerIdentifier: mergedConfig.containerIdentifier,
-        environment: mergedConfig.environment,
+        containerIdentifier: config.containerIdentifier,
+        environment: config.environment,
         apiTokenAuth: {
-            apiToken: mergedConfig.apiToken,
+            apiToken: config.apiToken,
             persist: true,
-            signInButton: signInButtonId ? {
-                id: signInButtonId,
-                theme: 'black'
-            } : undefined
+            signInButton: undefined
         }
     };
     CloudKit.configure({
@@ -736,16 +724,7 @@ const configureCloudKit = (config, signInButtonId)=>{
         ]
     });
     cloudKitConfigured = true;
-    currentSignInButtonId = signInButtonId || null;
-    logger.debug('[iCloud] CloudKit configured', {
-        containerIdentifier: mergedConfig.containerIdentifier,
-        environment: mergedConfig.environment
-    });
-};
-const resetCloudKitConfig = ()=>{
-    cloudKitConfigured = false;
     currentSignInButtonId = null;
-    logger.debug('[iCloud] CloudKit config reset');
 };
 /**
  * Check if user is already authenticated using fetchCurrentUserIdentity.
@@ -765,7 +744,6 @@ const resetCloudKitConfig = ()=>{
     if (authenticationAbortController) {
         authenticationAbortController.abort();
         authenticationAbortController = null;
-        logger.info('[iCloud] Authentication cancelled by user');
     }
 };
 const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatusUpdate, options)=>{
@@ -784,7 +762,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
         // First, check if user is already authenticated (more reliable than setUpAuth)
         const alreadyAuthenticated = await isUserAuthenticated(container);
         if (alreadyAuthenticated) {
-            logger.info('[iCloud] User already authenticated');
             onAuthStatusUpdate == null ? void 0 : onAuthStatusUpdate('Authenticated');
             return;
         }
@@ -793,12 +770,10 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
         await container.setUpAuth();
         // Double-check authentication after setUpAuth
         if (await isUserAuthenticated(container)) {
-            logger.info('[iCloud] User authenticated after setUpAuth');
             onAuthStatusUpdate == null ? void 0 : onAuthStatusUpdate('Authenticated');
             return;
         }
         // User needs to sign in
-        logger.info('[iCloud] User authentication required');
         onAuthStatusUpdate == null ? void 0 : onAuthStatusUpdate('Waiting for sign-in...');
         if (onSignInRequired) ;
         return new Promise((resolve, reject)=>{
@@ -829,7 +804,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
                     if (await isUserAuthenticated(container)) {
                         resolved = true;
                         cleanup();
-                        logger.info('[iCloud] Authentication successful');
                         onAuthStatusUpdate == null ? void 0 : onAuthStatusUpdate('Authenticated');
                         if (onSignInComplete) ;
                         resolve();
@@ -843,7 +817,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
                     resolved = true;
                     cleanup();
                     if (onSignInComplete) ;
-                    logger.warn('[iCloud] Authentication timed out');
                     reject(new Error('iCloud sign-in timed out. Please ensure you are signed into iCloud ' + 'in your browser settings and try again. If the problem persists, ' + 'check your internet connection or try a different backup method.'));
                 }
             }, timeoutMs);
@@ -859,7 +832,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
 };
 /**
  * Save backup data to iCloud with retry logic
- * Stores data in the same format as Google Drive for consistency
  */ const saveBackupToICloud = async (backupData, retryOptions)=>{
     const { maxAttempts = 3, retryInterval = 1000 } = {};
     return retryPromise(async ()=>{
@@ -868,16 +840,11 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
         const record = {
             recordType: BACKUP_RECORD_TYPE,
             fields: {
-                // Store as JSON string to match Google Drive format
                 backupData: {
                     value: JSON.stringify(backupData)
-                },
-                timestamp: {
-                    value: Date.now()
                 }
             }
         };
-        logger.debug('[iCloud] Saving backup record to CloudKit');
         const response = await privateDB.saveRecords([
             record
         ]);
@@ -887,9 +854,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
             throw new Error(errorMessage);
         }
         const savedRecord = response.records[0];
-        logger.info('[iCloud] Backup saved successfully', {
-            recordName: savedRecord.recordName
-        });
         return savedRecord;
     }, {
         maxAttempts,
@@ -904,12 +868,11 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
     const container = CloudKit.getDefaultContainer();
     const privateDB = container.privateCloudDatabase;
     try {
-        logger.debug('[iCloud] Querying backup records');
         const response = await privateDB.performQuery({
             recordType: BACKUP_RECORD_TYPE,
             sortBy: [
                 {
-                    fieldName: 'timestamp',
+                    fieldName: 'created',
                     ascending: false
                 }
             ]
@@ -931,9 +894,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
                 backupData: JSON.parse(fields.backupData.value)
             };
         });
-        logger.info('[iCloud] Found backups', {
-            count: records.length
-        });
         return records;
     } catch (error) {
         logger.error('[iCloud] Failed to list backups:', error);
@@ -947,9 +907,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
     const privateDB = container.privateCloudDatabase;
     try {
         var _fields_backupData;
-        logger.debug('[iCloud] Fetching backup record', {
-            recordName
-        });
         const response = await privateDB.fetchRecords([
             recordName
         ]);
@@ -959,9 +916,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
         }
         const record = response.records[0];
         if (!record) {
-            logger.warn('[iCloud] Backup record not found', {
-                recordName
-            });
             return null;
         }
         const fields = record.fields;
@@ -974,9 +928,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
             modified: record.modified.timestamp,
             backupData: JSON.parse(fields.backupData.value)
         };
-        logger.info('[iCloud] Backup retrieved successfully', {
-            recordName
-        });
         return backupRecord;
     } catch (error) {
         logger.error('[iCloud] Failed to get backup:', error);
@@ -989,9 +940,6 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
     const container = CloudKit.getDefaultContainer();
     const privateDB = container.privateCloudDatabase;
     try {
-        logger.debug('[iCloud] Deleting backup record', {
-            recordName
-        });
         const response = await privateDB.deleteRecords([
             recordName
         ]);
@@ -999,20 +947,13 @@ const ensureICloudAuth = async (onSignInRequired, onSignInComplete, onAuthStatus
             logger.error('[iCloud] Delete error:', response.errors);
             throw new Error(mapCloudKitError(response.errors[0]));
         }
-        logger.info('[iCloud] Backup deleted successfully', {
-            recordName
-        });
     } catch (error) {
         logger.error('[iCloud] Failed to delete backup:', error);
         throw error;
     }
 };
 const initializeCloudKit = async (config, signInButtonId, onSignInRequired, onSignInComplete, onAuthStatusUpdate, authOptions)=>{
-    logger.info('[iCloud] Initializing CloudKit');
     await loadCloudKit();
-    if (signInButtonId) {
-        resetCloudKitConfig();
-    }
     configureCloudKit(config, signInButtonId);
     await ensureICloudAuth(onSignInRequired, onSignInComplete, onAuthStatusUpdate);
 };
@@ -1217,42 +1158,82 @@ class WalletBusyError extends Error {
         this.accountAddress = accountAddress;
     }
 }
-const createDelegationWithGoogleDriveDistribution = ({ existingShares, delegatedShare })=>({
+/**
+ * Creates distribution where shares go to specified cloud providers
+ * Last share goes to cloud providers, rest to Dynamic backend
+ * @param providers - Array of cloud providers to backup to
+ * @param allShares - All key shares to distribute
+ */ const createCloudProviderDistribution = ({ providers, allShares })=>{
+    const cloudProviderShares = {};
+    // Last share goes to cloud providers, rest to Dynamic
+    const sharesForCloud = allShares.slice(-1);
+    providers.forEach((provider)=>{
+        cloudProviderShares[provider] = sharesForCloud;
+    });
+    return {
+        clientShares: allShares.slice(0, -1),
+        cloudProviderShares
+    };
+};
+/**
+ * Creates distribution with delegation + cloud backup
+ * Client shares backed up to Dynamic AND cloud providers
+ * Delegated share goes to webhook
+ */ const createDelegationWithCloudProviderDistribution = ({ providers, existingShares, delegatedShare })=>{
+    const cloudProviderShares = {};
+    providers.forEach((provider)=>{
+        cloudProviderShares[provider] = existingShares;
+    });
+    return {
         clientShares: existingShares,
-        googleDriveShares: existingShares,
+        cloudProviderShares,
         delegatedShare
+    };
+};
+/**
+ * Creates distribution for adding cloud backup to existing delegation
+ * Client shares go to both Dynamic AND cloud providers
+ * delegatedShare is undefined - we don't re-publish, but preserve the location
+ */ const createAddCloudProviderToExistingDelegationDistribution = ({ providers, clientShares })=>{
+    const cloudProviderShares = {};
+    providers.forEach((provider)=>{
+        cloudProviderShares[provider] = clientShares;
     });
+    return {
+        clientShares,
+        cloudProviderShares
+    };
+};
+/**
+ * Checks if wallet has backup on any of the specified providers
+ */ const hasCloudProviderBackup = (backupInfo, providers)=>{
+    if (!(backupInfo == null ? void 0 : backupInfo.backups)) return false;
+    return providers.some((provider)=>{
+        var _backupInfo_backups_provider;
+        var _backupInfo_backups_provider_length;
+        return ((_backupInfo_backups_provider_length = (_backupInfo_backups_provider = backupInfo.backups[provider]) == null ? void 0 : _backupInfo_backups_provider.length) != null ? _backupInfo_backups_provider_length : 0) > 0;
+    });
+};
+/**
+ * Gets all cloud providers that have backups for this wallet
+ */ const getActiveCloudProviders = (backupInfo)=>{
+    if (!(backupInfo == null ? void 0 : backupInfo.backups)) return [];
+    return Object.entries(backupInfo.backups).filter(([location, backups])=>location !== core.BackupLocation.DYNAMIC && location !== core.BackupLocation.DELEGATED && backups.length > 0).map(([location])=>location);
+};
 const createDelegationOnlyDistribution = ({ existingShares, delegatedShare })=>({
         clientShares: existingShares,
-        googleDriveShares: [],
+        cloudProviderShares: {},
         delegatedShare
     });
-const createGoogleDriveOnlyDistribution = ({ allShares })=>({
-        clientShares: allShares.slice(0, -1),
-        googleDriveShares: allShares.slice(-1)
-    });
 const createDynamicOnlyDistribution = ({ allShares })=>({
         clientShares: allShares,
-        googleDriveShares: []
+        cloudProviderShares: {}
     });
-const hasGoogleDriveBackup = (backupInfo)=>{
-    var _backupInfo_backups_BackupLocation_GOOGLE_DRIVE, _backupInfo_backups;
-    var _backupInfo_backups_BackupLocation_GOOGLE_DRIVE_length;
-    return ((_backupInfo_backups_BackupLocation_GOOGLE_DRIVE_length = backupInfo == null ? void 0 : (_backupInfo_backups = backupInfo.backups) == null ? void 0 : (_backupInfo_backups_BackupLocation_GOOGLE_DRIVE = _backupInfo_backups[core.BackupLocation.GOOGLE_DRIVE]) == null ? void 0 : _backupInfo_backups_BackupLocation_GOOGLE_DRIVE.length) != null ? _backupInfo_backups_BackupLocation_GOOGLE_DRIVE_length : 0) > 0;
-};
 const hasDelegatedBackup = (backupInfo)=>{
     var _backupInfo_backups_BackupLocation_DELEGATED, _backupInfo_backups;
     var _backupInfo_backups_BackupLocation_DELEGATED_length;
     return ((_backupInfo_backups_BackupLocation_DELEGATED_length = backupInfo == null ? void 0 : (_backupInfo_backups = backupInfo.backups) == null ? void 0 : (_backupInfo_backups_BackupLocation_DELEGATED = _backupInfo_backups[core.BackupLocation.DELEGATED]) == null ? void 0 : _backupInfo_backups_BackupLocation_DELEGATED.length) != null ? _backupInfo_backups_BackupLocation_DELEGATED_length : 0) > 0;
 };
-/**
- * Distribution for adding Google Drive backup to an existing delegation.
- * Client's shares go to both Dynamic and Google Drive.
- * delegatedShare is undefined - we don't re-publish, but preserve the location.
- */ const createAddGoogleDriveToExistingDelegationDistribution = ({ clientShares })=>({
-        clientShares: clientShares,
-        googleDriveShares: clientShares
-    });
 
 // eslint-disable-next-line @nx/enforce-module-boundaries
 class DynamicWalletClient {
@@ -2021,7 +2002,7 @@ class DynamicWalletClient {
             existingClientKeyShares
         };
     }
-    async reshare({ chainName, accountAddress, oldThresholdSignatureScheme, newThresholdSignatureScheme, password = undefined, signedSessionId, backupToGoogleDrive = false, delegateToProjectEnvironment = false, mfaToken, revokeDelegation = false }) {
+    async reshare({ chainName, accountAddress, oldThresholdSignatureScheme, newThresholdSignatureScheme, password = undefined, signedSessionId, cloudProviders = [], delegateToProjectEnvironment = false, mfaToken, revokeDelegation = false }) {
         return this.withWalletBusyLock({
             accountAddress,
             operation: core.WalletOperation.RESHARE,
@@ -2032,14 +2013,14 @@ class DynamicWalletClient {
                     newThresholdSignatureScheme,
                     password,
                     signedSessionId,
-                    backupToGoogleDrive,
+                    cloudProviders,
                     delegateToProjectEnvironment,
                     mfaToken,
                     revokeDelegation
                 })
         });
     }
-    async internalReshare({ chainName, accountAddress, oldThresholdSignatureScheme, newThresholdSignatureScheme, password = undefined, signedSessionId, backupToGoogleDrive = false, delegateToProjectEnvironment = false, mfaToken, revokeDelegation = false }) {
+    async internalReshare({ chainName, accountAddress, oldThresholdSignatureScheme, newThresholdSignatureScheme, password = undefined, signedSessionId, cloudProviders = [], delegateToProjectEnvironment = false, mfaToken, revokeDelegation = false }) {
         const dynamicRequestId = uuid.v4();
         try {
             await this.verifyPassword({
@@ -2106,28 +2087,31 @@ class DynamicWalletClient {
                 ...newReshareResults
             ];
             let distribution;
-            if (delegateToProjectEnvironment && backupToGoogleDrive) {
-                // Delegation + Google Drive: Client's existing share backs up to both Dynamic and Google Drive.
+            // Generic distribution logic - works with any cloud providers
+            if (delegateToProjectEnvironment && cloudProviders.length > 0) {
+                // Delegation + Cloud Providers: Client's existing share backs up to both Dynamic and cloud providers.
                 // The new share goes to the webhook for delegation.
-                distribution = createDelegationWithGoogleDriveDistribution({
+                distribution = createDelegationWithCloudProviderDistribution({
+                    providers: cloudProviders,
                     existingShares: existingReshareResults,
                     delegatedShare: newReshareResults[0]
                 });
             } else if (delegateToProjectEnvironment) {
                 // Delegation only: Client's existing share backs up to Dynamic.
-                // The new share goes to the webhook for delegation. No Google Drive backup.
+                // The new share goes to the webhook for delegation. No cloud provider backup.
                 distribution = createDelegationOnlyDistribution({
                     existingShares: existingReshareResults,
                     delegatedShare: newReshareResults[0]
                 });
-            } else if (backupToGoogleDrive) {
-                // Google Drive only: Split shares between Dynamic (N-1) and Google Drive (1).
-                // The last share (new share) goes to Google Drive.
-                distribution = createGoogleDriveOnlyDistribution({
+            } else if (cloudProviders.length > 0) {
+                // Cloud Providers only: Split shares between Dynamic (N-1) and cloud providers (1).
+                // The last share (new share) goes to cloud providers.
+                distribution = createCloudProviderDistribution({
+                    providers: cloudProviders,
                     allShares: allClientShares
                 });
             } else {
-                // No delegation, no Google Drive: All shares go to Dynamic backend only.
+                // No delegation, no cloud providers: All shares go to Dynamic backend only.
                 distribution = createDynamicOnlyDistribution({
                     allShares: allClientShares
                 });
@@ -2155,7 +2139,7 @@ class DynamicWalletClient {
                     chainName,
                     oldThresholdSignatureScheme,
                     newThresholdSignatureScheme,
-                    backupToGoogleDrive,
+                    cloudProviders,
                     dynamicRequestId
                 }
             });
@@ -2188,6 +2172,8 @@ class DynamicWalletClient {
                 throw new Error('Delegation is not allowed for SUI');
             }
             const currentThresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
+            // Get active cloud providers to maintain existing backups
+            const activeProviders = getActiveCloudProviders((_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.clientKeySharesBackupInfo);
             await this.reshare({
                 chainName: this.walletMap[accountAddress].chainName,
                 accountAddress,
@@ -2195,7 +2181,7 @@ class DynamicWalletClient {
                 newThresholdSignatureScheme,
                 password,
                 signedSessionId,
-                backupToGoogleDrive: hasGoogleDriveBackup((_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.clientKeySharesBackupInfo),
+                cloudProviders: activeProviders,
                 delegateToProjectEnvironment: true,
                 mfaToken,
                 revokeDelegation
@@ -2494,17 +2480,21 @@ class DynamicWalletClient {
                     externalKeyShareId: data.keyShareIds[0]
                 });
             }
-            if (distribution.googleDriveShares.length > 0) {
-                const encryptedGoogleDriveShares = await Promise.all(distribution.googleDriveShares.map((keyShare)=>this.encryptKeyShare({
+            // Handle all cloud provider backups generically
+            for (const [provider, shares] of Object.entries(distribution.cloudProviderShares)){
+                if (!shares || shares.length === 0) continue;
+                const backupLocation = provider;
+                const encryptedCloudShares = await Promise.all(shares.map((keyShare)=>this.encryptKeyShare({
                         keyShare,
                         password
                     })));
-                await this.uploadKeySharesToGoogleDrive({
+                await this.uploadToCloudProvider({
+                    provider: backupLocation,
                     accountAddress,
-                    encryptedKeyShares: encryptedGoogleDriveShares
+                    encryptedKeyShares: encryptedCloudShares
                 });
                 locations.push({
-                    location: core.BackupLocation.GOOGLE_DRIVE
+                    location: backupLocation
                 });
             }
             if (distribution.delegatedShare) {
@@ -2601,44 +2591,52 @@ class DynamicWalletClient {
    * @param params.signedSessionId - Optional signed session ID for authentication
    * @param params.backupToGoogleDrive - Whether to backup to Google Drive (defaults to false)
    * @returns Promise with backup metadata including share locations and IDs
-   */ async storeEncryptedBackupByWallet({ accountAddress, clientKeyShares = undefined, password = undefined, signedSessionId, backupToGoogleDrive = false, delegatedKeyshare = undefined }) {
+   */ async storeEncryptedBackupByWallet({ accountAddress, clientKeyShares = undefined, password = undefined, signedSessionId, cloudProviders = [], delegatedKeyshare = undefined }) {
         var _this_walletMap_accountAddress, _this_walletMap_accountAddress1;
         const keySharesToBackup = clientKeyShares != null ? clientKeyShares : await this.getClientKeySharesFromLocalStorage({
             accountAddress
         });
-        const shouldBackupToGoogleDrive = backupToGoogleDrive || hasGoogleDriveBackup((_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.clientKeySharesBackupInfo);
+        // Check if we should backup to cloud providers (either requested or already exists)
+        const activeCloudProviders = getActiveCloudProviders((_this_walletMap_accountAddress = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress.clientKeySharesBackupInfo);
+        const shouldBackupToCloudProviders = cloudProviders.length > 0 || activeCloudProviders.length > 0;
+        // Use requested providers, or fall back to existing active providers
+        const providersToBackup = cloudProviders.length > 0 ? cloudProviders : activeCloudProviders;
         const hasExistingDelegation = hasDelegatedBackup((_this_walletMap_accountAddress1 = this.walletMap[accountAddress]) == null ? void 0 : _this_walletMap_accountAddress1.clientKeySharesBackupInfo);
         let distribution;
         let preserveDelegatedLocation = false;
-        if (delegatedKeyshare && shouldBackupToGoogleDrive) {
-            // NEW delegation + Google Drive: Client's shares back up to both Dynamic and Google Drive.
+        // Generic distribution logic - works with any cloud providers
+        if (delegatedKeyshare && shouldBackupToCloudProviders) {
+            // NEW delegation + Cloud Providers: Client's shares back up to both Dynamic and cloud providers.
             // The delegated share goes to the webhook.
-            distribution = createDelegationWithGoogleDriveDistribution({
+            distribution = createDelegationWithCloudProviderDistribution({
+                providers: providersToBackup,
                 existingShares: keySharesToBackup,
                 delegatedShare: delegatedKeyshare
             });
         } else if (delegatedKeyshare) {
             // NEW delegation only: Client's shares back up to Dynamic.
-            // The delegated share goes to the webhook. No Google Drive backup.
+            // The delegated share goes to the webhook. No cloud provider backup.
             distribution = createDelegationOnlyDistribution({
                 existingShares: keySharesToBackup,
                 delegatedShare: delegatedKeyshare
             });
-        } else if (hasExistingDelegation && shouldBackupToGoogleDrive) {
-            // ADD Google Drive to EXISTING delegation: Client's share backs up to both Dynamic and GD.
+        } else if (hasExistingDelegation && shouldBackupToCloudProviders) {
+            // ADD Cloud Providers to EXISTING delegation: Client's share backs up to both Dynamic and cloud providers.
             // Don't re-publish delegated share, just preserve the location.
-            distribution = createAddGoogleDriveToExistingDelegationDistribution({
+            distribution = createAddCloudProviderToExistingDelegationDistribution({
+                providers: providersToBackup,
                 clientShares: keySharesToBackup
             });
             preserveDelegatedLocation = true;
-        } else if (shouldBackupToGoogleDrive && keySharesToBackup.length >= 2) {
-            // Google Drive only (no delegation): Split shares between Dynamic (N-1) and Google Drive (1).
-            // The last share (new share) goes to Google Drive.
-            distribution = createGoogleDriveOnlyDistribution({
+        } else if (shouldBackupToCloudProviders && keySharesToBackup.length >= 2) {
+            // Cloud Providers only (no delegation): Split shares between Dynamic (N-1) and cloud providers (1).
+            // The last share (new share) goes to cloud providers.
+            distribution = createCloudProviderDistribution({
+                providers: providersToBackup,
                 allShares: keySharesToBackup
             });
         } else {
-            // No delegation, no Google Drive: All shares go to Dynamic backend only.
+            // No delegation, no cloud providers: All shares go to Dynamic backend only.
             distribution = createDynamicOnlyDistribution({
                 allShares: keySharesToBackup
             });
@@ -2807,16 +2805,10 @@ class DynamicWalletClient {
         this.walletMap = JSON.parse(wallets);
     }
     /**
-   * This method handles the complete flow for ensuring wallet key shares are backed up to Google Drive:
-   * - For 2-of-2 wallets: Automatically reshares to 2-of-3 threshold, then distributes shares (1 to backend, 1 to Google Drive)
-   * - For 2-of-3 wallets: Call storeEncryptedBackupByWallet to backup for backend and Google Drive
-   *
-   * @param params - The backup parameters
-   * @param params.accountAddress - The wallet account address to backup
-   * @param params.password - Optional password for encryption (uses environment ID if not provided)
-   * @param params.signedSessionId - Optional signed session ID for authentication
-   * @returns Promise<string[]> - Array of Google Drive key share IDs that were backed up
-   */ async backupKeySharesToGoogleDrive({ accountAddress, password, signedSessionId }) {
+   * Internal helper method that handles the complete flow for ensuring wallet key shares are backed up to a cloud provider.
+   * - For 2-of-2 wallets: Automatically reshares to 2-of-3 threshold, then distributes shares (1 to backend, 1 to cloud)
+   * - For 2-of-3 wallets: Call storeEncryptedBackupByWallet to backup for backend and cloud
+   */ async backupKeySharesToCloudProvider({ accountAddress, password, signedSessionId, backupLocation }) {
         try {
             await this.getWallet({
                 accountAddress,
@@ -2834,93 +2826,86 @@ class DynamicWalletClient {
                     newThresholdSignatureScheme: core.ThresholdSignatureScheme.TWO_OF_THREE,
                     password,
                     signedSessionId,
-                    backupToGoogleDrive: true
-                });
-                const backupInfo = this.walletMap[accountAddress].clientKeySharesBackupInfo;
-                const googleDriveShares = backupInfo.backups[core.BackupLocation.GOOGLE_DRIVE] || [];
-                return googleDriveShares.map((ks)=>{
-                    var _ks_externalKeyShareId;
-                    return (_ks_externalKeyShareId = ks.externalKeyShareId) != null ? _ks_externalKeyShareId : '';
+                    cloudProviders: [
+                        backupLocation
+                    ]
                 });
             } else {
                 await this.storeEncryptedBackupByWallet({
                     accountAddress,
                     password,
                     signedSessionId,
-                    backupToGoogleDrive: true
-                });
-                const backupInfo = this.walletMap[accountAddress].clientKeySharesBackupInfo;
-                const googleDriveShares = backupInfo.backups[core.BackupLocation.GOOGLE_DRIVE] || [];
-                return googleDriveShares.map((ks)=>{
-                    var _ks_externalKeyShareId;
-                    return (_ks_externalKeyShareId = ks.externalKeyShareId) != null ? _ks_externalKeyShareId : '';
+                    cloudProviders: [
+                        backupLocation
+                    ]
                 });
             }
         } catch (error) {
             logError({
-                message: 'Error in backupKeySharesToGoogleDrive',
+                message: `Error in backupKeySharesToCloudProvider (${backupLocation})`,
                 error: error,
                 context: {
-                    accountAddress
+                    accountAddress,
+                    backupLocation
                 }
             });
             throw error;
         }
     }
-    async backupKeySharesToICloud({ accountAddress, password, signedSessionId, signInButtonId, onProgress, onAuthStatusUpdate }) {
-        try {
-            var _environmentSettings_sdk_waas, _environmentSettings_sdk;
-            await this.getWallet({
-                accountAddress,
-                walletOperation: core.WalletOperation.REACH_THRESHOLD,
-                password,
-                signedSessionId
-            });
-            const environmentSettings = await this.apiClient.getEnvironmentSettings();
-            const iCloudConfig = environmentSettings == null ? void 0 : (_environmentSettings_sdk = environmentSettings.sdk) == null ? void 0 : (_environmentSettings_sdk_waas = _environmentSettings_sdk.waas) == null ? void 0 : _environmentSettings_sdk_waas.icloud;
-            await initializeCloudKit(iCloudConfig, signInButtonId, undefined, undefined, onAuthStatusUpdate);
-            const clientKeyShares = await this.getClientKeySharesFromLocalStorage({
-                accountAddress
-            });
-            if (clientKeyShares.length === 0) {
-                throw new Error('No key shares found to backup');
-            }
-            const wallet = this.walletMap[accountAddress];
-            const thresholdSignatureScheme = (wallet == null ? void 0 : wallet.thresholdSignatureScheme) || core.ThresholdSignatureScheme.TWO_OF_TWO;
-            const savedRecords = [];
-            const encryptedKeyShares = [];
-            for(let i = 0; i < clientKeyShares.length; i++){
-                const keyShare = clientKeyShares[i];
-                const encryptedKeyShare = await this.encryptKeyShare({
-                    keyShare,
-                    password
+    /**
+   * This method handles the complete flow for ensuring wallet key shares are backed up to Google Drive:
+   * - For 2-of-2 wallets: Automatically reshares to 2-of-3 threshold, then distributes shares (1 to backend, 1 to Google Drive)
+   * - For 2-of-3 wallets: Call storeEncryptedBackupByWallet to backup for backend and Google Drive
+   *
+   * @param params - The backup parameters
+   * @param params.accountAddress - The wallet account address to backup
+   * @param params.password - Optional password for encryption (uses environment ID if not provided)
+   * @param params.signedSessionId - Optional signed session ID for authentication
+   */ async backupKeySharesToGoogleDrive({ accountAddress, password, signedSessionId }) {
+        return this.backupKeySharesToCloudProvider({
+            accountAddress,
+            password,
+            signedSessionId,
+            backupLocation: core.BackupLocation.GOOGLE_DRIVE
+        });
+    }
+    /**
+   * This method handles the complete flow for ensuring wallet key shares are backed up to iCloud:
+   * - For 2-of-2 wallets: Automatically reshares to 2-of-3 threshold, then distributes shares (1 to backend, 1 to iCloud)
+   * - For 2-of-3 wallets: Call storeEncryptedBackupByWallet to backup for backend and iCloud
+   *
+   * @param params - The backup parameters
+   * @param params.accountAddress - The wallet account address to backup
+   * @param params.password - Optional password for encryption (uses environment ID if not provided)
+   * @param params.signedSessionId - Optional signed session ID for authentication
+   */ async backupKeySharesToICloud({ accountAddress, password, signedSessionId }) {
+        return this.backupKeySharesToCloudProvider({
+            accountAddress,
+            password,
+            signedSessionId,
+            backupLocation: core.BackupLocation.ICLOUD
+        });
+    }
+    /**
+   * Generic router method that uploads encrypted key shares to the specified cloud provider
+   * @param provider - The cloud backup provider (GOOGLE_DRIVE, ICLOUD, etc.)
+   * @param accountAddress - Wallet account address
+   * @param encryptedKeyShares - Already encrypted key shares to upload
+   * @returns Promise<void>
+   */ async uploadToCloudProvider({ provider, accountAddress, encryptedKeyShares }) {
+        switch(provider){
+            case core.BackupLocation.GOOGLE_DRIVE:
+                return this.uploadKeySharesToGoogleDrive({
+                    accountAddress,
+                    encryptedKeyShares
                 });
-                encryptedKeyShares.push(encryptedKeyShare);
-            }
-            const backupData = createBackupData({
-                encryptedKeyShares,
-                accountAddress,
-                thresholdSignatureScheme,
-                hasPassword: !!password
-            });
-            if (onProgress) {
-                onProgress(0, 1);
-            }
-            const savedRecord = await saveBackupToICloud(backupData);
-            savedRecords.push(savedRecord);
-            if (onProgress) {
-                onProgress(1, 1);
-            }
-            return savedRecords;
-        } catch (error) {
-            logError({
-                message: 'Error in backupKeySharesToICloud',
-                error: error,
-                context: {
-                    accountAddress
-                }
-            });
-            throw error;
+            case core.BackupLocation.ICLOUD:
+                return this.uploadKeySharesToICloud({
+                    accountAddress,
+                    encryptedKeyShares
+                });
+            default:
+                throw new Error(`Unsupported cloud provider: ${provider}`);
         }
     }
     /**
@@ -2972,6 +2957,40 @@ class DynamicWalletClient {
             throw error;
         }
     }
+    /**
+   * Private method that handles only the iCloud upload mechanics without any reshare logic.
+   * It takes already encrypted key shares and uploads them to iCloud.
+   * @param accountAddress - The wallet account address
+   * @param encryptedKeyShares - Already encrypted key shares to upload
+   * @returns Promise<void>
+   */ async uploadKeySharesToICloud({ accountAddress, encryptedKeyShares }) {
+        try {
+            var _environmentSettings_sdk_waas, _environmentSettings_sdk;
+            if (encryptedKeyShares.length === 0) {
+                throw new Error('No key shares found');
+            }
+            const environmentSettings = await this.apiClient.getEnvironmentSettings();
+            const iCloudConfig = environmentSettings == null ? void 0 : (_environmentSettings_sdk = environmentSettings.sdk) == null ? void 0 : (_environmentSettings_sdk_waas = _environmentSettings_sdk.waas) == null ? void 0 : _environmentSettings_sdk_waas.iCloud;
+            await initializeCloudKit(iCloudConfig);
+            const thresholdSignatureScheme = this.walletMap[accountAddress].thresholdSignatureScheme;
+            const backupData = createBackupData({
+                encryptedKeyShares,
+                accountAddress,
+                thresholdSignatureScheme
+            });
+            await saveBackupToICloud(backupData);
+            return;
+        } catch (error) {
+            logError({
+                message: 'Error in uploadKeySharesToICloud',
+                error: error,
+                context: {
+                    accountAddress
+                }
+            });
+            throw error;
+        }
+    }
     async exportClientKeysharesFromGoogleDrive({ accountAddress, password, signedSessionId }) {
         try {
             await this.getWallet({
@@ -3624,25 +3643,26 @@ exports.ERROR_VERIFY_MESSAGE_SIGNATURE = ERROR_VERIFY_MESSAGE_SIGNATURE;
 exports.ERROR_VERIFY_TRANSACTION_SIGNATURE = ERROR_VERIFY_TRANSACTION_SIGNATURE;
 exports.WalletBusyError = WalletBusyError;
 exports.cancelICloudAuth = cancelICloudAuth;
-exports.createAddGoogleDriveToExistingDelegationDistribution = createAddGoogleDriveToExistingDelegationDistribution;
+exports.createAddCloudProviderToExistingDelegationDistribution = createAddCloudProviderToExistingDelegationDistribution;
 exports.createBackupData = createBackupData;
+exports.createCloudProviderDistribution = createCloudProviderDistribution;
 exports.createDelegationOnlyDistribution = createDelegationOnlyDistribution;
-exports.createDelegationWithGoogleDriveDistribution = createDelegationWithGoogleDriveDistribution;
+exports.createDelegationWithCloudProviderDistribution = createDelegationWithCloudProviderDistribution;
 exports.createDynamicOnlyDistribution = createDynamicOnlyDistribution;
-exports.createGoogleDriveOnlyDistribution = createGoogleDriveOnlyDistribution;
 exports.deleteICloudBackup = deleteICloudBackup;
 exports.downloadStringAsFile = downloadStringAsFile;
 exports.extractPubkey = extractPubkey;
 exports.formatEvmMessage = formatEvmMessage;
 exports.formatMessage = formatMessage;
+exports.getActiveCloudProviders = getActiveCloudProviders;
 exports.getClientKeyShareBackupInfo = getClientKeyShareBackupInfo;
 exports.getClientKeyShareExportFileName = getClientKeyShareExportFileName;
 exports.getGoogleOAuthAccountId = getGoogleOAuthAccountId;
 exports.getICloudBackup = getICloudBackup;
 exports.getMPCSignatureScheme = getMPCSignatureScheme;
 exports.getMPCSigner = getMPCSigner;
+exports.hasCloudProviderBackup = hasCloudProviderBackup;
 exports.hasDelegatedBackup = hasDelegatedBackup;
-exports.hasGoogleDriveBackup = hasGoogleDriveBackup;
 exports.isBrowser = isBrowser;
 exports.isHexString = isHexString;
 exports.listICloudBackups = listICloudBackups;