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

package/dist/social-providers/tiktok.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/tiktok.d.ts
 /**
  * [More info](https://developers.tiktok.com/doc/tiktok-api-v2-get-user-info/)
@@ -51,7 +52,8 @@ interface TiktokProfile extends Record<string, any> {
        *
        * To return this field, add `fields=username` in the user profile request's query parameter.
        */
-      username: string; /** @note Email is currently unsupported by TikTok  */
+      username: string;
+      /** @note Email is currently unsupported by TikTok  */
       email?: string | undefined;
       /**
        * User's bio description if there is a valid one.
@@ -113,7 +115,7 @@ interface TiktokProfile extends Record<string, any> {
     log_id?: string;
   } | undefined;
 }
-interface TiktokOptions extends ProviderOptions {
+interface TiktokOptions extends ProviderOptions<TiktokProfile> {
   clientId?: never | undefined;
   clientSecret: string;
   clientKey: string;
@@ -121,12 +123,8 @@ interface TiktokOptions extends ProviderOptions {
 declare const tiktok: (options: TiktokOptions) => {
   id: "tiktok";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<TiktokProfile>) => string;
+  createAuthorizationURL({ state, scopes, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -136,10 +134,7 @@ declare const tiktok: (options: TiktokOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): URL;
-  validateAuthorizationCode: ({
-    code,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -156,15 +151,8 @@ declare const tiktok: (options: TiktokOptions) => {
       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: TiktokProfile;
   } | null>;
   options: TiktokOptions;
 };

package/dist/social-providers/tiktok.mjs

@@ -8,6 +8,7 @@ const tiktok = (options) => {
 	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);
@@ -57,7 +58,6 @@ const tiktok = (options) => {
 			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,
 					emailVerified: false

package/dist/social-providers/twitch.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/twitch.d.ts
 /**
  * @see https://dev.twitch.tv/docs/authentication/getting-tokens-oidc/#requesting-claims
@@ -32,12 +33,8 @@ interface TwitchOptions extends ProviderOptions<TwitchProfile> {
 declare const twitch: (options: TwitchOptions) => {
   id: "twitch";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<TwitchProfile>) => string;
+  createAuthorizationURL({ state, scopes, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -47,10 +44,7 @@ declare const twitch: (options: TwitchOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    redirectURI
-  }: {
+  validateAuthorizationCode: ({ code, redirectURI }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -67,15 +61,8 @@ declare const twitch: (options: TwitchOptions) => {
       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: TwitchProfile;
   } | null>;
   options: TwitchOptions;
 };

package/dist/social-providers/twitch.mjs

@@ -9,6 +9,7 @@ const twitch = (options) => {
 	return {
 		id: "twitch",
 		name: "Twitch",
+		accountSubject: ({ profile }) => profile.sub,
 		createAuthorizationURL({ state, scopes, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : ["user:read:email", "openid"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -59,7 +60,6 @@ const twitch = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.sub,
 					name: profile.preferred_username,
 					email: profile.email,
 					image: profile.picture,

package/dist/social-providers/twitter.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/twitter.d.ts
 interface TwitterProfile {
   data: {
@@ -6,9 +7,12 @@ interface TwitterProfile {
      * Unique identifier of this user. This is returned as a string in order to avoid complications with languages and tools
      * that cannot handle large integers.
      */
-    id: string; /** The friendly name of this user, as shown on their profile. */
-    name: string; /** The email address of this user. */
-    email?: string | undefined; /** The Twitter handle (screen name) of this user. */
+    id: string;
+    /** The friendly name of this user, as shown on their profile. */
+    name: string;
+    /** The email address of this user. */
+    email?: string | undefined;
+    /** The Twitter handle (screen name) of this user. */
     username: string;
     /**
      * The location specified in the user's profile, if the user provided one.
@@ -23,15 +27,23 @@ interface TwitterProfile {
      *To return this field, add `user.fields=entities` in the authorization request's query parameter.
      */
     entities?: {
-      /** Contains details about the user's profile website. */url: {
-        /** Contains details about the user's profile website. */urls: Array<{
-          /** The start position (zero-based) of the recognized user's profile website. All start indices are inclusive. */start: number; /** The end position (zero-based) of the recognized user's profile website. This end index is exclusive. */
-          end: number; /** The URL in the format entered by the user. */
-          url: string; /** The fully resolved URL. */
-          expanded_url: string; /** The URL as displayed in the user's profile. */
+      /** Contains details about the user's profile website. */
+      url: {
+        /** Contains details about the user's profile website. */
+        urls: Array<{
+          /** The start position (zero-based) of the recognized user's profile website. All start indices are inclusive. */
+          start: number;
+          /** The end position (zero-based) of the recognized user's profile website. This end index is exclusive. */
+          end: number;
+          /** The URL in the format entered by the user. */
+          url: string;
+          /** The fully resolved URL. */
+          expanded_url: string;
+          /** The URL as displayed in the user's profile. */
           display_url: string;
         }>;
-      }; /** Contains details about URLs, Hashtags, Cashtags, or mentions located within a user's description. */
+      };
+      /** Contains details about URLs, Hashtags, Cashtags, or mentions located within a user's description. */
       description: {
         hashtags: Array<{
           start: number;
@@ -57,7 +69,8 @@ interface TwitterProfile {
      *
      * To return this field, add `user.fields=url` in the authorization request's query parameter.
      */
-    url?: string | undefined; /** The URL to the profile image for this user, as shown on the user's profile. */
+    url?: string | undefined;
+    /** The URL to the profile image for this user, as shown on the user's profile. */
     profile_image_url?: string | undefined;
     protected?: boolean | undefined;
     /**
@@ -82,6 +95,7 @@ interface TwitterOption extends ProviderOptions<TwitterProfile> {
 declare const twitter: (options: TwitterOption) => {
   id: "twitter";
   name: string;
+  accountSubject: ({ profile }: OAuthAccountKeyContext<TwitterProfile>) => string;
   createAuthorizationURL(data: {
     state: string;
     codeVerifier: string;
@@ -92,11 +106,7 @@ declare const twitter: (options: TwitterOption) => {
     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;
@@ -113,15 +123,8 @@ declare const twitter: (options: TwitterOption) => {
       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: TwitterProfile;
   } | null>;
   options: TwitterOption;
 };

package/dist/social-providers/twitter.mjs

@@ -8,6 +8,7 @@ const twitter = (options) => {
 	return {
 		id: "twitter",
 		name: "Twitter",
+		accountSubject: ({ profile }) => profile.data.id,
 		createAuthorizationURL(data) {
 			const _scopes = options.disableDefaultScope ? [] : [
 				"users.read",
@@ -69,7 +70,6 @@ const twitter = (options) => {
 			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/dist/social-providers/vercel.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/vercel.d.ts
 interface VercelProfile {
   sub: string;
@@ -14,13 +15,8 @@ interface VercelOptions extends ProviderOptions<VercelProfile> {
 declare const vercel: (options: VercelOptions) => {
   id: "vercel";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    codeVerifier,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<VercelProfile>) => string;
+  createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -30,11 +26,7 @@ declare const vercel: (options: VercelOptions) => {
     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;
@@ -50,15 +42,8 @@ declare const vercel: (options: VercelOptions) => {
       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: VercelProfile;
   } | null>;
   options: VercelOptions;
 };

package/dist/social-providers/vercel.mjs

@@ -7,6 +7,7 @@ const vercel = (options) => {
 	return {
 		id: "vercel",
 		name: "Vercel",
+		accountSubject: ({ profile }) => profile.sub,
 		createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }) {
 			if (!codeVerifier) throw new BetterAuthError("codeVerifier is required for Vercel");
 			let _scopes = void 0;
@@ -42,7 +43,6 @@ const vercel = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.sub,
 					name: profile.name ?? profile.preferred_username ?? "",
 					email: profile.email,
 					image: profile.picture,

package/dist/social-providers/vk.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/vk.d.ts
 interface VkProfile {
   user: {
@@ -13,20 +14,15 @@ interface VkProfile {
     birthday: string;
   };
 }
-interface VkOption extends ProviderOptions {
+interface VkOption extends ProviderOptions<VkProfile> {
   clientId: string;
   scheme?: ("light" | "dark") | undefined;
 }
 declare const vk: (options: VkOption) => {
   id: "vk";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    codeVerifier,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<VkProfile>) => string;
+  createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -36,12 +32,7 @@ declare const vk: (options: VkOption) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): Promise<URL>;
-  validateAuthorizationCode: ({
-    code,
-    codeVerifier,
-    redirectURI,
-    deviceId
-  }: {
+  validateAuthorizationCode: ({ code, codeVerifier, redirectURI, deviceId }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -58,15 +49,8 @@ declare const vk: (options: VkOption) => {
       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: VkProfile;
   } | null>;
   options: VkOption;
 };

package/dist/social-providers/vk.mjs

@@ -8,6 +8,7 @@ const vk = (options) => {
 	return {
 		id: "vk",
 		name: "VK",
+		accountSubject: ({ profile }) => profile.user.user_id,
 		async createAuthorizationURL({ state, scopes, codeVerifier, redirectURI, additionalParams }) {
 			const _scopes = options.disableDefaultScope ? [] : ["email", "phone"];
 			if (options.scope) _scopes.push(...options.scope);
@@ -47,21 +48,19 @@ const vk = (options) => {
 		async getUserInfo(data) {
 			if (options.getUserInfo) return options.getUserInfo(data);
 			if (!data.accessToken) return null;
-			const formBody = new URLSearchParams({
-				access_token: data.accessToken,
-				client_id: options.clientId
-			}).toString();
 			const { data: profile, error } = await betterFetch("https://id.vk.com/oauth2/user_info", {
 				method: "POST",
 				headers: { "Content-Type": "application/x-www-form-urlencoded" },
-				body: formBody
+				body: new URLSearchParams({
+					access_token: data.accessToken,
+					client_id: options.clientId
+				}).toString()
 			});
 			if (error) return null;
 			const userMap = await options.mapProfileToUser?.(profile);
 			if (!profile.user.email && !userMap?.email) return null;
 			return {
 				user: {
-					id: profile.user.user_id,
 					first_name: profile.user.first_name,
 					last_name: profile.user.last_name,
 					email: profile.user.email,

package/dist/social-providers/wechat.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/wechat.d.ts
 /**
  * WeChat user profile information
@@ -53,12 +54,8 @@ interface WeChatOptions extends ProviderOptions<WeChatProfile> {
 declare const wechat: (options: WeChatOptions) => {
   id: "wechat";
   name: string;
-  createAuthorizationURL({
-    state,
-    scopes,
-    redirectURI,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<WeChatProfile>) => string;
+  createAuthorizationURL({ state, scopes, redirectURI, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -68,9 +65,7 @@ declare const wechat: (options: WeChatOptions) => {
     idTokenNonce?: string | undefined;
     additionalParams?: Record<string, string> | undefined;
   }): URL;
-  validateAuthorizationCode: ({
-    code
-  }: {
+  validateAuthorizationCode: ({ code }: {
     code: string;
     redirectURI: string;
     codeVerifier?: string | undefined;
@@ -101,15 +96,8 @@ declare const wechat: (options: WeChatOptions) => {
       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: WeChatProfile;
   } | null>;
   options: WeChatOptions;
 };

package/dist/social-providers/wechat.mjs

@@ -5,6 +5,7 @@ const wechat = (options) => {
 	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);
@@ -70,7 +71,6 @@ const wechat = (options) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.unionid || profile.openid || openid,
 					name: profile.nickname,
 					email: profile.email || `${profile.unionid || profile.openid || openid}@wechat.invalid`,
 					image: profile.headimgurl,

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

@@ -1,10 +1,9 @@
-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/zoom.d.ts
-type LoginType = 0 /** Facebook OAuth */ | 1 /** Google OAuth */ | 24 /** Apple OAuth */ | 27 /** Microsoft OAuth */ | 97 /** Mobile device */ | 98 /** RingCentral OAuth */ | 99 /** API user */ | 100 /** Zoom Work email */ | 101;
-/** Single Sign-On (SSO) */
+type LoginType = 0 | /** Facebook OAuth */ 1 | /** Google OAuth */ 24 | /** Apple OAuth */ 27 | /** Microsoft OAuth */ 97 | /** Mobile device */ 98 | /** RingCentral OAuth */ 99 | /** API user */ 100 | /** Zoom Work email */ 101; /** Single Sign-On (SSO) */
 type AccountStatus = "pending" | "active" | "inactive";
-type PronounOption = 1 /** Ask the user every time */ | 2 /** Always display */ | 3;
-/** Do not display */
+type PronounOption = 1 | /** Ask the user every time */ 2 | /** Always display */ 3; /** Do not display */
 interface PhoneNumber {
   /** The country code of the phone number (Example: "+1") */
   code: string;
@@ -116,12 +115,8 @@ interface ZoomOptions extends ProviderOptions<ZoomProfile> {
 declare const zoom: (userOptions: ZoomOptions) => {
   id: "zoom";
   name: string;
-  createAuthorizationURL: ({
-    state,
-    redirectURI,
-    codeVerifier,
-    additionalParams
-  }: {
+  accountSubject: ({ profile }: OAuthAccountKeyContext<ZoomProfile>) => string;
+  createAuthorizationURL: ({ state, redirectURI, codeVerifier, additionalParams }: {
     state: string;
     codeVerifier: string;
     scopes?: string[] | undefined;
@@ -131,11 +126,7 @@ declare const zoom: (userOptions: ZoomOptions) => {
     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;
@@ -152,15 +143,8 @@ declare const zoom: (userOptions: ZoomOptions) => {
       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: ZoomProfile;
   } | null>;
 };
 //#endregion

package/dist/social-providers/zoom.mjs

@@ -11,6 +11,7 @@ const zoom = (userOptions) => {
 	return {
 		id: "zoom",
 		name: "Zoom",
+		accountSubject: ({ profile }) => profile.id,
 		createAuthorizationURL: async ({ state, redirectURI, codeVerifier, additionalParams }) => createAuthorizationURL({
 			id: "zoom",
 			options,
@@ -46,7 +47,6 @@ const zoom = (userOptions) => {
 			const userMap = await options.mapProfileToUser?.(profile);
 			return {
 				user: {
-					id: profile.id,
 					name: profile.display_name,
 					image: profile.pic_url,
 					email: profile.email,

package/dist/types/context.d.mts

@@ -7,12 +7,13 @@ import { createLogger } from "../env/logger.mjs";
 import { Awaitable, LiteralString } from "./helper.mjs";
 import { BetterAuthPlugin } from "./plugin.mjs";
 import { BetterAuthOptions, BetterAuthRateLimitOptions, UserProvisioningSource } from "./init-options.mjs";
-import { Account } from "../db/schema/account.mjs";
+import { Account, AccountKey } from "../db/schema/account.mjs";
+import "../db/index.mjs";
 import { BetterAuthCookie, BetterAuthCookies } from "./cookie.mjs";
 import { SecretConfig } from "./secret.mjs";
 import { OAuthProvider } from "../oauth2/oauth-provider.mjs";
+import "../oauth2/index.mjs";
 import { CookieOptions, EndpointContext } from "better-call";
-
 //#region src/types/context.d.ts
 /**
  * @internal
@@ -63,7 +64,6 @@ interface InternalAdapter<_Options extends BetterAuthOptions = BetterAuthOptions
    * Provisioning source. The creation seam adds `action: "create-user"` and
    * runs the `user.validateUserInfo` gate.
    */
-
   source: UserProvisioningSource): Promise<T & User>;
   createAccount<T extends Record<string, any>>(account: Omit<Account, "id" | "createdAt" | "updatedAt"> & Partial<Account> & T): Promise<T & Account>;
   listSessions(userId: string, options?: {
@@ -75,7 +75,9 @@ interface InternalAdapter<_Options extends BetterAuthOptions = BetterAuthOptions
   } | undefined, where?: Where[] | undefined): Promise<User[]>;
   countTotalUsers(where?: Where[] | undefined): Promise<number>;
   deleteUser(userId: string): Promise<void>;
-  createSession(userId: string, dontRememberMe?: boolean | undefined, override?: (Partial<Session> & Record<string, any>) | undefined, overrideAll?: boolean | undefined): Promise<Session>;
+  createSession(userId: string, dontRememberMe?: boolean | undefined, override?: (Partial<Session> & Record<string, any>) | undefined, overrideAll?: boolean | undefined, storageOptions?: {
+    deferSecondaryStorageWrites?: boolean | undefined;
+  } | undefined): Promise<Session>;
   findSession(token: string): Promise<{
     session: Session & Record<string, any>;
     user: User & Record<string, any>;
@@ -92,7 +94,7 @@ interface InternalAdapter<_Options extends BetterAuthOptions = BetterAuthOptions
   /**
    * 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>;
   /**
@@ -103,10 +105,13 @@ interface InternalAdapter<_Options extends BetterAuthOptions = BetterAuthOptions
    * Delete sessions by their session tokens.
    */
   deleteSessions(sessionTokens: string[]): Promise<void>;
-  findOAuthUser(email: string, accountId: string, providerId: string): Promise<{
+  findAccountOwnerByKey(accountKey: AccountKey): Promise<{
+    kind: "owned";
     user: User;
-    linkedAccount: Account | null;
-    accounts: Account[];
+    account: Account;
+  } | {
+    kind: "orphaned";
+    account: Account;
   } | null>;
   findUserByEmail(email: string, options?: {
     includeAccounts: boolean;
@@ -120,7 +125,9 @@ interface InternalAdapter<_Options extends BetterAuthOptions = BetterAuthOptions
   updateUserByEmail<T extends Record<string, any>>(email: string, data: Partial<User & Record<string, any>>): Promise<User & T>;
   updatePassword(userId: string, password: string): Promise<void>;
   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[]>;
   updateAccount(id: string, data: Partial<Account>): Promise<Account>;
   createVerificationValue(data: Omit<Verification, "createdAt" | "id" | "updatedAt"> & Partial<Verification>): Promise<Verification>;

package/dist/types/cookie.d.mts

@@ -1,5 +1,4 @@
 import { CookieOptions } from "better-call";
-
 //#region src/types/cookie.d.ts
 type BetterAuthCookie = {
   name: string;