@makefully/adaptfully 5.0.3 → 5.0.5

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project are documented in this file.
 
+## 5.0.5 — 2026-10-06
+
+### Changed
+
+- **`social-auth`** Google login on Capacitor now passes `filterByAuthorizedAccounts: false` (Capgo/Family Link guidance) so Credential Manager does not stick to a stale authorized-account filter that surfaces `[16] Account reauth failed`.
+
+## 5.0.4 — 2026-10-06
+
+### Changed
+
+- **`social-auth`** logs richer Capgo/Android login diagnostics: structured error dumps when the bridge returns an empty-message `Error`, plus safe context (platform, provider, masked `webClientId`, plugin presence, result keys on identity-map failures).
+
 ## 5.0.3 — 2026-10-05
 
 ### Changed

package/lib/runtime/auth/social-auth.js

@@ -27,6 +27,81 @@
         return null;
     }
 
+    function capacitorPlatform() {
+        try {
+            return window.Capacitor?.getPlatform?.() || 'unknown';
+        } catch {
+            return 'unknown';
+        }
+    }
+
+    /** Capgo / Android bridge often rejects with an empty-message Error. */
+    function formatAuthError(err) {
+        if (err == null) {
+            return { message: 'unknown error' };
+        }
+        if (typeof err === 'string') {
+            return { message: err };
+        }
+
+        const message = err.message
+            || err.errorMessage
+            || err.error_description
+            || (typeof err.error === 'string' ? err.error : '')
+            || '';
+        const out = {
+            message: message || '(empty message)',
+            name: err.name || undefined,
+            code: err.code ?? err.errorCode ?? err.statusCode ?? undefined,
+        };
+
+        if (err.data != null) {
+            out.data = err.data;
+        }
+        if (err.error != null && typeof err.error === 'object') {
+            out.nested = formatAuthError(err.error);
+        }
+        if (err.stack) {
+            out.stack = String(err.stack).split('\n').slice(0, 6).join('\n');
+        }
+
+        // Empty / generic "Error" from the Android bridge — dump own props.
+        if (!message || message === 'Error' || message === '[object Object]') {
+            try {
+                out.raw = JSON.stringify(err, Object.getOwnPropertyNames(Object(err)));
+            } catch {
+                out.raw = String(err);
+            }
+        }
+
+        return out;
+    }
+
+    function maskClientId(id) {
+        const value = String(id || '');
+        if (!value) {
+            return null;
+        }
+        if (value.length <= 12) {
+            return `${value.slice(0, 4)}…`;
+        }
+        return `${value.slice(0, 8)}…${value.slice(-6)}`;
+    }
+
+    function authContext(extra = {}) {
+        const config = readSocialLoginConfig();
+        return {
+            platform: capacitorPlatform(),
+            defaultProvider: config.defaultProvider || null,
+            providers: config.providers || null,
+            googleWebClientId: maskClientId(config.google?.webClientId),
+            appleClientIdConfigured: !!(config.apple?.clientId || window.gameConfig?.packageName),
+            hasCapacitor: !!window.Capacitor,
+            hasSocialLoginPlugin: !!resolveSocialLoginPlugin(),
+            ...extra,
+        };
+    }
+
     function mapLoginResult(result) {
         const resultResult = result?.result ?? result;
         const profile = resultResult?.profile
@@ -173,7 +248,10 @@
                 const plugin = resolveSocialLoginPlugin();
                 if (!plugin) {
                     if (Date.now() - started >= timeoutMs) {
-                        console.warn('[adaptfully social-auth] Capgo SocialLogin plugin not available');
+                        console.warn(
+                            '[adaptfully social-auth] Capgo SocialLogin plugin not available',
+                            authContext({ waitedMs: Date.now() - started }),
+                        );
                         this.online = false;
                         done({ error: 'SocialLogin plugin not available' });
                         return;
@@ -185,12 +263,26 @@
                 this.#plugin = plugin;
                 this.#provider = this.#resolveDefaultProvider();
 
+                const initOptions = this.#buildInitializeOptions();
+                console.info('[adaptfully social-auth] initializing', authContext({
+                    provider: this.#provider,
+                    googleMode: initOptions.google?.mode || null,
+                    googleWebClientIdPresent: !!initOptions.google?.webClientId,
+                }));
+
                 try {
-                    await plugin.initialize(this.#buildInitializeOptions());
+                    await plugin.initialize(initOptions);
                     this.online = true;
+                    console.info('[adaptfully social-auth] initialize ok', authContext({
+                        provider: this.#provider,
+                    }));
                     done();
                 } catch (err) {
-                    console.error('[adaptfully social-auth] initialize failed:', err);
+                    console.error(
+                        '[adaptfully social-auth] initialize failed:',
+                        formatAuthError(err),
+                        authContext({ provider: this.#provider }),
+                    );
                     this.online = false;
                     done({ error: err?.message || 'SocialLogin initialize failed' });
                 }
@@ -204,27 +296,64 @@
             const provider = this.#provider ?? this.#resolveDefaultProvider();
 
             if (!plugin) {
-                console.warn('[adaptfully social-auth] login: plugin missing');
+                console.warn('[adaptfully social-auth] login: plugin missing', authContext({
+                    provider,
+                }));
                 this.#complete(callback);
                 return;
             }
 
-            plugin.login({
+            // Android Capgo defaults / Family Link: never filter to "authorized"
+            // accounts only — that path commonly surfaces [16] Account reauth failed.
+            const options = provider === 'google'
+                ? {
+                    scopes: ['email', 'profile'],
+                    filterByAuthorizedAccounts: false,
+                }
+                : {
+                    scopes: ['email', 'name'],
+                };
+
+            console.info('[adaptfully social-auth] login starting', authContext({
                 provider,
-                options: {
-                    scopes: provider === 'google'
-                        ? ['email', 'profile']
-                        : ['email', 'name'],
-                },
-            })
+                scopes: options.scopes,
+                filterByAuthorizedAccounts: options.filterByAuthorizedAccounts ?? null,
+                alreadyAuthenticated: this.authenticated,
+            }));
+
+            plugin.login({ provider, options })
                 .then((result) => {
-                    if (!this.#applyIdentity(mapLoginResult(result))) {
-                        console.warn('[adaptfully social-auth] login: could not map identity', result);
+                    const identity = mapLoginResult(result);
+                    if (!this.#applyIdentity(identity)) {
+                        const keys = result && typeof result === 'object'
+                            ? Object.keys(result)
+                            : [];
+                        console.warn(
+                            '[adaptfully social-auth] login: could not map identity',
+                            authContext({
+                                provider,
+                                resultKeys: keys,
+                                hasResultResult: !!(result && result.result),
+                                profileKeys: result?.result?.profile
+                                    ? Object.keys(result.result.profile)
+                                    : (result?.profile ? Object.keys(result.profile) : []),
+                            }),
+                        );
+                    } else {
+                        console.info('[adaptfully social-auth] login ok', authContext({
+                            provider,
+                            hasEmail: !!identity.email,
+                            idLength: String(identity.id || '').length,
+                        }));
                     }
                     this.#complete(callback);
                 })
                 .catch((err) => {
-                    console.error('[adaptfully social-auth] login failed:', err);
+                    console.error(
+                        '[adaptfully social-auth] login failed:',
+                        formatAuthError(err),
+                        authContext({ provider }),
+                    );
                     this.user = null;
                     this.authenticated = false;
                     this.online = false;
@@ -264,8 +393,12 @@
                             this.#applyIdentity(identity);
                             this.#complete(callback);
                             return;
-                        } catch {
-                            // fall through to lastId
+                        } catch (err) {
+                            console.warn(
+                                '[adaptfully social-auth] autoLogin getAuthorizationCode failed:',
+                                formatAuthError(err),
+                                authContext({ provider, hasLastId: !!lastId }),
+                            );
                         }
                     }
 
@@ -275,7 +408,11 @@
                     this.#complete(callback);
                 })
                 .catch((err) => {
-                    console.warn('[adaptfully social-auth] autoLogin failed:', err);
+                    console.warn(
+                        '[adaptfully social-auth] autoLogin failed:',
+                        formatAuthError(err),
+                        authContext({ provider }),
+                    );
                     this.#complete(callback);
                 });
         }
@@ -301,7 +438,11 @@
             plugin.logout({ provider })
                 .then(clear)
                 .catch((err) => {
-                    console.warn('[adaptfully social-auth] logout failed:', err);
+                    console.warn(
+                        '[adaptfully social-auth] logout failed:',
+                        formatAuthError(err),
+                        authContext({ provider }),
+                    );
                     clear();
                 });
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@makefully/adaptfully",
-    "version": "5.0.3",
+    "version": "5.0.5",
     "description": "Platform abstraction and Wrapfully deploy client for Makefully games",
     "type": "module",
     "main": "./lib/node/index.js",