react-native-nitro-auth 0.5.12 → 0.6.0

package/lib/commonjs/index.js

@@ -52,6 +52,18 @@ Object.keys(_AuthNitro).forEach(function (key) {
     }
   });
 });
+var _providerOptions = require("./provider-options.js");
+Object.keys(_providerOptions).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _providerOptions[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _providerOptions[key];
+    }
+  });
+});
 var _socialButton = require("./ui/social-button");
 Object.keys(_socialButton).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_AuthNitro","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_socialButton","_useAuth","_service","_authError"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,UAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,UAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,UAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,aAAA,GAAAb,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAW,aAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAS,aAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,aAAA,CAAAT,GAAA;IAAA;EAAA;AAAA;AACA,IAAAU,QAAA,GAAAd,OAAA;AACA,IAAAe,QAAA,GAAAf,OAAA;AACA,IAAAgB,UAAA,GAAAhB,OAAA","ignoreList":[]}
+{"version":3,"names":["_AuthNitro","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_providerOptions","_socialButton","_useAuth","_service","_authError"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,UAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,UAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,UAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,gBAAA,GAAAb,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAW,gBAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAS,gBAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,gBAAA,CAAAT,GAAA;IAAA;EAAA;AAAA;AACA,IAAAU,aAAA,GAAAd,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAY,aAAA,EAAAX,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAU,aAAA,CAAAV,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,aAAA,CAAAV,GAAA;IAAA;EAAA;AAAA;AACA,IAAAW,QAAA,GAAAf,OAAA;AACA,IAAAgB,QAAA,GAAAhB,OAAA;AACA,IAAAiB,UAAA,GAAAjB,OAAA","ignoreList":[]}

package/lib/commonjs/index.web.js

@@ -52,6 +52,18 @@ Object.keys(_AuthNitro).forEach(function (key) {
     }
   });
 });
+var _providerOptions = require("./provider-options.js");
+Object.keys(_providerOptions).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _providerOptions[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _providerOptions[key];
+    }
+  });
+});
 var _socialButtonWeb = require("./ui/social-button.web.js");
 Object.keys(_socialButtonWeb).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/commonjs/index.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_AuthNitro","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_socialButtonWeb","_useAuth","_serviceWeb","_authError"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,UAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,UAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,UAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,gBAAA,GAAAb,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAW,gBAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAS,gBAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,gBAAA,CAAAT,GAAA;IAAA;EAAA;AAAA;AACA,IAAAU,QAAA,GAAAd,OAAA;AACA,IAAAe,WAAA,GAAAf,OAAA;AACA,IAAAgB,UAAA,GAAAhB,OAAA","ignoreList":[]}
+{"version":3,"names":["_AuthNitro","require","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_providerOptions","_socialButtonWeb","_useAuth","_serviceWeb","_authError"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAH,UAAA,EAAAI,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAL,UAAA,CAAAK,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAb,UAAA,CAAAK,GAAA;IAAA;EAAA;AAAA;AACA,IAAAS,gBAAA,GAAAb,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAW,gBAAA,EAAAV,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAS,gBAAA,CAAAT,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAC,gBAAA,CAAAT,GAAA;IAAA;EAAA;AAAA;AACA,IAAAU,gBAAA,GAAAd,OAAA;AAAAC,MAAA,CAAAC,IAAA,CAAAY,gBAAA,EAAAX,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAU,gBAAA,CAAAV,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAE,gBAAA,CAAAV,GAAA;IAAA;EAAA;AAAA;AACA,IAAAW,QAAA,GAAAf,OAAA;AACA,IAAAgB,WAAA,GAAAhB,OAAA;AACA,IAAAiB,UAAA,GAAAjB,OAAA","ignoreList":[]}

package/lib/commonjs/provider-options.js

@@ -0,0 +1,6 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+//# sourceMappingURL=provider-options.js.map

package/lib/commonjs/provider-options.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../src","sources":["provider-options.ts"],"mappings":"","ignoreList":[]}

package/lib/commonjs/service.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeNitroModules","require","_createAuthService","nitroAuth","getNitroAuth","NitroModules","createHybridObject","AuthService","exports","createAuthService"],"sourceRoot":"../../src","sources":["service.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAEA,IAAAC,kBAAA,GAAAD,OAAA;AAEA,IAAIE,SAA2B;AAE/B,SAASC,YAAYA,CAAA,EAAS;EAC5BD,SAAS,KAAKE,qCAAY,CAACC,kBAAkB,CAAO,MAAM,CAAC;EAC3D,OAAOH,SAAS;AAClB;AAEO,MAAMI,WAAiB,GAAAC,OAAA,CAAAD,WAAA,GAAG,IAAAE,oCAAiB,EAACL,YAAY,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNativeNitroModules","require","_createAuthService","nitroAuth","getNitroAuth","NitroModules","createHybridObject","AuthService","exports","createAuthService"],"sourceRoot":"../../src","sources":["service.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAEA,IAAAC,kBAAA,GAAAD,OAAA;AAGA,IAAIE,SAA2B;AAE/B,SAASC,YAAYA,CAAA,EAAS;EAC5BD,SAAS,KAAKE,qCAAY,CAACC,kBAAkB,CAAO,MAAM,CAAC;EAC3D,OAAOH,SAAS;AAClB;AAEO,MAAMI,WAAsB,GAAAC,OAAA,CAAAD,WAAA,GAAG,IAAAE,oCAAiB,EAACL,YAAY,CAAC","ignoreList":[]}

package/lib/commonjs/service.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_AuthWeb","require","_createAuthService","AuthService","exports","createAuthService","AuthModule"],"sourceRoot":"../../src","sources":["service.web.ts"],"mappings":";;;;;;AACA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAEO,MAAME,WAAiB,GAAAC,OAAA,CAAAD,WAAA,GAAG,IAAAE,oCAAiB,EAAC,MAAMC,mBAAU,CAAC","ignoreList":[]}
+{"version":3,"names":["_AuthWeb","require","_createAuthService","AuthService","exports","createAuthService","AuthModule"],"sourceRoot":"../../src","sources":["service.web.ts"],"mappings":";;;;;;AAAA,IAAAA,QAAA,GAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAD,OAAA;AAGO,MAAME,WAAsB,GAAAC,OAAA,CAAAD,WAAA,GAAG,IAAAE,oCAAiB,EAAC,MAAMC,mBAAU,CAAC","ignoreList":[]}

package/lib/commonjs/use-auth.js

@@ -123,6 +123,25 @@ function useAuth() {
       throw error;
     }
   }, [syncStateFromService]);
+  const revokeAccess = (0, _react.useCallback)(async () => {
+    setState(prev => ({
+      ...prev,
+      loading: true,
+      error: undefined
+    }));
+    try {
+      await _service.AuthService.revokeAccess();
+      syncStateFromService(false, undefined);
+    } catch (e) {
+      const error = _authError.AuthError.from(e);
+      setState(prev => ({
+        ...prev,
+        loading: false,
+        error
+      }));
+      throw error;
+    }
+  }, [syncStateFromService]);
   const getAccessToken = (0, _react.useCallback)(() => _service.AuthService.getAccessToken(), []);
   const refreshToken = (0, _react.useCallback)(async () => {
     setState(prev => ({
@@ -193,9 +212,10 @@ function useAuth() {
     logout,
     requestScopes,
     revokeScopes,
+    revokeAccess,
     getAccessToken,
     refreshToken,
     silentRestore
-  }), [state, login, logout, requestScopes, revokeScopes, getAccessToken, refreshToken, silentRestore]);
+  }), [state, login, logout, requestScopes, revokeScopes, revokeAccess, getAccessToken, refreshToken, silentRestore]);
 }
 //# sourceMappingURL=use-auth.js.map

package/lib/commonjs/use-auth.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_service","_authError","EMPTY_SCOPES","normalizeScopes","scopes","Array","isArray","areScopesEqual","left","right","length","matchesInOrder","i","remaining","Set","scope","delete","size","useAuth","state","setState","useState","user","AuthService","currentUser","grantedScopes","loading","error","undefined","syncStateFromService","useCallback","nextLoading","nextError","nextUser","nextScopes","prev","login","provider","options","e","AuthError","from","logout","requestScopes","newScopes","revokeScopes","scopesToRevoke","getAccessToken","refreshToken","tokens","silentRestore","useEffect","unsubscribeAuth","onAuthStateChanged","unsubscribeTokens","onTokensRefreshed","useMemo","hasPlayServices"],"sourceRoot":"../../src","sources":["use-auth.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_service","_authError","EMPTY_SCOPES","normalizeScopes","scopes","Array","isArray","areScopesEqual","left","right","length","matchesInOrder","i","remaining","Set","scope","delete","size","useAuth","state","setState","useState","user","AuthService","currentUser","grantedScopes","loading","error","undefined","syncStateFromService","useCallback","nextLoading","nextError","nextUser","nextScopes","prev","login","provider","options","e","AuthError","from","logout","requestScopes","newScopes","revokeScopes","scopesToRevoke","revokeAccess","getAccessToken","refreshToken","tokens","silentRestore","useEffect","unsubscribeAuth","onAuthStateChanged","unsubscribeTokens","onTokensRefreshed","useMemo","hasPlayServices"],"sourceRoot":"../../src","sources":["use-auth.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/Auth.web.js

@@ -101,6 +101,8 @@ class AuthWeb {
   _tokenListeners = [];
   _browserStorageResolved = false;
   _loginInFlight = false;
+  _sessionGeneration = 0;
+  _disposed = false;
   constructor() {
     this._config = getConfig();
     this.loadFromCache();
@@ -235,6 +237,7 @@ class AuthWeb {
     delete safeUser.accessToken;
     delete safeUser.idToken;
     delete safeUser.serverAuthCode;
+    delete safeUser.authorizationCode;
     return safeUser;
   }
   saveRefreshToken(refreshToken) {
@@ -269,6 +272,7 @@ class AuthWeb {
           delete safeUser.accessToken;
           delete safeUser.idToken;
           delete safeUser.serverAuthCode;
+          delete safeUser.authorizationCode;
           this._currentUser = safeUser;
         }
       } catch (error) {
@@ -333,6 +337,9 @@ class AuthWeb {
     }
   }
   async runLoginOperation(operation) {
+    if (this._disposed) {
+      throw new AuthWebError("cancelled", "Auth module disposed");
+    }
     if (this._loginInFlight) {
       throw new AuthWebError("operation_in_progress", "Another login is already in progress");
     }
@@ -343,8 +350,14 @@ class AuthWeb {
       this._loginInFlight = false;
     }
   }
+  assertActiveGeneration(generation) {
+    if (this._disposed || this._sessionGeneration !== generation) {
+      throw new AuthWebError("cancelled", "Auth operation was cancelled");
+    }
+  }
   async login(provider, options) {
     const loginHint = options?.loginHint;
+    const generation = this._sessionGeneration;
     logger.log(`Starting login with ${provider}`, {
       scopes: options?.scopes
     });
@@ -352,16 +365,16 @@ class AuthWeb {
       await this.runLoginOperation(async () => {
         if (provider === "google") {
           const scopes = options?.scopes ?? DEFAULT_SCOPES;
-          await this.loginGoogle(scopes, loginHint);
+          await this.loginGoogle(scopes, loginHint, options, generation);
           return;
         }
         if (provider === "microsoft") {
           const scopes = options?.scopes ?? MS_DEFAULT_SCOPES;
-          await this.loginMicrosoft(scopes, loginHint, options?.tenant, options?.prompt);
+          await this.loginMicrosoft(scopes, loginHint, options?.tenant, options?.prompt, generation);
           return;
         }
         if (provider === "apple") {
-          await this.loginApple();
+          await this.loginApple(options, generation);
           return;
         }
         throw new AuthWebError("unsupported_provider", `Unsupported auth provider: ${provider}`);
@@ -384,12 +397,13 @@ class AuthWeb {
     logger.log("Requesting additional scopes:", scopes);
     const newScopes = [...new Set([...this._grantedScopes, ...scopes])];
     try {
+      const generation = this._sessionGeneration;
       await this.runLoginOperation(async () => {
         if (provider === "google") {
-          await this.loginGoogle(newScopes);
+          await this.loginGoogle(newScopes, undefined, undefined, generation);
           return;
         }
-        await this.loginMicrosoft(newScopes);
+        await this.loginMicrosoft(newScopes, undefined, undefined, undefined, generation);
       });
     } catch (e) {
       const error = this.mapError(e);
@@ -406,6 +420,9 @@ class AuthWeb {
       this.updateUser(this._currentUser);
     }
   }
+  async revokeAccess() {
+    this.logout();
+  }
   async getAccessToken() {
     if (this._currentUser?.expirationTime) {
       const now = Date.now();
@@ -420,7 +437,7 @@ class AuthWeb {
     if (this._refreshPromise) {
       return this._refreshPromise;
     }
-    const refreshPromise = this.performRefreshToken();
+    const refreshPromise = this.performRefreshToken(this._sessionGeneration);
     this._refreshPromise = refreshPromise;
     try {
       return await refreshPromise;
@@ -430,7 +447,7 @@ class AuthWeb {
       }
     }
   }
-  async performRefreshToken() {
+  async performRefreshToken(generation) {
     if (!this._currentUser) {
       throw new Error("No user logged in");
     }
@@ -461,6 +478,7 @@ class AuthWeb {
         body: body.toString()
       });
       const json = await this.parseResponseObject(response);
+      this.assertActiveGeneration(generation);
       if (!response.ok) {
         throw new AuthWebError("refresh_failed", getOptionalString(json, "error_description") ?? getOptionalString(json, "error") ?? "Token refresh failed");
       }
@@ -471,13 +489,17 @@ class AuthWeb {
         this.saveRefreshToken(newRefreshToken);
       }
       const expirationTime = this.getExpirationTime(json["expires_in"]);
-      const effectiveIdToken = idToken ?? this._currentUser.idToken;
+      const currentUser = this._currentUser;
+      if (!currentUser) {
+        throw new AuthWebError("cancelled", "Auth operation was cancelled");
+      }
+      const effectiveIdToken = idToken ?? currentUser.idToken;
       const claims = effectiveIdToken ? this.decodeMicrosoftJwt(effectiveIdToken) : {};
       const user = {
-        ...this._currentUser,
+        ...currentUser,
         idToken: effectiveIdToken,
         accessToken: accessToken ?? undefined,
-        refreshToken: newRefreshToken ?? this._currentUser.refreshToken,
+        refreshToken: newRefreshToken ?? currentUser.refreshToken,
         expirationTime,
         ...claims
       };
@@ -495,7 +517,8 @@ class AuthWeb {
       throw new Error(`Token refresh not supported for ${this._currentUser.provider}`);
     }
     logger.log("Refreshing tokens...");
-    await this.loginGoogle(this._grantedScopes.length > 0 ? this._grantedScopes : DEFAULT_SCOPES);
+    await this.runLoginOperation(() => this.loginGoogle(this._grantedScopes.length > 0 ? this._grantedScopes : DEFAULT_SCOPES, undefined, undefined, generation));
+    this.assertActiveGeneration(generation);
     const tokens = {
       accessToken: this._currentUser.accessToken,
       idToken: this._currentUser.idToken,
@@ -645,12 +668,12 @@ class AuthWeb {
       }, POPUP_POLL_INTERVAL_MS);
     });
   }
-  async loginGoogle(scopes, loginHint) {
+  async loginGoogle(scopes, loginHint, options, generation) {
     const clientId = this._config.googleWebClientId;
     if (!clientId) {
       throw new Error("Google Web Client ID not configured. Add 'GOOGLE_WEB_CLIENT_ID' to your .env file.");
     }
-    const nonce = crypto.randomUUID();
+    const nonce = options?.nonce ?? crypto.randomUUID();
     this._pendingGoogleNonce = nonce;
     return new Promise((resolve, reject) => {
       const redirectUri = window.location.origin;
@@ -661,10 +684,16 @@ class AuthWeb {
       authUrl.searchParams.set("scope", scopes.join(" "));
       authUrl.searchParams.set("nonce", nonce);
       authUrl.searchParams.set("access_type", "offline");
-      authUrl.searchParams.set("prompt", "consent");
+      authUrl.searchParams.set("prompt", options?.forceAccountPicker ? "select_account consent" : "consent");
       if (loginHint) {
         authUrl.searchParams.set("login_hint", loginHint);
       }
+      if (options?.hostedDomain) {
+        authUrl.searchParams.set("hd", options.hostedDomain);
+      }
+      if (options?.openIDRealm) {
+        authUrl.searchParams.set("openid.realm", options.openIDRealm);
+      }
       const width = 500;
       const height = 600;
       const left = window.screenX + (window.outerWidth - width) / 2;
@@ -695,6 +724,9 @@ class AuthWeb {
           throw new AuthWebError("invalid_nonce", "Nonce mismatch - possible replay attack");
         }
         this._pendingGoogleNonce = undefined;
+        if (generation !== undefined) {
+          this.assertActiveGeneration(generation);
+        }
         this._grantedScopes = scopes;
         this.saveValue(SCOPES_KEY, JSON.stringify(scopes));
         const user = {
@@ -702,6 +734,8 @@ class AuthWeb {
           idToken,
           accessToken: accessToken ?? undefined,
           serverAuthCode: code ?? undefined,
+          userId: getOptionalString(decoded, "sub"),
+          hostedDomain: getOptionalString(decoded, "hd"),
           scopes,
           expirationTime: this.getExpirationTime(expiresIn),
           ...this.decodeGoogleJwt(idToken)
@@ -720,7 +754,9 @@ class AuthWeb {
       return {
         email: getOptionalString(decoded, "email"),
         name: getOptionalString(decoded, "name"),
-        photo: getOptionalString(decoded, "picture")
+        photo: getOptionalString(decoded, "picture"),
+        userId: getOptionalString(decoded, "sub"),
+        hostedDomain: getOptionalString(decoded, "hd")
       };
     } catch (error) {
       logger.warn("Failed to decode Google ID token", {
@@ -729,7 +765,7 @@ class AuthWeb {
       return {};
     }
   }
-  async loginMicrosoft(scopes, loginHint, tenant, prompt) {
+  async loginMicrosoft(scopes, loginHint, tenant, prompt, generation) {
     const clientId = this._config.microsoftClientId;
     if (!clientId) {
       throw new Error("Microsoft Client ID not configured. Add 'microsoftClientId' to expo.extra in your app.config.js");
@@ -782,7 +818,7 @@ class AuthWeb {
         if (!code) {
           throw new AuthWebError("token_error", "No authorization code in response");
         }
-        await this.exchangeMicrosoftCodeForTokens(code, codeVerifier, clientId, redirectUri, effectiveTenant, nonce, effectiveScopes);
+        await this.exchangeMicrosoftCodeForTokens(code, codeVerifier, clientId, redirectUri, effectiveTenant, nonce, effectiveScopes, generation);
       }).then(() => {
         resolve();
       }).catch(error => {
@@ -805,7 +841,7 @@ class AuthWeb {
     const base64 = btoa(String.fromCharCode(...bytes));
     return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
   }
-  async exchangeMicrosoftCodeForTokens(code, codeVerifier, clientId, redirectUri, tenant, expectedNonce, scopes) {
+  async exchangeMicrosoftCodeForTokens(code, codeVerifier, clientId, redirectUri, tenant, expectedNonce, scopes, generation) {
     const authBaseUrl = this.getMicrosoftAuthBaseUrl(tenant, this._config.microsoftB2cDomain);
     const tokenUrl = `${authBaseUrl}oauth2/v2.0/token`;
     const body = new URLSearchParams({
@@ -823,6 +859,9 @@ class AuthWeb {
       body: body.toString()
     });
     const json = await this.parseResponseObject(response);
+    if (generation !== undefined) {
+      this.assertActiveGeneration(generation);
+    }
     if (!response.ok) {
       throw new AuthWebError("token_error", getOptionalString(json, "error_description") ?? getOptionalString(json, "error") ?? "Token exchange failed");
     }
@@ -920,7 +959,7 @@ class AuthWeb {
     });
     return _appleSdkLoadPromise;
   }
-  async loginApple() {
+  async loginApple(options, generation) {
     const clientId = this._config.appleWebClientId;
     if (!clientId) {
       throw new Error("Apple Web Client ID not configured. Add 'APPLE_WEB_CLIENT_ID' to your .env file.");
@@ -931,15 +970,20 @@ class AuthWeb {
     }
     window.AppleID.auth.init({
       clientId,
-      scope: "name email",
+      scope: (options?.scopes?.length ? options.scopes : ["name", "email"]).join(" "),
       redirectURI: window.location.origin,
+      nonce: options?.nonce,
       usePopup: true
     });
     try {
       const response = await window.AppleID.auth.signIn();
+      if (generation !== undefined) {
+        this.assertActiveGeneration(generation);
+      }
       const user = {
         provider: "apple",
         idToken: response.authorization.id_token,
+        authorizationCode: response.authorization.code,
         email: response.user?.email,
         name: response.user?.name ? `${response.user.name.firstName} ${response.user.name.lastName}`.trim() : undefined
       };
@@ -962,8 +1006,12 @@ class AuthWeb {
     this.notify();
   }
   logout() {
+    this._sessionGeneration++;
     this._currentUser = undefined;
     this._grantedScopes = [];
+    this._refreshPromise = undefined;
+    this._pendingGoogleNonce = undefined;
+    this._loginInFlight = false;
     this.removeFromCache(CACHE_KEY);
     this.removeFromCache(SCOPES_KEY);
     this.removeFromCache(MS_REFRESH_TOKEN_KEY);
@@ -986,7 +1034,12 @@ class AuthWeb {
     this.notify();
   }
   name = "Auth";
-  dispose() {}
+  dispose() {
+    this._disposed = true;
+    this.logout();
+    this._listeners = [];
+    this._tokenListeners = [];
+  }
   equals(other) {
     return other === this;
   }