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

package/src/social-providers/paybin.ts

@@ -36,6 +36,8 @@ export const paybin = (options: PaybinOptions) => {
 	return {
 		id: "paybin",
 		name: "Paybin",
+		accountSubject: ({ profile }) => profile.sub,
+		accountIssuer: issuer,
 		async createAuthorizationURL({
 			state,
 			scopes,
@@ -105,7 +107,6 @@ export const paybin = (options: PaybinOptions) => {
 			const userMap = await options.mapProfileToUser?.(user);
 			return {
 				user: {
-					id: user.sub,
 					name: user.name || user.preferred_username || "",
 					email: user.email,
 					image: user.picture,

package/src/social-providers/paypal.ts

@@ -79,6 +79,7 @@ export const paypal = (options: PayPalOptions) => {
 	return {
 		id: "paypal",
 		name: "PayPal",
+		accountSubject: ({ profile }) => profile.user_id,
 		async createAuthorizationURL({
 			state,
 			codeVerifier,
@@ -252,7 +253,6 @@ export const paypal = (options: PayPalOptions) => {
 
 				const result = {
 					user: {
-						id: userInfo.user_id,
 						name: userInfo.name,
 						email: userInfo.email,
 						image: userInfo.picture,

package/src/social-providers/polar.ts

@@ -37,6 +37,7 @@ export const polar = (options: PolarOptions) => {
 	return {
 		id: "polar",
 		name: "Polar",
+		accountSubject: ({ profile }) => profile.id,
 		createAuthorizationURL({
 			state,
 			scopes,
@@ -103,7 +104,6 @@ export const polar = (options: PolarOptions) => {
 			// We check for it first, then default to false for security consistency.
 			return {
 				user: {
-					id: profile.id,
 					name: profile.public_name || profile.username || "",
 					email: profile.email,
 					image: profile.avatar_url,

package/src/social-providers/railway.ts

@@ -29,6 +29,7 @@ export const railway = (options: RailwayOptions) => {
 	return {
 		id: "railway",
 		name: "Railway",
+		accountSubject: ({ profile }) => profile.sub,
 		createAuthorizationURL({
 			state,
 			scopes,
@@ -92,7 +93,6 @@ export const railway = (options: RailwayOptions) => {
 			// We default to false for security consistency.
 			return {
 				user: {
-					id: profile.sub,
 					name: profile.name,
 					email: profile.email,
 					image: profile.picture,

package/src/social-providers/reddit.ts

@@ -25,6 +25,7 @@ export const reddit = (options: RedditOptions) => {
 	return {
 		id: "reddit",
 		name: "Reddit",
+		accountSubject: ({ profile }) => profile.id,
 		createAuthorizationURL({ state, scopes, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : ["identity"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -112,7 +113,6 @@ export const reddit = (options: RedditOptions) => {
 			const email = userMap?.email || `${profile.id}@reddit.invalid`;
 			return {
 				user: {
-					id: profile.id,
 					name: profile.name,
 					image: profile.icon_img?.split("?")[0]!,
 					...userMap,

package/src/social-providers/roblox.ts

@@ -41,6 +41,7 @@ export const roblox = (options: RobloxOptions) => {
 	return {
 		id: "roblox",
 		name: "Roblox",
+		accountSubject: ({ profile }) => profile.sub,
 		createAuthorizationURL({ state, scopes, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : ["openid", "profile"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -100,7 +101,6 @@ export const roblox = (options: RobloxOptions) => {
 			// We default to false for security consistency.
 			return {
 				user: {
-					id: profile.sub,
 					name: profile.nickname || profile.preferred_username || "",
 					image: profile.picture,
 					email: profile.preferred_username || null, // Roblox does not provide email

package/src/social-providers/salesforce.ts

@@ -63,6 +63,7 @@ export const salesforce = (options: SalesforceOptions) => {
 	return {
 		id: "salesforce",
 		name: "Salesforce",
+		accountSubject: ({ profile }) => profile.user_id,
 
 		async createAuthorizationURL({
 			state,
@@ -146,7 +147,6 @@ export const salesforce = (options: SalesforceOptions) => {
 
 				return {
 					user: {
-						id: user.user_id,
 						name: user.name,
 						email: user.email,
 						image: user.photos?.picture || user.photos?.thumbnail,

package/src/social-providers/slack.ts

@@ -46,6 +46,7 @@ export const slack = (options: SlackOptions) => {
 	return {
 		id: "slack",
 		name: "Slack",
+		accountSubject: ({ profile }) => profile["https://slack.com/user_id"],
 		createAuthorizationURL({ state, scopes, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope
 				? []
@@ -103,7 +104,6 @@ export const slack = (options: SlackOptions) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile["https://slack.com/user_id"],
 					name: profile.name || "",
 					email: profile.email,
 					emailVerified: profile.email_verified,

package/src/social-providers/spotify.ts

@@ -24,6 +24,7 @@ export const spotify = (options: SpotifyOptions) => {
 	return {
 		id: "spotify",
 		name: "Spotify",
+		accountSubject: ({ profile }) => profile.id,
 		createAuthorizationURL({
 			state,
 			scopes,
@@ -86,7 +87,6 @@ export const spotify = (options: SpotifyOptions) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.id,
 					name: profile.display_name,
 					email: profile.email,
 					image: profile.images[0]?.url,

package/src/social-providers/tiktok.ts

@@ -123,7 +123,7 @@ export interface TiktokProfile extends Record<string, any> {
 		| undefined;
 }
 
-export interface TiktokOptions extends ProviderOptions {
+export interface TiktokOptions extends ProviderOptions<TiktokProfile> {
 	// Client ID is not used in TikTok, we delete it from the options
 	clientId?: never | undefined;
 	clientSecret: string;
@@ -135,6 +135,7 @@ export const tiktok = (options: TiktokOptions) => {
 	return {
 		id: "tiktok",
 		name: "TikTok",
+		accountSubject: ({ profile }) => profile.data.user.open_id,
 		createAuthorizationURL({ state, scopes, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : ["user.info.profile"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -210,7 +211,6 @@ export const tiktok = (options: TiktokOptions) => {
 			return {
 				user: {
 					email: profile.data.user.email || profile.data.user.username,
-					id: profile.data.user.open_id,
 					name:
 						profile.data.user.display_name || profile.data.user.username || "",
 					image: profile.data.user.avatar_large_url,

package/src/social-providers/twitch.ts

@@ -42,6 +42,7 @@ export const twitch = (options: TwitchOptions) => {
 	return {
 		id: "twitch",
 		name: "Twitch",
+		accountSubject: ({ profile }) => profile.sub,
 		createAuthorizationURL({ state, scopes, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope
 				? []
@@ -98,7 +99,6 @@ export const twitch = (options: TwitchOptions) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.sub,
 					name: profile.preferred_username,
 					email: profile.email,
 					image: profile.picture,

package/src/social-providers/twitter.ts

@@ -108,6 +108,7 @@ export const twitter = (options: TwitterOption) => {
 	return {
 		id: "twitter",
 		name: "Twitter",
+		accountSubject: ({ profile }) => profile.data.id,
 		createAuthorizationURL(data) {
 			const _scopes = options.disableDefaultScope
 				? []
@@ -185,7 +186,6 @@ export const twitter = (options: TwitterOption) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.data.id,
 					name: profile.data.name,
 					email: profile.data.email || profile.data.username || null,
 					image: profile.data.profile_image_url,

package/src/social-providers/vercel.ts

@@ -20,6 +20,7 @@ export const vercel = (options: VercelOptions) => {
 	return {
 		id: "vercel",
 		name: "Vercel",
+		accountSubject: ({ profile }) => profile.sub,
 		createAuthorizationURL({
 			state,
 			scopes,
@@ -79,7 +80,6 @@ export const vercel = (options: VercelOptions) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.sub,
 					name: profile.name ?? profile.preferred_username ?? "",
 					email: profile.email,
 					image: profile.picture,

package/src/social-providers/vk.ts

@@ -20,7 +20,7 @@ export interface VkProfile {
 	};
 }
 
-export interface VkOption extends ProviderOptions {
+export interface VkOption extends ProviderOptions<VkProfile> {
 	clientId: string;
 	scheme?: ("light" | "dark") | undefined;
 }
@@ -30,6 +30,7 @@ export const vk = (options: VkOption) => {
 	return {
 		id: "vk",
 		name: "VK",
+		accountSubject: ({ profile }) => profile.user.user_id,
 		async createAuthorizationURL({
 			state,
 			scopes,
@@ -113,7 +114,6 @@ export const vk = (options: VkOption) => {
 
 			return {
 				user: {
-					id: profile.user.user_id,
 					first_name: profile.user.first_name,
 					last_name: profile.user.last_name,
 					email: profile.user.email,

package/src/social-providers/wechat.ts

@@ -59,6 +59,7 @@ export const wechat = (options: WeChatOptions) => {
 	return {
 		id: "wechat",
 		name: "WeChat",
+		accountSubject: ({ profile }) => profile.unionid || profile.openid,
 		createAuthorizationURL({ state, scopes, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : ["snsapi_login"];
 			options.scope && _scopes.push(...options.scope);
@@ -206,7 +207,6 @@ export const wechat = (options: WeChatOptions) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.unionid || profile.openid || openid,
 					name: profile.nickname,
 					// WeChat does not return an email, and the OAuth callback rejects a
 					// missing one, so the default sign-in would always fail. Synthesize a

package/src/social-providers/zoom.ts

@@ -152,6 +152,7 @@ export const zoom = (userOptions: ZoomOptions) => {
 	return {
 		id: "zoom",
 		name: "Zoom",
+		accountSubject: ({ profile }) => profile.id,
 		createAuthorizationURL: async ({
 			state,
 			redirectURI,
@@ -210,7 +211,6 @@ export const zoom = (userOptions: ZoomOptions) => {
 
 			return {
 				user: {
-					id: profile.id,
 					name: profile.display_name,
 					image: profile.pic_url,
 					email: profile.email,

package/src/types/context.ts

@@ -9,6 +9,7 @@ import type {
 	Verification,
 } from "../db";
 import type { DBAdapter, Where } from "../db/adapter";
+import type { AccountKey } from "../db/schema/account";
 import type { createLogger } from "../env";
 import type { OAuthProvider } from "../oauth2";
 import type { BetterAuthCookie, BetterAuthCookies } from "./cookie";
@@ -132,6 +133,9 @@ export interface InternalAdapter<
 		dontRememberMe?: boolean | undefined,
 		override?: (Partial<Session> & Record<string, any>) | undefined,
 		overrideAll?: boolean | undefined,
+		storageOptions?:
+			| { deferSecondaryStorageWrites?: boolean | undefined }
+			| undefined,
 	): Promise<Session>;
 
 	findSession(token: string): Promise<{
@@ -160,7 +164,7 @@ export interface InternalAdapter<
 	/**
 	 * Delete an account by its primary key.
 	 *
-	 * @param id - The account row's primary key (the `id` column, not the `accountId` column).
+	 * @param id - The account row's primary key, not its provider account ID.
 	 */
 	deleteAccount(id: string): Promise<void>;
 
@@ -174,15 +178,18 @@ export interface InternalAdapter<
 	 */
 	deleteSessions(sessionTokens: string[]): Promise<void>;
 
-	findOAuthUser(
-		email: string,
-		accountId: string,
-		providerId: string,
-	): Promise<{
-		user: User;
-		linkedAccount: Account | null;
-		accounts: Account[];
-	} | null>;
+	findAccountOwnerByKey(accountKey: AccountKey): Promise<
+		| {
+				kind: "owned";
+				user: User;
+				account: Account;
+		  }
+		| {
+				kind: "orphaned";
+				account: Account;
+		  }
+		| null
+	>;
 
 	findUserByEmail(
 		email: string,
@@ -210,10 +217,10 @@ export interface InternalAdapter<
 
 	findAccounts(userId: string): Promise<Account[]>;
 
-	findAccountByProviderId(
-		accountId: string,
-		providerId: string,
-	): Promise<Account | null>;
+	/** Find the credential account whose stable local subject is the user ID. */
+	findCredentialAccount(userId: string): Promise<Account | null>;
+
+	findAccountByKey(accountKey: AccountKey): Promise<Account | null>;
 
 	findAccountByUserId(userId: string): Promise<Account[]>;
 

package/src/types/init-options.ts

@@ -454,6 +454,21 @@ export type BetterAuthAdvancedOptions = {
 				 * function.
 				 */
 				generateId?: GenerateIdFn | false | "serial" | "uuid";
+				/**
+				 * Enable database joins for adapters that support them.
+				 *
+				 * When disabled (default), related data is fetched via
+				 * separate queries. When enabled, adapters that support
+				 * native joins use them; otherwise Better Auth falls back
+				 * to separate queries.
+				 *
+				 * Please read the adapter documentation for more
+				 * information regarding joins before enabling this.
+				 * Not all adapters support joins.
+				 *
+				 * @default false
+				 */
+				joins?: boolean;
 		  }
 		| undefined;
 	/**
@@ -1783,18 +1798,4 @@ export type BetterAuthOptions = {
 				debug?: boolean;
 		  }
 		| undefined;
-	/**
-	 * Experimental features
-	 */
-	experimental?: {
-		/**
-		 * Enable experimental joins for your database adapter.
-		 *
-		 * 	Please read the adapter documentation for more information regarding joins before enabling this.
-		 * 	Not all adapters support joins.
-		 *
-		 * @default false
-		 */
-		joins?: boolean;
-	};
 };