@capgo/capacitor-social-login 8.3.18 → 8.3.20

package/dist/plugin.js

@@ -336,6 +336,36 @@ var capacitorCapacitorUpdater = (function (exports, core) {
     }
     BaseSocialLogin.OAUTH_STATE_KEY = 'social_login_oauth_pending';
 
+    const USER_CANCELLED_CODE = 'USER_CANCELLED';
+    const CANCELLED_PATTERNS = [
+        'access_denied',
+        'access denied',
+        'user_cancelled_authorize',
+        'user_cancelled',
+        'user cancelled',
+        'user canceled',
+        'login cancelled',
+        'login canceled',
+        'popup closed',
+        'window was closed',
+    ];
+    function createUserCancelledError(message) {
+        const error = new Error(message);
+        error.code = USER_CANCELLED_CODE;
+        return error;
+    }
+    /**
+     * Detects cancellation-like messages and marks them with USER_CANCELLED.
+     * Falls back to a regular Error when the message doesn't look like a user cancellation.
+     */
+    function inferUserCancelledError(message) {
+        const normalized = message.toLowerCase();
+        if (CANCELLED_PATTERNS.some((pattern) => normalized.includes(pattern))) {
+            return createUserCancelledError(message);
+        }
+        return new Error(message);
+    }
+
     class AppleSocialLogin extends BaseSocialLogin {
         constructor() {
             super(...arguments);
@@ -396,7 +426,9 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                     resolve({ provider: 'apple', result });
                 })
                     .catch((error) => {
-                    reject(error);
+                    var _a, _b, _c;
+                    const message = (_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error === null || error === void 0 ? void 0 : error.localizedDescription) !== null && _b !== void 0 ? _b : error === null || error === void 0 ? void 0 : error.error) !== null && _c !== void 0 ? _c : 'Apple login failed';
+                    reject(inferUserCancelledError(message));
                 });
             });
         }
@@ -455,37 +487,69 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                 throw new Error('Facebook App ID not set. Call initialize() first.');
             }
             return new Promise((resolve, reject) => {
+                var _a;
+                let settled = false;
+                let waitingForStatus = false;
+                const resolveWithProfile = (authResponse) => {
+                    if (settled)
+                        return;
+                    if (!(authResponse === null || authResponse === void 0 ? void 0 : authResponse.accessToken) || !authResponse.userID) {
+                        settled = true;
+                        reject(new Error('Facebook login failed'));
+                        return;
+                    }
+                    const accessToken = authResponse.accessToken;
+                    const userId = authResponse.userID;
+                    FB.api('/me', { fields: 'id,name,email,picture' }, (userInfo) => {
+                        var _a, _b;
+                        settled = true;
+                        const result = {
+                            accessToken: {
+                                token: accessToken,
+                                userId,
+                            },
+                            profile: {
+                                userID: userInfo.id,
+                                name: userInfo.name,
+                                email: userInfo.email || null,
+                                imageURL: ((_b = (_a = userInfo.picture) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.url) || null,
+                                friendIDs: [],
+                                birthday: null,
+                                ageRange: null,
+                                gender: null,
+                                location: null,
+                                hometown: null,
+                                profileURL: null,
+                            },
+                            idToken: null,
+                        };
+                        resolve({ provider: 'facebook', result });
+                    });
+                };
+                const waitForConnected = () => {
+                    if (settled || waitingForStatus)
+                        return;
+                    waitingForStatus = true;
+                    this.waitForConnection()
+                        .then((statusResponse) => resolveWithProfile(statusResponse.authResponse))
+                        .catch((error) => {
+                        if (settled)
+                            return;
+                        settled = true;
+                        reject(error);
+                    });
+                };
                 FB.login((response) => {
                     if (response.status === 'connected') {
-                        FB.api('/me', { fields: 'id,name,email,picture' }, (userInfo) => {
-                            var _a, _b;
-                            const result = {
-                                accessToken: {
-                                    token: response.authResponse.accessToken,
-                                    userId: response.authResponse.userID,
-                                },
-                                profile: {
-                                    userID: userInfo.id,
-                                    name: userInfo.name,
-                                    email: userInfo.email || null,
-                                    imageURL: ((_b = (_a = userInfo.picture) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.url) || null,
-                                    friendIDs: [],
-                                    birthday: null,
-                                    ageRange: null,
-                                    gender: null,
-                                    location: null,
-                                    hometown: null,
-                                    profileURL: null,
-                                },
-                                idToken: null,
-                            };
-                            resolve({ provider: 'facebook', result });
-                        });
+                        resolveWithProfile(response.authResponse);
+                    }
+                    else if (response.status === 'not_authorized' || response.status === 'unknown') {
+                        reject(createUserCancelledError('Facebook login was cancelled.'));
                     }
                     else {
-                        reject(new Error('Facebook login failed'));
+                        waitForConnected();
                     }
-                }, { scope: options.permissions.join(',') });
+                }, ((_a = options.permissions) === null || _a === void 0 ? void 0 : _a.length) ? { scope: options.permissions.join(',') } : undefined);
             });
         }
         async logout() {
@@ -516,6 +580,38 @@ var capacitorCapacitorUpdater = (function (exports, core) {
         async refresh(options) {
             await this.login(options);
         }
+        waitForConnection(timeoutMs = 120000, pollIntervalMs = 500) {
+            const start = Date.now();
+            return new Promise((resolve, reject) => {
+                let finished = false;
+                const pollStatus = () => {
+                    if (finished)
+                        return;
+                    FB.getLoginStatus((response) => {
+                        var _a;
+                        if (finished)
+                            return;
+                        if (response.status === 'connected' && ((_a = response.authResponse) === null || _a === void 0 ? void 0 : _a.accessToken)) {
+                            finished = true;
+                            resolve(response);
+                            return;
+                        }
+                        if (response.status === 'not_authorized' || response.status === 'unknown') {
+                            finished = true;
+                            reject(createUserCancelledError('Facebook login was cancelled.'));
+                            return;
+                        }
+                        if (Date.now() - start >= timeoutMs) {
+                            finished = true;
+                            reject(new Error('Facebook login failed or timed out'));
+                            return;
+                        }
+                        setTimeout(pollStatus, pollIntervalMs);
+                    });
+                };
+                pollStatus();
+            });
+        }
         async loadFacebookScript(locale) {
             if (this.scriptLoaded)
                 return;
@@ -925,7 +1021,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                     else if (((_d = event.data) === null || _d === void 0 ? void 0 : _d.type) === 'oauth-error') {
                         cleanup(true);
                         const errorMessage = event.data.error || 'User cancelled the OAuth flow';
-                        reject(new Error(errorMessage));
+                        reject(inferUserCancelledError(errorMessage));
                     }
                     // Don't reject for non-OAuth messages, just ignore them
                 };
@@ -943,7 +1039,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                         else if ((data === null || data === void 0 ? void 0 : data.type) === 'oauth-error') {
                             cleanup(true);
                             const errorMessage = data.error || 'User cancelled the OAuth flow';
-                            reject(new Error(errorMessage));
+                            reject(inferUserCancelledError(errorMessage));
                         }
                     };
                 }
@@ -958,7 +1054,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                         // Check if popup is closed - this may throw cross-origin errors for some providers
                         if (popup.closed) {
                             cleanup();
-                            reject(new Error('Popup closed'));
+                            reject(createUserCancelledError('Popup closed'));
                         }
                     }
                     catch (_a) {
@@ -978,10 +1074,13 @@ var capacitorCapacitorUpdater = (function (exports, core) {
      */
     class OAuth2SocialLogin extends BaseSocialLogin {
         constructor() {
-            super(...arguments);
+            super();
             this.providers = new Map();
             this.TOKENS_KEY_PREFIX = 'capgo_social_login_oauth2_tokens_';
             this.STATE_PREFIX = 'capgo_social_login_oauth2_state_';
+            this.CONFIG_KEY_PREFIX = 'capgo_social_login_oauth2_config_';
+            // Restore configurations from localStorage for popup window context
+            this.restoreConfigurationsFromStorage();
         }
         normalizeScopeValue(scope) {
             if (!scope)
@@ -1064,6 +1163,8 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                     logoutUrl: config.logoutUrl,
                 });
             }
+            // Persist updated configuration after discovery
+            this.persistConfiguration(providerId, config);
         }
         /**
          * Initialize multiple OAuth2 providers
@@ -1084,6 +1185,8 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                 }
                 // Pre-resolve discovery on web if issuerUrl is provided.
                 await this.ensureDiscovered(providerId);
+                // Persist configuration to localStorage so it's available in popup window context
+                this.persistConfiguration(providerId, internalConfig);
             }
         }
         getProvider(providerId) {
@@ -1096,6 +1199,37 @@ var capacitorCapacitorUpdater = (function (exports, core) {
         getTokensKey(providerId) {
             return `${this.TOKENS_KEY_PREFIX}${providerId}`;
         }
+        getConfigKey(providerId) {
+            return `${this.CONFIG_KEY_PREFIX}${providerId}`;
+        }
+        persistConfiguration(providerId, config) {
+            try {
+                localStorage.setItem(this.getConfigKey(providerId), JSON.stringify(config));
+            }
+            catch (err) {
+                console.warn(`Failed to persist OAuth2 configuration for provider '${providerId}'`, err);
+            }
+        }
+        restoreConfigurationsFromStorage() {
+            // Restore all provider configurations from localStorage
+            // This is needed for popup window context where the parent's in-memory state is not available
+            const keys = Object.keys(localStorage);
+            for (const key of keys) {
+                if (key.startsWith(this.CONFIG_KEY_PREFIX)) {
+                    const providerId = key.substring(this.CONFIG_KEY_PREFIX.length);
+                    try {
+                        const raw = localStorage.getItem(key);
+                        if (raw) {
+                            const config = JSON.parse(raw);
+                            this.providers.set(providerId, config);
+                        }
+                    }
+                    catch (err) {
+                        console.warn(`Failed to restore OAuth2 configuration for provider '${providerId}'`, err);
+                    }
+                }
+            }
+        }
         async login(options) {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const { providerId } = options;
@@ -1212,7 +1346,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                             return false;
                         }
                         cleanup(messageHandler, timeoutHandle, popupClosedInterval);
-                        reject(new Error(data.error || 'OAuth2 login was cancelled.'));
+                        reject(inferUserCancelledError(data.error || 'OAuth2 login was cancelled.'));
                         return true;
                     }
                     return false;
@@ -1245,7 +1379,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                         // Check if popup is closed - this may throw cross-origin errors for some providers
                         if (popup.closed) {
                             cleanup(messageHandler, timeoutHandle, popupClosedInterval);
-                            reject(new Error('OAuth2 login window was closed.'));
+                            reject(createUserCancelledError('OAuth2 login window was closed.'));
                         }
                     }
                     catch (_a) {
@@ -1671,6 +1805,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
             const codeVerifier = (_e = options.codeVerifier) !== null && _e !== void 0 ? _e : this.generateCodeVerifier();
             const codeChallenge = await this.generateCodeChallenge(codeVerifier);
             this.persistPendingLogin(state, {
+                clientId: this.clientId,
                 codeVerifier,
                 redirectUri,
                 scopes,
@@ -1738,7 +1873,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                             return false;
                         }
                         cleanup(messageHandler, timeoutHandle, popupClosedInterval);
-                        reject(new Error(data.error || 'Twitter login was cancelled.'));
+                        reject(inferUserCancelledError(data.error || 'Twitter login was cancelled.'));
                         return true;
                     }
                     return false;
@@ -1771,7 +1906,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                         // Check if popup is closed - this may throw cross-origin errors for some providers
                         if (popup.closed) {
                             cleanup(messageHandler, timeoutHandle, popupClosedInterval);
-                            reject(new Error('Twitter login window was closed.'));
+                            reject(createUserCancelledError('Twitter login window was closed.'));
                         }
                     }
                     catch (_a) {
@@ -1876,10 +2011,9 @@ var capacitorCapacitorUpdater = (function (exports, core) {
             }
         }
         async exchangeAuthorizationCode(code, pending) {
-            var _a;
             const params = new URLSearchParams({
                 grant_type: 'authorization_code',
-                client_id: (_a = this.clientId) !== null && _a !== void 0 ? _a : '',
+                client_id: pending.clientId,
                 code,
                 redirect_uri: pending.redirectUri,
                 code_verifier: pending.codeVerifier,
@@ -2078,11 +2212,8 @@ var capacitorCapacitorUpdater = (function (exports, core) {
             let message;
             if ('error' in result) {
                 const resolvedProvider = (_a = parsed.provider) !== null && _a !== void 0 ? _a : null;
-                message = {
-                    type: 'oauth-error',
-                    provider: resolvedProvider,
-                    error: result.error,
-                };
+                const error = inferUserCancelledError(result.error);
+                message = Object.assign({ type: 'oauth-error', provider: resolvedProvider, error: error.message }, (error.code ? { code: error.code } : null));
             }
             else {
                 message = Object.assign({ type: 'oauth-response', provider: result.provider }, result.result);
@@ -2252,7 +2383,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
             if (!result)
                 return null;
             if ('error' in result) {
-                throw new Error(result.error);
+                throw inferUserCancelledError(result.error);
             }
             return result;
         }