antarctic 0.4.0 → 0.6.0

package/dist/providers/box.js

@@ -1,5 +1,5 @@
 import { createOAuth2Request, sendTokenRequest, sendTokenRevocationRequest } from "../request.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://account.box.com/api/oauth2/authorize";
 const tokenEndpoint = "https://api.box.com/oauth2/token";
 const tokenRevocationEndpoint = "https://api.box.com/oauth2/revoke";
@@ -71,20 +71,23 @@ export class Box {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const profile = await fetchUserProfile(userEndpoint, tokens.accessToken());
         return {
             id: profileId(profile.id),
             name: profileString(profile.name),
             email: profileString(profile.login),
-            image: profileString(profile.avatar_url)
+            image: profileString(profile.avatar_url),
+            raw: profile,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/bungie.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface BungieOptions extends ProviderOptions {
     apiKey?: string;
 }
@@ -12,6 +12,6 @@ export declare class Bungie {
     createAuthorizationURL(state: string, scopes: string[]): URL;
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/bungie.js

@@ -1,5 +1,5 @@
 import { OAuth2Client } from "../client.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, OAuthConfigurationError, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveProviderOption, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, OAuthConfigurationError, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveProviderOption, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.bungie.net/en/oauth/authorize";
 const tokenEndpoint = "https://www.bungie.net/platform/app/oauth/token";
 const userEndpoint = "https://www.bungie.net/platform/User/GetCurrentBungieNetUser/";
@@ -36,16 +36,17 @@ export class Bungie {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         if (this.apiKey === null) {
             throw new OAuthConfigurationError("Missing 'apiKey': pass it in the constructor options or set BUNGIE_API_KEY");
         }
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const body = await fetchUserProfile(userEndpoint, tokens.accessToken(), {
             "X-API-Key": this.apiKey
@@ -66,7 +67,9 @@ export class Bungie {
             id: profileId(user.membershipId),
             name: profileString(user.cachedBungieGlobalDisplayName) ?? profileString(user.displayName),
             email: null,
-            image
+            image,
+            raw: user,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/coinbase.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface CoinbaseOptions extends ProviderOptions {
 }
 export declare class Coinbase {
@@ -13,6 +13,6 @@ export declare class Coinbase {
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
     revokeToken(token: string): Promise<void>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/coinbase.js

@@ -1,5 +1,5 @@
 import { createOAuth2Request, sendTokenRequest, sendTokenRevocationRequest } from "../request.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.coinbase.com/oauth/authorize";
 const tokenEndpoint = "https://www.coinbase.com/oauth/token";
 const tokenRevocationEndpoint = "https://api.coinbase.com/oauth/revoke";
@@ -71,13 +71,14 @@ export class Coinbase {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const body = await fetchUserProfile(userEndpoint, tokens.accessToken());
         const profile = body.data;
@@ -89,7 +90,9 @@ export class Coinbase {
             id: profileId(user.id),
             name: profileString(user.name) ?? profileString(user.username),
             email: profileString(user.email),
-            image: profileString(user.avatar_url)
+            image: profileString(user.avatar_url),
+            raw: user,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/discord.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface DiscordOptions extends ProviderOptions {
 }
 export declare class Discord {
@@ -11,6 +11,6 @@ export declare class Discord {
     validateAuthorizationCode(code: string, codeVerifier: string | null): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
     revokeToken(token: string): Promise<void>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/discord.js

@@ -1,5 +1,5 @@
 import { CodeChallengeMethod, OAuth2Client } from "../client.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthCodeVerifier, generateOAuthState, InvalidOAuthCallbackError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthCodeVerifier, generateOAuthState, InvalidOAuthCallbackError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://discord.com/oauth2/authorize";
 const tokenEndpoint = "https://discord.com/api/oauth2/token";
 const tokenRevocationEndpoint = "https://discord.com/api/oauth2/token/revoke";
@@ -44,13 +44,14 @@ export class Discord {
         const state = generateOAuthState();
         const codeVerifier = generateOAuthCodeVerifier();
         const url = await this.createAuthorizationURL(state, codeVerifier, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, { codeVerifier });
-        return url;
+        const payload = { codeVerifier };
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        const stored = await consumeOAuthState(auth.store, state);
+        const stored = await resolveOAuthState(auth.store, state, saved);
         if (typeof stored.codeVerifier !== "string") {
             throw new InvalidOAuthCallbackError("Missing PKCE code verifier for OAuth state");
         }
@@ -62,7 +63,9 @@ export class Discord {
             id,
             name: profileString(profile.global_name) ?? profileString(profile.username),
             email: profileString(profile.email),
-            image: avatar === null ? null : `https://cdn.discordapp.com/avatars/${id}/${avatar}.png`
+            image: avatar === null ? null : `https://cdn.discordapp.com/avatars/${id}/${avatar}.png`,
+            raw: profile,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/donation-alerts.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface DonationAlertsOptions extends ProviderOptions {
 }
 export declare class DonationAlerts {
@@ -12,6 +12,6 @@ export declare class DonationAlerts {
     createAuthorizationURL(scopes: string[]): URL;
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string, scopes: string[]): Promise<OAuth2Tokens>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/donation-alerts.js

@@ -1,5 +1,5 @@
 import { createOAuth2Request, sendTokenRequest } from "../request.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.donationalerts.com/oauth/authorize";
 const tokenEndpoint = "https://www.donationalerts.com/oauth/token";
 const userEndpoint = "https://www.donationalerts.com/api/v1/user/oauth";
@@ -62,13 +62,14 @@ export class DonationAlerts {
         const url = this.createAuthorizationURL(resolveScopes(scopes, auth, defaultScopes));
         // The legacy URL builder does not take a state parameter.
         url.searchParams.set("state", state);
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const body = await fetchUserProfile(userEndpoint, tokens.accessToken());
         const profile = body.data;
@@ -80,7 +81,9 @@ export class DonationAlerts {
             id: profileId(user.id),
             name: profileString(user.name) ?? profileString(user.code),
             email: profileString(user.email),
-            image: profileString(user.avatar)
+            image: profileString(user.avatar),
+            raw: user,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/dribbble.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface DribbbleOptions extends ProviderOptions {
 }
 export declare class Dribbble {
@@ -11,6 +11,6 @@ export declare class Dribbble {
     constructor(clientId: string, clientSecret: string, redirectURI: string);
     createAuthorizationURL(state: string, scopes: string[]): URL;
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/dribbble.js

@@ -1,5 +1,5 @@
 import { createOAuth2Request, sendTokenRequest } from "../request.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://dribbble.com/oauth/authorize";
 const tokenEndpoint = "https://dribbble.com/oauth/token";
 const userEndpoint = "https://api.dribbble.com/v2/user";
@@ -53,13 +53,14 @@ export class Dribbble {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const profile = await fetchUserProfile(userEndpoint, tokens.accessToken());
         return {
@@ -67,7 +68,9 @@ export class Dribbble {
             name: profileString(profile.name) ?? profileString(profile.login),
             // The v2 user endpoint does not expose an email address.
             email: null,
-            image: profileString(profile.avatar_url)
+            image: profileString(profile.avatar_url),
+            raw: profile,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/dropbox.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface DropboxOptions extends ProviderOptions {
 }
 export declare class Dropbox {
@@ -11,6 +11,6 @@ export declare class Dropbox {
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
     revokeToken(token: string): Promise<void>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/dropbox.js

@@ -1,5 +1,5 @@
 import { OAuth2Client } from "../client.js";
-import { consumeOAuthState, generateOAuthState, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, generateOAuthState, OAuthProviderError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.dropbox.com/oauth2/authorize";
 const tokenEndpoint = "https://api.dropboxapi.com/oauth2/token";
 const tokenRevocationEndpoint = "https://api.dropboxapi.com/2/auth/token/revoke";
@@ -40,13 +40,14 @@ export class Dropbox {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const profile = await fetchCurrentAccount(tokens.accessToken());
         let name = null;
@@ -57,7 +58,9 @@ export class Dropbox {
             id: profileId(profile.account_id),
             name,
             email: profileString(profile.email),
-            image: profileString(profile.profile_photo_url)
+            image: profileString(profile.profile_photo_url),
+            raw: profile,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/epicgames.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface EpicGamesOptions extends ProviderOptions {
 }
 export declare class EpicGames {
@@ -11,6 +11,6 @@ export declare class EpicGames {
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
     revokeToken(token: string): Promise<void>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/epicgames.js

@@ -1,5 +1,5 @@
 import { OAuth2Client } from "../client.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.epicgames.com/id/authorize";
 const tokenEndpoint = "https://api.epicgames.dev/epic/oauth/v2/token";
 const tokenRevocationEndpoint = "https://api.epicgames.dev/epic/oauth/v2/revoke";
@@ -40,13 +40,14 @@ export class EpicGames {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const claims = await fetchUserProfile(userinfoEndpoint, tokens.accessToken());
         return {
@@ -54,7 +55,9 @@ export class EpicGames {
             name: profileString(claims.preferred_username),
             // Epic Games does not expose user emails or avatars.
             email: null,
-            image: null
+            image: null,
+            raw: claims,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/etsy.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface EtsyOptions extends ProviderOptions {
 }
 export declare class Etsy {
@@ -10,6 +10,6 @@ export declare class Etsy {
     createAuthorizationURL(state: string, codeVerifier: string, scopes: string[]): Promise<URL>;
     validateAuthorizationCode(code: string, codeVerifier: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/etsy.js

@@ -1,5 +1,5 @@
 import { CodeChallengeMethod, OAuth2Client } from "../client.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthCodeVerifier, generateOAuthState, InvalidOAuthCallbackError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthCodeVerifier, generateOAuthState, InvalidOAuthCallbackError, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.etsy.com/oauth/connect";
 const tokenEndpoint = "https://api.etsy.com/v3/public/oauth/token";
 const meEndpoint = "https://openapi.etsy.com/v3/application/users/me";
@@ -35,13 +35,14 @@ export class Etsy {
         const state = generateOAuthState();
         const codeVerifier = generateOAuthCodeVerifier();
         const url = await this.createAuthorizationURL(state, codeVerifier, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, { codeVerifier });
-        return url;
+        const payload = { codeVerifier };
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        const stored = await consumeOAuthState(auth.store, state);
+        const stored = await resolveOAuthState(auth.store, state, saved);
         if (typeof stored.codeVerifier !== "string") {
             throw new InvalidOAuthCallbackError("Missing PKCE code verifier for OAuth state");
         }
@@ -62,7 +63,9 @@ export class Etsy {
             id: userId,
             name,
             email: profileString(profile.primary_email),
-            image: profileString(profile.image_url_75x75)
+            image: profileString(profile.image_url_75x75),
+            raw: profile,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/facebook.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface FacebookOptions extends ProviderOptions {
 }
 export declare class Facebook {
@@ -11,6 +11,6 @@ export declare class Facebook {
     constructor(clientId: string, clientSecret: string, redirectURI: string);
     createAuthorizationURL(state: string, scopes: string[]): URL;
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/facebook.js

@@ -1,5 +1,5 @@
 import { createOAuth2Request, sendTokenRequest } from "../request.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.facebook.com/v16.0/dialog/oauth";
 const tokenEndpoint = "https://graph.facebook.com/v16.0/oauth/access_token";
 const userEndpoint = "https://graph.facebook.com/v16.0/me";
@@ -52,13 +52,14 @@ export class Facebook {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const url = new URL(userEndpoint);
         url.searchParams.set("fields", "id,name,email,picture.width(256)");
@@ -74,7 +75,9 @@ export class Facebook {
             id: profileId(profile.id),
             name: profileString(profile.name),
             email: profileString(profile.email),
-            image
+            image,
+            raw: profile,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/figma.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface FigmaOptions extends ProviderOptions {
 }
 export declare class Figma {
@@ -10,6 +10,6 @@ export declare class Figma {
     createAuthorizationURL(state: string, scopes: string[]): URL;
     validateAuthorizationCode(code: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }

package/dist/providers/figma.js

@@ -1,5 +1,5 @@
 import { OAuth2Client } from "../client.js";
-import { consumeOAuthState, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveScopes, saveOAuthState } from "../auth.js";
+import { extractOAuthTokens, fetchUserProfile, generateOAuthState, parseCallbackQuery, profileId, profileString, requireAuthConfig, resolveAuthConfig, resolveOAuthState, resolveScopes, saveOAuthState } from "../auth.js";
 const authorizationEndpoint = "https://www.figma.com/oauth";
 const tokenEndpoint = "https://api.figma.com/v1/oauth/token";
 const refreshEndpoint = "https://api.figma.com/v1/oauth/refresh";
@@ -37,20 +37,23 @@ export class Figma {
         const auth = requireAuthConfig(this.auth);
         const state = generateOAuthState();
         const url = this.createAuthorizationURL(state, resolveScopes(scopes, auth, defaultScopes));
-        await saveOAuthState(auth.store, state, {});
-        return url;
+        const payload = {};
+        await saveOAuthState(auth.store, state, payload);
+        return { url, state, payload };
     }
-    async getUser(query) {
+    async getUser(query, saved) {
         const auth = requireAuthConfig(this.auth);
         const { code, state } = parseCallbackQuery(query);
-        await consumeOAuthState(auth.store, state);
+        await resolveOAuthState(auth.store, state, saved);
         const tokens = await this.validateAuthorizationCode(code);
         const profile = await fetchUserProfile(userEndpoint, tokens.accessToken());
         return {
             id: profileId(profile.id),
             name: profileString(profile.handle),
             email: profileString(profile.email),
-            image: profileString(profile.img_url)
+            image: profileString(profile.img_url),
+            raw: profile,
+            ...extractOAuthTokens(tokens)
         };
     }
 }

package/dist/providers/gitea.d.ts

@@ -1,5 +1,5 @@
 import type { OAuth2Tokens } from "../oauth2.js";
-import type { OAuthCallbackQuery, OAuthUser, ProviderOptions } from "../auth.js";
+import type { AuthorizationRequest, OAuthCallbackQuery, OAuthUser, ProviderOptions, SavedOAuthState } from "../auth.js";
 export interface GiteaOptions extends ProviderOptions {
     baseURL?: string;
 }
@@ -14,6 +14,6 @@ export declare class Gitea {
     createAuthorizationURL(state: string, codeVerifier: string, scopes: string[]): Promise<URL>;
     validateAuthorizationCode(code: string, codeVerifier: string): Promise<OAuth2Tokens>;
     refreshAccessToken(refreshToken: string): Promise<OAuth2Tokens>;
-    getAuthorizationURL(scopes?: string[]): Promise<URL>;
-    getUser(query: OAuthCallbackQuery): Promise<OAuthUser>;
+    getAuthorizationURL(scopes?: string[]): Promise<AuthorizationRequest>;
+    getUser(query: OAuthCallbackQuery, saved?: SavedOAuthState): Promise<OAuthUser>;
 }