better-auth 1.2.0-beta.5 → 1.2.0-beta.8

package/dist/{chunk-LHWLPZ6K.cjs → chunk-ZUUQ3FFY.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkWKXM7XUV_cjs = require('./chunk-WKXM7XUV.cjs');
+var chunkN7UWN6ND_cjs = require('./chunk-N7UWN6ND.cjs');
 var chunkSVC7H7K4_cjs = require('./chunk-SVC7H7K4.cjs');
 var chunkV6HE2MP7_cjs = require('./chunk-V6HE2MP7.cjs');
 var chunk2Z6CVQHH_cjs = require('./chunk-2Z6CVQHH.cjs');
@@ -125,7 +125,7 @@ var genericOAuth = (options) => {
       };
     },
     endpoints: {
-      signInWithOAuth2: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      signInWithOAuth2: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/sign-in/oauth2",
         {
           method: "POST",
@@ -257,7 +257,7 @@ var genericOAuth = (options) => {
           });
         }
       ),
-      oAuth2Callback: chunkWKXM7XUV_cjs.createAuthEndpoint(
+      oAuth2Callback: chunkN7UWN6ND_cjs.createAuthEndpoint(
         "/oauth2/callback/:providerId",
         {
           method: "GET",
@@ -311,7 +311,7 @@ var genericOAuth = (options) => {
           }
           let tokens = void 0;
           const parsedState = await chunk2Z6CVQHH_cjs.parseState(ctx);
-          const { callbackURL, codeVerifier, errorURL, newUserURL } = parsedState;
+          const { callbackURL, codeVerifier, errorURL, newUserURL, link } = parsedState;
           const code = ctx.query.code;
           let finalTokenUrl = provider.tokenUrl;
           let finalUserInfoUrl = provider.userInfoUrl;
@@ -363,7 +363,28 @@ var genericOAuth = (options) => {
             );
           }
           const mapUser = provider.mapProfileToUser ? await provider.mapProfileToUser(userInfo) : null;
-          const result = await chunkWKXM7XUV_cjs.handleOAuthUserInfo(ctx, {
+          if (link) {
+            if (link.email !== userInfo.email.toLowerCase()) {
+              return redirectOnError("email_doesn't_match");
+            }
+            const newAccount = await ctx.context.internalAdapter.createAccount({
+              userId: link.userId,
+              providerId: provider.providerId,
+              accountId: userInfo.id
+            });
+            if (!newAccount) {
+              return redirectOnError("unable_to_link_account");
+            }
+            let toRedirectTo2;
+            try {
+              const url = callbackURL;
+              toRedirectTo2 = url.toString();
+            } catch {
+              toRedirectTo2 = callbackURL;
+            }
+            throw ctx.redirect(toRedirectTo2);
+          }
+          const result = await chunkN7UWN6ND_cjs.handleOAuthUserInfo(ctx, {
             userInfo: {
               ...userInfo,
               ...mapUser
@@ -397,6 +418,93 @@ var genericOAuth = (options) => {
           }
           throw ctx.redirect(toRedirectTo);
         }
+      ),
+      oAuth2LinkAccount: chunkN7UWN6ND_cjs.createAuthEndpoint(
+        "/oauth2/link",
+        {
+          method: "POST",
+          body: zod.z.object({
+            providerId: zod.z.string(),
+            callbackURL: zod.z.string()
+          }),
+          use: [chunkN7UWN6ND_cjs.sessionMiddleware]
+        },
+        async (c) => {
+          const session = c.context.session;
+          const account = await c.context.internalAdapter.findAccounts(
+            session.user.id
+          );
+          const existingAccount = account.find(
+            (a) => a.providerId === c.body.providerId
+          );
+          if (existingAccount) {
+            throw new betterCall.APIError("BAD_REQUEST", {
+              message: chunkN7UWN6ND_cjs.BASE_ERROR_CODES.SOCIAL_ACCOUNT_ALREADY_LINKED
+            });
+          }
+          const provider = options.config.find(
+            (p) => p.providerId === c.body.providerId
+          );
+          if (!provider) {
+            throw new betterCall.APIError("NOT_FOUND", {
+              message: chunkN7UWN6ND_cjs.BASE_ERROR_CODES.PROVIDER_NOT_FOUND
+            });
+          }
+          const {
+            providerId,
+            clientId,
+            clientSecret,
+            redirectURI,
+            authorizationUrl,
+            discoveryUrl,
+            pkce,
+            scopes
+          } = provider;
+          let finalAuthUrl = authorizationUrl;
+          if (!finalAuthUrl) {
+            if (!discoveryUrl) {
+              throw new betterCall.APIError("BAD_REQUEST", {
+                message: ERROR_CODES.INVALID_OAUTH_CONFIGURATION
+              });
+            }
+            const discovery = await fetch.betterFetch(discoveryUrl, {
+              onError(context) {
+                c.context.logger.error(context.error.message, context.error, {
+                  discoveryUrl
+                });
+              }
+            });
+            if (discovery.data) {
+              finalAuthUrl = discovery.data.authorization_endpoint;
+            }
+          }
+          if (!finalAuthUrl) {
+            throw new betterCall.APIError("BAD_REQUEST", {
+              message: ERROR_CODES.INVALID_OAUTH_CONFIGURATION
+            });
+          }
+          const state = await chunk2Z6CVQHH_cjs.generateState(c, {
+            userId: session.user.id,
+            email: session.user.email
+          });
+          const url = await chunkSVC7H7K4_cjs.createAuthorizationURL({
+            id: providerId,
+            options: {
+              clientId,
+              clientSecret,
+              redirectURI: redirectURI || `${c.context.baseURL}/oauth2/callback`
+            },
+            authorizationEndpoint: finalAuthUrl,
+            state: state.state,
+            codeVerifier: pkce ? state.codeVerifier : void 0,
+            scopes: scopes || [],
+            redirectURI: `${c.context.baseURL}/oauth2/callback/${providerId}`
+          });
+          return c.json({
+            url: url.toString(),
+            redirect: true
+          });
+        }
       )
     },
     $ERROR_CODES: ERROR_CODES

package/dist/client/plugins.d.cts

@@ -2,7 +2,7 @@ import * as nanostores from 'nanostores';
 import { AccessControl, StatementsPrimitive, Role } from '../plugins/access.cjs';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, a as Organization, M as Member, I as Invitation } from '../index-BL6paKGE.cjs';
+import { o as organization, a as Organization, M as Member, I as Invitation } from '../index-Bszx4yMW.cjs';
 import { b as Prettify } from '../helper-Bi8FQwDD.cjs';
 import { username } from '../plugins/username.cjs';
 export { getPasskeyActions, passkeyClient } from '../plugins/passkey.cjs';
@@ -10,7 +10,7 @@ export { twoFactorClient } from '../plugins/two-factor.cjs';
 import { magicLink } from '../plugins/magic-link.cjs';
 import { phoneNumber } from '../plugins/phone-number.cjs';
 import { anonymous } from '../plugins/anonymous.cjs';
-import { a5 as FieldAttribute, B as BetterAuthOptions, d as BetterAuthPlugin } from '../auth-DYJ8ix3G.cjs';
+import { a5 as FieldAttribute, B as BetterAuthOptions, d as BetterAuthPlugin } from '../auth-BLwS7t0V.cjs';
 import { admin } from '../plugins/admin.cjs';
 import { genericOAuth } from '../plugins/generic-oauth.cjs';
 import { jwt } from '../plugins/jwt.cjs';

package/dist/client/plugins.d.ts

@@ -2,7 +2,7 @@ import * as nanostores from 'nanostores';
 import { AccessControl, StatementsPrimitive, Role } from '../plugins/access.js';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchOption } from '@better-fetch/fetch';
-import { o as organization, a as Organization, M as Member, I as Invitation } from '../index-DOB91DVD.js';
+import { o as organization, a as Organization, M as Member, I as Invitation } from '../index-DbIhOM3X.js';
 import { b as Prettify } from '../helper-Bi8FQwDD.js';
 import { username } from '../plugins/username.js';
 export { getPasskeyActions, passkeyClient } from '../plugins/passkey.js';
@@ -10,7 +10,7 @@ export { twoFactorClient } from '../plugins/two-factor.js';
 import { magicLink } from '../plugins/magic-link.js';
 import { phoneNumber } from '../plugins/phone-number.js';
 import { anonymous } from '../plugins/anonymous.js';
-import { a5 as FieldAttribute, B as BetterAuthOptions, d as BetterAuthPlugin } from '../auth-BIKkqX3w.js';
+import { a5 as FieldAttribute, B as BetterAuthOptions, d as BetterAuthPlugin } from '../auth-C42JqOR9.js';
 import { admin } from '../plugins/admin.js';
 import { genericOAuth } from '../plugins/generic-oauth.js';
 import { jwt } from '../plugins/jwt.js';

package/dist/client.d.cts

@@ -1,4 +1,4 @@
-import { a as BASE_ERROR_CODES, d as BetterAuthPlugin } from './auth-DYJ8ix3G.cjs';
+import { a as BASE_ERROR_CODES, d as BetterAuthPlugin } from './auth-BLwS7t0V.cjs';
 export * from 'zod';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchError, BetterFetch, BetterFetchOption } from '@better-fetch/fetch';

package/dist/client.d.ts

@@ -1,4 +1,4 @@
-import { a as BASE_ERROR_CODES, d as BetterAuthPlugin } from './auth-BIKkqX3w.js';
+import { a as BASE_ERROR_CODES, d as BetterAuthPlugin } from './auth-C42JqOR9.js';
 export * from 'zod';
 import * as _better_fetch_fetch from '@better-fetch/fetch';
 import { BetterFetchError, BetterFetch, BetterFetchOption } from '@better-fetch/fetch';

package/dist/cookies.d.cts

@@ -1,5 +1,5 @@
 import 'better-call';
-export { L as BetterAuthCookies, T as EligibleCookies, E as createCookieGetter, P as deleteSessionCookie, Y as getCookieCache, J as getCookies, X as getSessionCookie, Q as parseCookies, Z as parseSetCookieHeader, N as setCookieCache, O as setSessionCookie } from './auth-DYJ8ix3G.cjs';
+export { L as BetterAuthCookies, T as EligibleCookies, E as createCookieGetter, P as deleteSessionCookie, Y as getCookieCache, J as getCookies, X as getSessionCookie, Q as parseCookies, Z as parseSetCookieHeader, N as setCookieCache, O as setSessionCookie } from './auth-BLwS7t0V.cjs';
 import 'zod';
 import 'kysely';
 import './helper-Bi8FQwDD.cjs';

package/dist/cookies.d.ts

@@ -1,5 +1,5 @@
 import 'better-call';
-export { L as BetterAuthCookies, T as EligibleCookies, E as createCookieGetter, P as deleteSessionCookie, Y as getCookieCache, J as getCookies, X as getSessionCookie, Q as parseCookies, Z as parseSetCookieHeader, N as setCookieCache, O as setSessionCookie } from './auth-BIKkqX3w.js';
+export { L as BetterAuthCookies, T as EligibleCookies, E as createCookieGetter, P as deleteSessionCookie, Y as getCookieCache, J as getCookies, X as getSessionCookie, Q as parseCookies, Z as parseSetCookieHeader, N as setCookieCache, O as setSessionCookie } from './auth-C42JqOR9.js';
 import 'zod';
 import 'kysely';
 import './helper-Bi8FQwDD.js';

package/dist/db.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkCV5JTF37_cjs = require('./chunk-CV5JTF37.cjs');
+var chunkKAR56MJZ_cjs = require('./chunk-KAR56MJZ.cjs');
 var chunkB5UCLTPZ_cjs = require('./chunk-B5UCLTPZ.cjs');
 require('./chunk-H74YRRNV.cjs');
 require('./chunk-2Z6CVQHH.cjs');
@@ -16,47 +16,47 @@ require('./chunk-PEZRSDZS.cjs');
 
 Object.defineProperty(exports, "convertFromDB", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.convertFromDB; }
+  get: function () { return chunkKAR56MJZ_cjs.convertFromDB; }
 });
 Object.defineProperty(exports, "convertToDB", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.convertToDB; }
+  get: function () { return chunkKAR56MJZ_cjs.convertToDB; }
 });
 Object.defineProperty(exports, "createFieldAttribute", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.createFieldAttribute; }
+  get: function () { return chunkKAR56MJZ_cjs.createFieldAttribute; }
 });
 Object.defineProperty(exports, "createInternalAdapter", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.createInternalAdapter; }
+  get: function () { return chunkKAR56MJZ_cjs.createInternalAdapter; }
 });
 Object.defineProperty(exports, "getAdapter", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.getAdapter; }
+  get: function () { return chunkKAR56MJZ_cjs.getAdapter; }
 });
 Object.defineProperty(exports, "getAuthTables", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.getAuthTables; }
+  get: function () { return chunkKAR56MJZ_cjs.getAuthTables; }
 });
 Object.defineProperty(exports, "getMigrations", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.getMigrations; }
+  get: function () { return chunkKAR56MJZ_cjs.getMigrations; }
 });
 Object.defineProperty(exports, "getSchema", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.getSchema; }
+  get: function () { return chunkKAR56MJZ_cjs.getSchema; }
 });
 Object.defineProperty(exports, "getWithHooks", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.getWithHooks; }
+  get: function () { return chunkKAR56MJZ_cjs.getWithHooks; }
 });
 Object.defineProperty(exports, "matchType", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.matchType; }
+  get: function () { return chunkKAR56MJZ_cjs.matchType; }
 });
 Object.defineProperty(exports, "toZodSchema", {
   enumerable: true,
-  get: function () { return chunkCV5JTF37_cjs.toZodSchema; }
+  get: function () { return chunkKAR56MJZ_cjs.toZodSchema; }
 });
 Object.defineProperty(exports, "accountSchema", {
   enumerable: true,

package/dist/db.d.cts

@@ -1,5 +1,5 @@
-import { A as Adapter, B as BetterAuthOptions, W as Where, a5 as FieldAttribute, a6 as FieldType, K as KyselyDatabaseType } from './auth-DYJ8ix3G.cjs';
-export { ai as BetterAuthDbSchema, a9 as FieldAttributeConfig, ah as InferFieldsFromOptions, ag as InferFieldsFromPlugins, ad as InferFieldsInput, ae as InferFieldsInputClient, ac as InferFieldsOutput, ab as InferValueType, a8 as InternalAdapter, af as PluginFieldAttribute, ak as accountSchema, aa as createFieldAttribute, a7 as createInternalAdapter, ap as getAllFields, aj as getAuthTables, ay as mergeSchema, aw as parseAccountInput, ar as parseAccountOutput, av as parseAdditionalUserInput, at as parseInputData, ao as parseOutputData, ax as parseSessionInput, as as parseSessionOutput, au as parseUserInput, aq as parseUserOutput, am as sessionSchema, al as userSchema, an as verificationSchema } from './auth-DYJ8ix3G.cjs';
+import { A as Adapter, B as BetterAuthOptions, W as Where, a5 as FieldAttribute, a6 as FieldType, K as KyselyDatabaseType } from './auth-BLwS7t0V.cjs';
+export { ai as BetterAuthDbSchema, a9 as FieldAttributeConfig, ah as InferFieldsFromOptions, ag as InferFieldsFromPlugins, ad as InferFieldsInput, ae as InferFieldsInputClient, ac as InferFieldsOutput, ab as InferValueType, a8 as InternalAdapter, af as PluginFieldAttribute, ak as accountSchema, aa as createFieldAttribute, a7 as createInternalAdapter, ap as getAllFields, aj as getAuthTables, ay as mergeSchema, aw as parseAccountInput, ar as parseAccountOutput, av as parseAdditionalUserInput, at as parseInputData, ao as parseOutputData, ax as parseSessionInput, as as parseSessionOutput, au as parseUserInput, aq as parseUserOutput, am as sessionSchema, al as userSchema, an as verificationSchema } from './auth-BLwS7t0V.cjs';
 import { z } from 'zod';
 import 'kysely';
 import 'better-call';

package/dist/db.d.ts

@@ -1,5 +1,5 @@
-import { A as Adapter, B as BetterAuthOptions, W as Where, a5 as FieldAttribute, a6 as FieldType, K as KyselyDatabaseType } from './auth-BIKkqX3w.js';
-export { ai as BetterAuthDbSchema, a9 as FieldAttributeConfig, ah as InferFieldsFromOptions, ag as InferFieldsFromPlugins, ad as InferFieldsInput, ae as InferFieldsInputClient, ac as InferFieldsOutput, ab as InferValueType, a8 as InternalAdapter, af as PluginFieldAttribute, ak as accountSchema, aa as createFieldAttribute, a7 as createInternalAdapter, ap as getAllFields, aj as getAuthTables, ay as mergeSchema, aw as parseAccountInput, ar as parseAccountOutput, av as parseAdditionalUserInput, at as parseInputData, ao as parseOutputData, ax as parseSessionInput, as as parseSessionOutput, au as parseUserInput, aq as parseUserOutput, am as sessionSchema, al as userSchema, an as verificationSchema } from './auth-BIKkqX3w.js';
+import { A as Adapter, B as BetterAuthOptions, W as Where, a5 as FieldAttribute, a6 as FieldType, K as KyselyDatabaseType } from './auth-C42JqOR9.js';
+export { ai as BetterAuthDbSchema, a9 as FieldAttributeConfig, ah as InferFieldsFromOptions, ag as InferFieldsFromPlugins, ad as InferFieldsInput, ae as InferFieldsInputClient, ac as InferFieldsOutput, ab as InferValueType, a8 as InternalAdapter, af as PluginFieldAttribute, ak as accountSchema, aa as createFieldAttribute, a7 as createInternalAdapter, ap as getAllFields, aj as getAuthTables, ay as mergeSchema, aw as parseAccountInput, ar as parseAccountOutput, av as parseAdditionalUserInput, at as parseInputData, ao as parseOutputData, ax as parseSessionInput, as as parseSessionOutput, au as parseUserInput, aq as parseUserOutput, am as sessionSchema, al as userSchema, an as verificationSchema } from './auth-C42JqOR9.js';
 import { z } from 'zod';
 import 'kysely';
 import 'better-call';

package/dist/db.js

@@ -1,4 +1,4 @@
-export { convertFromDB, convertToDB, createFieldAttribute, createInternalAdapter, getAdapter, getAuthTables, getMigrations, getSchema, getWithHooks, matchType, toZodSchema } from './chunk-CLHJAEU2.js';
+export { convertFromDB, convertToDB, createFieldAttribute, createInternalAdapter, getAdapter, getAuthTables, getMigrations, getSchema, getWithHooks, matchType, toZodSchema } from './chunk-EQYRCOOF.js';
 export { accountSchema, getAllFields, mergeSchema, parseAccountInput, parseAccountOutput, parseAdditionalUserInput, parseInputData, parseOutputData, parseSessionInput, parseSessionOutput, parseUserInput, parseUserOutput, sessionSchema, userSchema, verificationSchema } from './chunk-HZBNUY7E.js';
 import './chunk-KLDFBLYL.js';
 import './chunk-ZFUBVSZD.js';