@makefully/adaptfully 2.1.0 → 3.0.0

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

@@ -1,176 +1,176 @@
-/* global google, sessionStorage, window */
-
-(function registerGoogleAuth(ns) {
-    const { configValue, getStorage } = ns.auth.helpers;
-
-    const DEFAULT_CLIENT_ID = '225754014403.apps.googleusercontent.com';
-    const DEFAULT_SCOPES = 'openid email profile';
-    const DEFAULT_TOKEN_KEY = 'adaptfully_google_token';
-
-    class GoogleAuthPlugin {
-        constructor() {
-            this.name = 'google';
-            this.tokenClient = null;
-            this.tokenKey = configValue('googleTokenKey', DEFAULT_TOKEN_KEY);
-            this.clientId = configValue('googleClientId', DEFAULT_CLIENT_ID);
-            this.scopes = configValue('googleScopes', DEFAULT_SCOPES);
-            this.accessToken = sessionStorage.getItem(this.tokenKey) || '';
-            this.user = null;
-            this.authenticated = false;
-        }
-
-        whenReady(done) {
-            const setup = () => {
-                this.tokenClient = google.accounts.oauth2.initTokenClient({
-                    client_id: this.clientId,
-                    scope: this.scopes,
-                    callback: () => {},
-                });
-                done();
-            };
-
-            if (window.google?.accounts?.oauth2) {
-                setup();
-                return;
-            }
-
-            let attempts = 0;
-            const timer = window.setInterval(() => {
-                attempts += 1;
-                if (window.google?.accounts?.oauth2) {
-                    window.clearInterval(timer);
-                    setup();
-                } else if (attempts > 200) {
-                    window.clearInterval(timer);
-                    console.error('Google Identity Services failed to load.');
-                    done({ error: 'Google Identity Services failed to load.' });
-                }
-            }, 50);
-        }
-
-        #applyUserInfo(data) {
-            this.user = {
-                id: data.sub || data.id || '',
-                email: data.email || '',
-            };
-            this.authenticated = !!(this.user.id && this.user.email);
-        }
-
-        #clearSession() {
-            this.accessToken = '';
-            this.user = null;
-            this.authenticated = false;
-            sessionStorage.removeItem(this.tokenKey);
-        }
-
-        #hasPersistedLogin() {
-            const storage = getStorage();
-            return !!(storage?.get('lastLoggedIn'));
-        }
-
-        #fetchUserInfo(token, callback) {
-            fetch('https://www.googleapis.com/oauth2/v3/userinfo', {
-                headers: { Authorization: `Bearer ${token}` },
-            })
-                .then((response) => {
-                    if (!response.ok) {
-                        throw new Error('userinfo failed');
-                    }
-                    return response.json();
-                })
-                .then((data) => {
-                    this.accessToken = token;
-                    sessionStorage.setItem(this.tokenKey, token);
-                    this.#applyUserInfo(data);
-                    callback();
-                })
-                .catch(() => {
-                    this.#clearSession();
-                    callback();
-                });
-        }
-
-        #requestAccessToken(prompt, callback) {
-            this.tokenClient.callback = (response) => {
-                if (response.error || !response.access_token) {
-                    this.#clearSession();
-                    callback();
-                    return;
-                }
-                this.#fetchUserInfo(response.access_token, callback);
-            };
-            this.tokenClient.requestAccessToken({ prompt: prompt || '' });
-        }
-
-        #restoreSession(callback) {
-            const trySilentGoogleLogin = () => {
-                if (this.#hasPersistedLogin()) {
-                    this.#requestAccessToken('none', callback);
-                } else {
-                    this.#clearSession();
-                    callback();
-                }
-            };
-
-            if (this.accessToken) {
-                this.#fetchUserInfo(this.accessToken, () => {
-                    if (this.authenticated) {
-                        callback();
-                        return;
-                    }
-                    trySilentGoogleLogin();
-                });
-                return;
-            }
-            trySilentGoogleLogin();
-        }
-
-        login(callback) {
-            if (this.authenticated) {
-                callback({ authenticated: true, user: this.getUser() });
-                return;
-            }
-            this.#requestAccessToken('select_account', () => {
-                callback({ authenticated: this.authenticated, user: this.getUser() });
-            });
-        }
-
-        silentLogin(callback) {
-            if (this.authenticated && this.user?.id) {
-                callback({ authenticated: true, user: this.getUser() });
-                return;
-            }
-            this.#restoreSession(() => {
-                callback({ authenticated: this.authenticated, user: this.getUser() });
-            });
-        }
-
-        logout(callback) {
-            const storage = getStorage();
-            const finish = () => {
-                this.#clearSession();
-                storage?.remove('lastLoggedIn');
-                callback();
-            };
-
-            if (this.accessToken && google.accounts?.oauth2) {
-                google.accounts.oauth2.revoke(this.accessToken, finish);
-            } else {
-                finish();
-            }
-        }
-
-        getUser() {
-            if (!this.authenticated || !this.user) {
-                return null;
-            }
-            return { id: this.user.id, email: this.user.email };
-        }
-
-        isAuthenticated() {
-            return !!this.authenticated;
-        }
-    }
-
-    ns.auth.Google = () => new GoogleAuthPlugin();
-}(window.adaptfully));
+/* global google, sessionStorage, window */
+
+(function registerGoogleAuth(ns) {
+    const { configValue, getStorage } = ns.auth.helpers;
+
+    const DEFAULT_CLIENT_ID = '225754014403.apps.googleusercontent.com';
+    const DEFAULT_SCOPES = 'openid email profile';
+    const DEFAULT_TOKEN_KEY = 'adaptfully_google_token';
+
+    class GoogleAuthPlugin {
+        constructor() {
+            this.name = 'google';
+            this.tokenClient = null;
+            this.tokenKey = configValue('googleTokenKey', DEFAULT_TOKEN_KEY);
+            this.clientId = configValue('googleClientId', DEFAULT_CLIENT_ID);
+            this.scopes = configValue('googleScopes', DEFAULT_SCOPES);
+            this.accessToken = sessionStorage.getItem(this.tokenKey) || '';
+            this.user = null;
+            this.authenticated = false;
+        }
+
+        whenReady(done) {
+            const setup = () => {
+                this.tokenClient = google.accounts.oauth2.initTokenClient({
+                    client_id: this.clientId,
+                    scope: this.scopes,
+                    callback: () => {},
+                });
+                done();
+            };
+
+            if (window.google?.accounts?.oauth2) {
+                setup();
+                return;
+            }
+
+            let attempts = 0;
+            const timer = window.setInterval(() => {
+                attempts += 1;
+                if (window.google?.accounts?.oauth2) {
+                    window.clearInterval(timer);
+                    setup();
+                } else if (attempts > 200) {
+                    window.clearInterval(timer);
+                    console.error('Google Identity Services failed to load.');
+                    done({ error: 'Google Identity Services failed to load.' });
+                }
+            }, 50);
+        }
+
+        #applyUserInfo(data) {
+            this.user = {
+                id: data.sub || data.id || '',
+                email: data.email || '',
+            };
+            this.authenticated = !!(this.user.id && this.user.email);
+        }
+
+        #clearSession() {
+            this.accessToken = '';
+            this.user = null;
+            this.authenticated = false;
+            sessionStorage.removeItem(this.tokenKey);
+        }
+
+        #hasPersistedLogin() {
+            const storage = getStorage();
+            return !!(storage?.get('lastLoggedIn'));
+        }
+
+        #fetchUserInfo(token, callback) {
+            fetch('https://www.googleapis.com/oauth2/v3/userinfo', {
+                headers: { Authorization: `Bearer ${token}` },
+            })
+                .then((response) => {
+                    if (!response.ok) {
+                        throw new Error('userinfo failed');
+                    }
+                    return response.json();
+                })
+                .then((data) => {
+                    this.accessToken = token;
+                    sessionStorage.setItem(this.tokenKey, token);
+                    this.#applyUserInfo(data);
+                    callback();
+                })
+                .catch(() => {
+                    this.#clearSession();
+                    callback();
+                });
+        }
+
+        #requestAccessToken(prompt, callback) {
+            this.tokenClient.callback = (response) => {
+                if (response.error || !response.access_token) {
+                    this.#clearSession();
+                    callback();
+                    return;
+                }
+                this.#fetchUserInfo(response.access_token, callback);
+            };
+            this.tokenClient.requestAccessToken({ prompt: prompt || '' });
+        }
+
+        #restoreSession(callback) {
+            const trySilentGoogleLogin = () => {
+                if (this.#hasPersistedLogin()) {
+                    this.#requestAccessToken('none', callback);
+                } else {
+                    this.#clearSession();
+                    callback();
+                }
+            };
+
+            if (this.accessToken) {
+                this.#fetchUserInfo(this.accessToken, () => {
+                    if (this.authenticated) {
+                        callback();
+                        return;
+                    }
+                    trySilentGoogleLogin();
+                });
+                return;
+            }
+            trySilentGoogleLogin();
+        }
+
+        login(callback) {
+            if (this.authenticated) {
+                callback({ authenticated: true, user: this.getUser() });
+                return;
+            }
+            this.#requestAccessToken('select_account', () => {
+                callback({ authenticated: this.authenticated, user: this.getUser() });
+            });
+        }
+
+        silentLogin(callback) {
+            if (this.authenticated && this.user?.id) {
+                callback({ authenticated: true, user: this.getUser() });
+                return;
+            }
+            this.#restoreSession(() => {
+                callback({ authenticated: this.authenticated, user: this.getUser() });
+            });
+        }
+
+        logout(callback) {
+            const storage = getStorage();
+            const finish = () => {
+                this.#clearSession();
+                storage?.remove('lastLoggedIn');
+                callback();
+            };
+
+            if (this.accessToken && google.accounts?.oauth2) {
+                google.accounts.oauth2.revoke(this.accessToken, finish);
+            } else {
+                finish();
+            }
+        }
+
+        getUser() {
+            if (!this.authenticated || !this.user) {
+                return null;
+            }
+            return { id: this.user.id, email: this.user.email };
+        }
+
+        isAuthenticated() {
+            return !!this.authenticated;
+        }
+    }
+
+    ns.auth.Google = () => new GoogleAuthPlugin();
+}(window.adaptfully));

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

@@ -1,50 +1,50 @@
-/* global window */
-
-/**
- * Steam auth plugin — placeholder for Electron / NW.js Steam deployments.
- * Wire Steamworks login here; games only talk to adaptfully.get('auth').
- */
-(function registerSteamAuth(ns) {
-    const { getStorage } = ns.auth.helpers;
-
-    class SteamAuthPlugin {
-        constructor() {
-            this.name = 'steam';
-            this.user = null;
-            this.authenticated = false;
-        }
-
-        whenReady(done) {
-            done();
-        }
-
-        login(callback) {
-            callback({ authenticated: this.authenticated, user: this.getUser() });
-        }
-
-        silentLogin(callback) {
-            callback({ authenticated: this.authenticated, user: this.getUser() });
-        }
-
-        logout(callback) {
-            const storage = getStorage();
-            this.user = null;
-            this.authenticated = false;
-            storage?.remove('lastLoggedIn');
-            callback();
-        }
-
-        getUser() {
-            if (!this.authenticated || !this.user) {
-                return null;
-            }
-            return { id: this.user.id, email: this.user.email || '' };
-        }
-
-        isAuthenticated() {
-            return !!this.authenticated;
-        }
-    }
-
-    ns.auth.Steam = () => new SteamAuthPlugin();
-}(window.adaptfully));
+/* global window */
+
+/**
+ * Steam auth plugin — placeholder for Electron / NW.js Steam deployments.
+ * Wire Steamworks login here; games only talk to adaptfully.get('auth').
+ */
+(function registerSteamAuth(ns) {
+    const { getStorage } = ns.auth.helpers;
+
+    class SteamAuthPlugin {
+        constructor() {
+            this.name = 'steam';
+            this.user = null;
+            this.authenticated = false;
+        }
+
+        whenReady(done) {
+            done();
+        }
+
+        login(callback) {
+            callback({ authenticated: this.authenticated, user: this.getUser() });
+        }
+
+        silentLogin(callback) {
+            callback({ authenticated: this.authenticated, user: this.getUser() });
+        }
+
+        logout(callback) {
+            const storage = getStorage();
+            this.user = null;
+            this.authenticated = false;
+            storage?.remove('lastLoggedIn');
+            callback();
+        }
+
+        getUser() {
+            if (!this.authenticated || !this.user) {
+                return null;
+            }
+            return { id: this.user.id, email: this.user.email || '' };
+        }
+
+        isAuthenticated() {
+            return !!this.authenticated;
+        }
+    }
+
+    ns.auth.Steam = () => new SteamAuthPlugin();
+}(window.adaptfully));

package/lib/runtime/core.js

@@ -1,61 +1,56 @@
-/* global window */
-
-/**
- * Adaptfully — shared platform services for Makefully games.
- *
- *   adaptfully.register('auth', adaptfully.auth.Google);
- *   const platform = adaptfully.get('auth');
- */
-(function initAdaptfully(global) {
-    class Adaptfully {
-        /** @type {Record<string, unknown>} */
-        #registry = {};
-
-        /** @type {import('./platform.js').Platform | null} */
-        #authPlatform = null;
-
-        register(key, value) {
-            if (key === 'auth') {
-                this.#authPlatform = null;
-            }
-            this.#registry[key] = value;
-        }
-
-        get(key) {
-            if (key === 'auth') {
-                if (!this.#authPlatform) {
-                    const factory = this.#registry.auth;
-                    if (!factory) {
-                        throw new Error(
-                            'adaptfully: no auth registered — call adaptfully.register(\'auth\', ...) before the game loads',
-                        );
-                    }
-                    const plugin = typeof factory === 'function' ? factory() : factory;
-                    if (!this.Platform) {
-                        throw new Error('adaptfully: Platform is not loaded');
-                    }
-                    this.#authPlatform = new this.Platform(plugin);
-                }
-                return this.#authPlatform;
-            }
-
-            if (!(key in this.#registry)) {
-                throw new Error(`adaptfully: nothing registered for "${key}"`);
-            }
-            return this.#registry[key];
-        }
-
-        has(key) {
-            return key in this.#registry;
-        }
-
-        /** @deprecated Use adaptfully.get('auth') */
-        getInstance() {
-            return this.get('auth');
-        }
-    }
-
-    const adaptfully = global.adaptfully || new Adaptfully();
-    adaptfully.auth = adaptfully.auth || {};
-    global.adaptfully = adaptfully;
-}(typeof window !== 'undefined' ? window : globalThis));
+/* global window */
+
+/**
+ * Adaptfully — shared platform services for Makefully games.
+ *
+ *   adaptfully.register('auth', adaptfully.auth.Google);
+ *   const platform = adaptfully.get('auth');
+ */
+(function initAdaptfully(global) {
+    class Adaptfully {
+        /** @type {Record<string, unknown>} */
+        #registry = {};
+
+        /** @type {import('./platform.js').Platform | null} */
+        #authPlatform = null;
+
+        register(key, value) {
+            if (key === 'auth') {
+                this.#authPlatform = null;
+            }
+            this.#registry[key] = value;
+        }
+
+        get(key) {
+            if (key === 'auth') {
+                if (!this.#authPlatform) {
+                    const factory = this.#registry.auth;
+                    if (!factory) {
+                        throw new Error(
+                            'adaptfully: no auth registered — call adaptfully.register(\'auth\', ...) before the game loads',
+                        );
+                    }
+                    const plugin = typeof factory === 'function' ? factory() : factory;
+                    if (!this.Platform) {
+                        throw new Error('adaptfully: Platform is not loaded');
+                    }
+                    this.#authPlatform = new this.Platform(plugin);
+                }
+                return this.#authPlatform;
+            }
+
+            if (!(key in this.#registry)) {
+                throw new Error(`adaptfully: nothing registered for "${key}"`);
+            }
+            return this.#registry[key];
+        }
+
+        has(key) {
+            return key in this.#registry;
+        }
+    }
+
+    const adaptfully = global.adaptfully || new Adaptfully();
+    adaptfully.auth = adaptfully.auth || {};
+    global.adaptfully = adaptfully;
+}(typeof window !== 'undefined' ? window : globalThis));