@better-auth/core 1.7.0-rc.1 → 1.7.0-rc.3

package/dist/social-providers/dropbox.d.mts

@@ -1,4 +1,5 @@
-import { OAuth2Tokens, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import { OAuth2Tokens, OAuth2UserInfo, OAuthAccountKeyContext, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 //#region src/social-providers/dropbox.d.ts
 interface DropboxProfile {
   account_id: string;
@@ -20,13 +21,8 @@ interface DropboxOptions extends ProviderOptions<DropboxProfile> {
 declare const dropbox: (options: DropboxOptions) => {
   id: "dropbox";
   name: string;
-  createAuthorizationURL: ({
-    state,
-    scopes,
-    codeVerifier,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<DropboxProfile>) => string;
+  createAuthorizationURL: ({ state, scopes, codeVerifier, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -36,11 +32,7 @@ declare const dropbox: (options: DropboxOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }) => Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    codeVerifier,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, codeVerifier, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -57,15 +49,8 @@ declare const dropbox: (options: DropboxOptions) => {
       email?: string;
     } | undefined;
   }): Promise<{
-    user: {
-      id: string;
-      name?: string;
-      email?: string | null;
-      image?: string;
-      emailVerified: boolean;
-      [key: string]: any;
-    };
-    data: any;
+    user: OAuth2UserInfo & Record<string, unknown>;
+    data: DropboxProfile;
   } | null>;
   options: DropboxOptions;
 };

package/dist/social-providers/dropbox.mjs

@@ -8,6 +8,7 @@ const dropbox = (options) => {
 	return {
 		id: "dropbox",
 		name: "Dropbox",
+		accountSubject: ({ profile }) => profile.account_id,
 		createAuthorizationURL: async ({ state, scopes, codeVerifier, redirectURI, additionalParams }) => {
 			const _scopes = options.disableDefaultScope ? [] : ["account_info.read"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -56,7 +57,6 @@ const dropbox = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.account_id,
 					name: profile.name?.display_name,
 					email: profile.email,
 					emailVerified: profile.email_verified || false,

package/dist/social-providers/facebook.d.mts

@@ -1,8 +1,7 @@
-import { OAuth2Tokens, ProviderOptions } from "../oauth2/oauth-provider.mjs";
-import * as jose from "jose";
-
+import { OAuth2Tokens, OAuth2UserInfo, OAuthAccountKeyContext, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 //#region src/social-providers/facebook.d.ts
-interface FacebookProfile {
+interface FacebookGraphProfile {
   id: string;
   name: string;
   email?: string;
@@ -16,6 +15,13 @@ interface FacebookProfile {
     };
   };
 }
+interface FacebookLimitedLoginProfile {
+  sub: string;
+  email: string;
+  name: string;
+  picture: string;
+}
+type FacebookProfile = FacebookGraphProfile | FacebookLimitedLoginProfile;
 interface FacebookOptions extends ProviderOptions<FacebookProfile> {
   clientId: string | string[];
   /**
@@ -32,13 +38,9 @@ interface FacebookOptions extends ProviderOptions<FacebookProfile> {
 declare const facebook: (options: FacebookOptions) => {
   id: "facebook";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    redirectURI,
-    loginHint,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<FacebookProfile>) => string;
+  accountIssuer: string;
+  createAuthorizationURL({ state, scopes, redirectURI, loginHint, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -48,10 +50,7 @@ declare const facebook: (options: FacebookOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -59,12 +58,12 @@ declare const facebook: (options: FacebookOptions) => {
   }) => Promise<OAuth2Tokens>;
   idToken: {
     jwks: {
-      (protectedHeader?: jose.JWSHeaderParameters, token?: jose.FlattenedJWSInput): Promise<jose.CryptoKey>;
+      (protectedHeader?: import("jose").JWSHeaderParameters, token?: import("jose").FlattenedJWSInput): Promise<import("jose").CryptoKey>;
       coolingDown: boolean;
       fresh: boolean;
       reloading: boolean;
       reload: () => Promise<void>;
-      jwks: () => jose.JSONWebKeySet | undefined;
+      jwks: () => import("jose").JSONWebKeySet | undefined;
     };
     issuer: string;
     audience: string | string[];
@@ -82,17 +81,10 @@ declare const facebook: (options: FacebookOptions) => {
       email?: string;
     } | undefined;
   }): Promise<{
-    user: {
-      id: string;
-      name?: string;
-      email?: string | null;
-      image?: string;
-      emailVerified: boolean;
-      [key: string]: any;
-    };
-    data: any;
+    user: OAuth2UserInfo & Record<string, unknown>;
+    data: FacebookProfile;
   } | null>;
   options: FacebookOptions;
 };
 //#endregion
-export { FacebookOptions, FacebookProfile, facebook };
+export { FacebookGraphProfile, FacebookLimitedLoginProfile, FacebookOptions, FacebookProfile, facebook };

package/dist/social-providers/facebook.mjs

@@ -39,6 +39,8 @@ const facebook = (options) => {
 	return {
 		id: "facebook",
 		name: "Facebook",
+		accountSubject: ({ profile }) => "sub" in profile ? profile.sub : profile.id,
+		accountIssuer: "https://www.facebook.com",
 		async createAuthorizationURL({ state, scopes, redirectURI, loginHint, additionalParams }) {
 			if (!getPrimaryClientId(options.clientId) || !options.clientSecret) {
 				logger.error("Client ID and client secret are required for Facebook. Make sure to provide them in the options.");
@@ -91,24 +93,12 @@ const facebook = (options) => {
 			if (options.getUserInfo) return options.getUserInfo(token);
 			if (token.idToken && token.idToken.split(".").length === 3) {
 				const profile = decodeJwt(token.idToken);
-				const user = {
-					id: profile.sub,
-					name: profile.name,
-					email: profile.email,
-					picture: { data: {
-						url: profile.picture,
-						height: 100,
-						width: 100,
-						is_silhouette: false
-					} }
-				};
-				const userMap = await options.mapProfileToUser?.({
-					...user,
-					email_verified: false
-				});
+				const userMap = await options.mapProfileToUser?.(profile);
 				return {
 					user: {
-						...user,
+						name: profile.name,
+						email: profile.email,
+						image: profile.picture,
 						emailVerified: false,
 						...userMap
 					},
@@ -134,7 +124,6 @@ const facebook = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.id,
 					name: profile.name,
 					email: profile.email,
 					image: profile.picture.data.url,

package/dist/social-providers/figma.d.mts

@@ -1,4 +1,5 @@
-import { OAuth2Tokens, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import { OAuth2Tokens, OAuth2UserInfo, OAuthAccountKeyContext, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 //#region src/social-providers/figma.d.ts
 interface FigmaProfile {
   id: string;
@@ -12,13 +13,8 @@ interface FigmaOptions extends ProviderOptions<FigmaProfile> {
 declare const figma: (options: FigmaOptions) => {
   id: "figma";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    codeVerifier,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<FigmaProfile>) => string;
+  createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -28,11 +24,7 @@ declare const figma: (options: FigmaOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    codeVerifier,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, codeVerifier, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -49,15 +41,8 @@ declare const figma: (options: FigmaOptions) => {
       email?: string;
     } | undefined;
   }): Promise<{
-    user: {
-      id: string;
-      name?: string;
-      email?: string | null;
-      image?: string;
-      emailVerified: boolean;
-      [key: string]: any;
-    };
-    data: any;
+    user: OAuth2UserInfo & Record<string, unknown>;
+    data: FigmaProfile;
   } | null>;
   options: FigmaOptions;
 };

package/dist/social-providers/figma.mjs

@@ -10,6 +10,7 @@ const figma = (options) => {
 	return {
 		id: "figma",
 		name: "Figma",
+		accountSubject: ({ profile }) => profile.id,
 		async createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }) {
 			if (!options.clientId || !options.clientSecret) {
 				logger.error("Client Id and Client Secret are required for Figma. Make sure to provide them in the options.");
@@ -63,7 +64,6 @@ const figma = (options) => {
 				const userMap = await options.mapProfileToUser?.(profile);
 				return {
 					user: {
-						id: profile.id,
 						name: profile.handle,
 						email: profile.email,
 						image: profile.img_url,

package/dist/social-providers/github.d.mts

@@ -1,4 +1,5 @@
-import { OAuth2Tokens, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import { OAuth2Tokens, OAuth2UserInfo, OAuthAccountKeyContext, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 //#region src/social-providers/github.d.ts
 interface GithubProfile {
   login: string;
@@ -52,14 +53,8 @@ interface GithubOptions extends ProviderOptions<GithubProfile> {
 declare const github: (options: GithubOptions) => {
   id: "github";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    loginHint,
-    codeVerifier,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<GithubProfile>) => string;
+  createAuthorizationURL({ state, scopes, loginHint, codeVerifier, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -69,11 +64,7 @@ declare const github: (options: GithubOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    codeVerifier,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, codeVerifier, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -90,15 +81,8 @@ declare const github: (options: GithubOptions) => {
       email?: string;
     } | undefined;
   }): Promise<{
-    user: {
-      id: string;
-      name?: string;
-      email?: string | null;
-      image?: string;
-      emailVerified: boolean;
-      [key: string]: any;
-    };
-    data: any;
+    user: OAuth2UserInfo & Record<string, unknown>;
+    data: GithubProfile;
   } | null>;
   options: GithubOptions;
 };

package/dist/social-providers/github.mjs

@@ -10,6 +10,7 @@ const github = (options) => {
 	return {
 		id: "github",
 		name: "GitHub",
+		accountSubject: ({ profile }) => profile.id,
 		createAuthorizationURL({ state, scopes, loginHint, codeVerifier, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : ["read:user", "user:email"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -76,7 +77,6 @@ const github = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.id,
 					name: profile.name || profile.login || "",
 					email: profile.email,
 					image: profile.avatar_url,

package/dist/social-providers/gitlab.d.mts

@@ -1,4 +1,5 @@
-import { OAuth2Tokens, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import { OAuth2Tokens, OAuth2UserInfo, OAuthAccountKeyContext, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 //#region src/social-providers/gitlab.d.ts
 interface GitlabProfile extends Record<string, any> {
   id: number;
@@ -52,14 +53,8 @@ interface GitlabOptions extends ProviderOptions<GitlabProfile> {
 declare const gitlab: (options: GitlabOptions) => {
   id: "gitlab";
   name: string;
-  createAuthorizationURL: ({
-    state,
-    scopes,
-    codeVerifier,
-    loginHint,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<GitlabProfile>) => number;
+  createAuthorizationURL: ({ state, scopes, codeVerifier, loginHint, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -69,11 +64,7 @@ declare const gitlab: (options: GitlabOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }) => Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    redirectURI,
-    codeVerifier
-  }: {
+  validateAuthorizationCode: ({ code, redirectURI, codeVerifier }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -90,35 +81,7 @@ declare const gitlab: (options: GitlabOptions) => {
       email?: string;
     } | undefined;
   }): Promise<{
-    user: {
-      id: string;
-      name?: string;
-      email?: string | null;
-      image?: string;
-      emailVerified: boolean;
-      [key: string]: any;
-    };
-    data: any;
-  } | {
-    user: {
-      id: number;
-      name: string;
-      email: string;
-      image: string;
-      emailVerified: boolean;
-    } | {
-      id: string | number;
-      name: string;
-      email: string | null;
-      image: string;
-      emailVerified: boolean;
-    } | {
-      id: string | number;
-      name: string;
-      email: string | null;
-      image: string;
-      emailVerified: boolean;
-    };
+    user: OAuth2UserInfo & Record<string, unknown>;
     data: GitlabProfile;
   } | null>;
   options: GitlabOptions;

package/dist/social-providers/gitlab.mjs

@@ -20,6 +20,7 @@ const gitlab = (options) => {
 	return {
 		id: issuerId,
 		name: "Gitlab",
+		accountSubject: ({ profile }) => profile.id,
 		createAuthorizationURL: async ({ state, scopes, codeVerifier, loginHint, redirectURI, additionalParams }) => {
 			const _scopes = options.disableDefaultScope ? [] : ["read_user"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -63,7 +64,6 @@ const gitlab = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.id,
 					name: profile.name ?? profile.username ?? "",
 					email: profile.email,
 					image: profile.avatar_url,

package/dist/social-providers/google.d.mts

@@ -1,7 +1,6 @@
-import { OAuth2Tokens, ProviderOptions } from "../oauth2/oauth-provider.mjs";
-import * as jose from "jose";
+import { OAuth2Tokens, OAuth2UserInfo, OAuthAccountKeyContext, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 import { JWTPayload } from "jose";
-
 //#region src/social-providers/google.d.ts
 interface GoogleProfile {
   aud: string;
@@ -69,11 +68,7 @@ interface VerifyGoogleIdTokenOptions {
  * Verifies a Google ID token against Google's issuer, audience, signature,
  * expiry, and maximum token age.
  */
-declare const verifyGoogleIdToken: ({
-  token,
-  audience,
-  nonce
-}: VerifyGoogleIdTokenOptions) => Promise<JWTPayload | null>;
+declare const verifyGoogleIdToken: ({ token, audience, nonce }: VerifyGoogleIdTokenOptions) => Promise<JWTPayload | null>;
 /**
  * Checks whether Google's verified `hd` claim satisfies the configured hosted
  * domain restriction. `hd: "*"` accepts any Google Workspace hosted domain.
@@ -82,15 +77,9 @@ declare const isGoogleHostedDomainAllowed: (configuredHostedDomain: string | und
 declare const google: (options: GoogleOptions) => {
   id: "google";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    codeVerifier,
-    redirectURI,
-    loginHint,
-    display,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<GoogleProfile>) => string;
+  accountIssuer: string;
+  createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, loginHint, display, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -100,11 +89,7 @@ declare const google: (options: GoogleOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    codeVerifier,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, codeVerifier, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -112,7 +97,7 @@ declare const google: (options: GoogleOptions) => {
   }) => Promise<OAuth2Tokens>;
   refreshAccessToken: (refreshToken: string) => Promise<OAuth2Tokens>;
   idToken: {
-    jwks: (header: jose.JWTHeaderParameters) => Promise<Uint8Array<ArrayBufferLike> | CryptoKey>;
+    jwks: (header: import("jose").JWTHeaderParameters) => Promise<Uint8Array<ArrayBufferLike> | CryptoKey>;
     issuer: string[];
     audience: string | string[];
     maxTokenAge: string;
@@ -128,15 +113,8 @@ declare const google: (options: GoogleOptions) => {
       email?: string;
     } | undefined;
   }): Promise<{
-    user: {
-      id: string;
-      name?: string;
-      email?: string | null;
-      image?: string;
-      emailVerified: boolean;
-      [key: string]: any;
-    };
-    data: any;
+    user: OAuth2UserInfo & Record<string, unknown>;
+    data: GoogleProfile;
   } | null>;
   options: GoogleOptions;
 };

package/dist/social-providers/google.mjs

@@ -53,6 +53,8 @@ const google = (options) => {
 	return {
 		id: "google",
 		name: "Google",
+		accountSubject: ({ profile }) => profile.sub,
+		accountIssuer: "https://accounts.google.com",
 		async createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, loginHint, display, additionalParams }) {
 			if (!getPrimaryClientId(options.clientId) || !options.clientSecret) {
 				logger.error("Client Id and Client Secret is required for Google. Make sure to provide them in the options.");
@@ -123,7 +125,6 @@ const google = (options) => {
 			const userMap = await options.mapProfileToUser?.(user);
 			return {
 				user: {
-					id: user.sub,
 					name: user.name,
 					email: user.email,
 					image: user.picture,

package/dist/social-providers/huggingface.d.mts

@@ -1,4 +1,5 @@
-import { OAuth2Tokens, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import { OAuth2Tokens, OAuth2UserInfo, OAuthAccountKeyContext, ProviderOptions } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 //#region src/social-providers/huggingface.d.ts
 interface HuggingFaceProfile {
   sub: string;
@@ -34,13 +35,8 @@ interface HuggingFaceOptions extends ProviderOptions<HuggingFaceProfile> {
 declare const huggingface: (options: HuggingFaceOptions) => {
   id: "huggingface";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    codeVerifier,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<HuggingFaceProfile>) => string;
+  createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -50,11 +46,7 @@ declare const huggingface: (options: HuggingFaceOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    codeVerifier,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, codeVerifier, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -71,15 +63,8 @@ declare const huggingface: (options: HuggingFaceOptions) => {
       email?: string;
     } | undefined;
   }): Promise<{
-    user: {
-      id: string;
-      name?: string;
-      email?: string | null;
-      image?: string;
-      emailVerified: boolean;
-      [key: string]: any;
-    };
-    data: any;
+    user: OAuth2UserInfo & Record<string, unknown>;
+    data: HuggingFaceProfile;
   } | null>;
   options: HuggingFaceOptions;
 };

package/dist/social-providers/huggingface.mjs

@@ -8,6 +8,7 @@ const huggingface = (options) => {
 	return {
 		id: "huggingface",
 		name: "Hugging Face",
+		accountSubject: ({ profile }) => profile.sub,
 		createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : [
 				"openid",
@@ -57,7 +58,6 @@ const huggingface = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.sub,
 					name: profile.name || profile.preferred_username || "",
 					email: profile.email,
 					image: profile.picture,