@capgo/capacitor-social-login 8.3.17 → 8.3.19

package/dist/plugin.js

@@ -455,37 +455,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(new Error('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 +548,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(new Error('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;
@@ -854,13 +918,21 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                     reject(new Error('Failed to open popup'));
                     return;
                 }
-                const cleanup = () => {
+                const cleanup = (shouldClose = false) => {
                     window.removeEventListener('message', handleMessage);
                     clearInterval(popupClosedInterval);
                     clearTimeout(timeoutHandle);
                     if (broadcastChannel) {
                         broadcastChannel.close();
                     }
+                    if (shouldClose) {
+                        try {
+                            popup.close();
+                        }
+                        catch (_a) {
+                            // Ignore cross-origin errors when closing the popup
+                        }
+                    }
                 };
                 const processOAuthResponse = (data) => {
                     if (this.loginType === 'online') {
@@ -911,11 +983,11 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                     if (event.origin !== window.location.origin || ((_b = (_a = event.data) === null || _a === void 0 ? void 0 : _a.source) === null || _b === void 0 ? void 0 : _b.startsWith('angular')))
                         return;
                     if (((_c = event.data) === null || _c === void 0 ? void 0 : _c.type) === 'oauth-response') {
-                        cleanup();
+                        cleanup(true);
                         processOAuthResponse(event.data);
                     }
                     else if (((_d = event.data) === null || _d === void 0 ? void 0 : _d.type) === 'oauth-error') {
-                        cleanup();
+                        cleanup(true);
                         const errorMessage = event.data.error || 'User cancelled the OAuth flow';
                         reject(new Error(errorMessage));
                     }
@@ -929,11 +1001,11 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                         if ((_a = data === null || data === void 0 ? void 0 : data.source) === null || _a === void 0 ? void 0 : _a.toString().startsWith('angular'))
                             return;
                         if ((data === null || data === void 0 ? void 0 : data.type) === 'oauth-response') {
-                            cleanup();
+                            cleanup(true);
                             processOAuthResponse(data);
                         }
                         else if ((data === null || data === void 0 ? void 0 : data.type) === 'oauth-error') {
-                            cleanup();
+                            cleanup(true);
                             const errorMessage = data.error || 'User cancelled the OAuth flow';
                             reject(new Error(errorMessage));
                         }
@@ -942,13 +1014,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                 window.addEventListener('message', handleMessage);
                 // Timeout after 5 minutes
                 timeoutHandle = setTimeout(() => {
-                    cleanup();
-                    try {
-                        popup.close();
-                    }
-                    catch (_a) {
-                        // Ignore cross-origin errors when closing
-                    }
+                    cleanup(true);
                     reject(new Error('OAuth timeout'));
                 }, 300000);
                 popupClosedInterval = setInterval(() => {
@@ -976,10 +1042,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)
@@ -1008,6 +1077,7 @@ var capacitorCapacitorUpdater = (function (exports, core) {
             }
             return {
                 appId,
+                clientSecret: config.clientSecret,
                 issuerUrl: config.issuerUrl,
                 authorizationBaseUrl,
                 accessTokenEndpoint,
@@ -1061,6 +1131,8 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                     logoutUrl: config.logoutUrl,
                 });
             }
+            // Persist updated configuration after discovery
+            this.persistConfiguration(providerId, config);
         }
         /**
          * Initialize multiple OAuth2 providers
@@ -1081,6 +1153,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) {
@@ -1093,6 +1167,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;
@@ -1470,6 +1575,9 @@ var capacitorCapacitorUpdater = (function (exports, core) {
             if (config.pkceEnabled) {
                 params.set('code_verifier', pending.codeVerifier);
             }
+            if (config.clientSecret) {
+                params.set('client_secret', config.clientSecret);
+            }
             if (config.additionalTokenParameters) {
                 for (const [k, v] of Object.entries(config.additionalTokenParameters)) {
                     params.set(k, v);
@@ -1501,6 +1609,9 @@ var capacitorCapacitorUpdater = (function (exports, core) {
                 refresh_token: refreshToken,
                 client_id: config.appId,
             });
+            if (config.clientSecret) {
+                params.set('client_secret', config.clientSecret);
+            }
             if (config.additionalTokenParameters) {
                 for (const [k, v] of Object.entries(config.additionalTokenParameters)) {
                     params.set(k, v);
@@ -1662,6 +1773,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,
@@ -1867,10 +1979,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,