better-auth 0.4.9-beta.6 → 0.4.9-beta.7

package/dist/api.js

@@ -1074,39 +1074,39 @@ var signInOAuth = createAuthEndpoint(
     }),
     use: [redirectURLMiddleware]
   },
-  async (c2) => {
-    const provider = c2.context.socialProviders.find(
-      (p) => p.id === c2.body.provider
+  async (c) => {
+    const provider = c.context.socialProviders.find(
+      (p) => p.id === c.body.provider
     );
     if (!provider) {
-      c2.context.logger.error(
+      c.context.logger.error(
         "Provider not found. Make sure to add the provider to your auth config",
         {
-          provider: c2.body.provider
+          provider: c.body.provider
         }
       );
       throw new APIError5("NOT_FOUND", {
         message: "Provider not found"
       });
     }
-    const cookie = c2.context.authCookies;
-    const currentURL = c2.query?.currentURL ? new URL(c2.query?.currentURL) : null;
-    const callbackURL = c2.body.callbackURL?.startsWith("http") ? c2.body.callbackURL : `${currentURL?.origin}${c2.body.callbackURL || ""}`;
+    const cookie = c.context.authCookies;
+    const currentURL = c.query?.currentURL ? new URL(c.query?.currentURL) : null;
+    const callbackURL = c.body.callbackURL?.startsWith("http") ? c.body.callbackURL : `${currentURL?.origin}${c.body.callbackURL || ""}`;
     const state = generateState(
-      callbackURL || currentURL?.origin || c2.context.baseURL,
-      c2.query?.currentURL
+      callbackURL || currentURL?.origin || c.context.baseURL,
+      c.query?.currentURL
     );
-    await c2.setSignedCookie(
+    await c.setSignedCookie(
       cookie.state.name,
       state,
-      c2.context.secret,
+      c.context.secret,
       cookie.state.options
     );
     const codeVerifier = generateCodeVerifier();
-    await c2.setSignedCookie(
+    await c.setSignedCookie(
       cookie.pkCodeVerifier.name,
       codeVerifier,
-      c2.context.secret,
+      c.context.secret,
       cookie.pkCodeVerifier.options
     );
     const url = await provider.createAuthorizationURL({
@@ -1115,9 +1115,9 @@ var signInOAuth = createAuthEndpoint(
     });
     url.searchParams.set(
       "redirect_uri",
-      `${c2.context.baseURL}/callback/${c2.body.provider}`
+      `${c.context.baseURL}/callback/${c.body.provider}`
     );
-    return c2.json({
+    return c.json({
       url: url.toString(),
       state,
       codeVerifier,
@@ -1150,12 +1150,6 @@ var signInEmail = createAuthEndpoint(
         message: "Email and password is not enabled"
       });
     }
-    const currentSession = await getSessionFromCtx(ctx);
-    if (currentSession) {
-      await ctx.context.internalAdapter.deleteSession(
-        currentSession.session.id
-      );
-    }
     const { email, password } = ctx.body;
     const checkEmail = z4.string().email().safeParse(email);
     if (!checkEmail.success) {
@@ -1219,17 +1213,6 @@ var signInEmail = createAuthEndpoint(
     });
   }
 );
-var c = (o) => {
-};
-c({
-  additional: {
-    name: "string"
-  },
-  hooks: {
-    create(user) {
-    }
-  }
-});
 
 // src/api/routes/callback.ts
 import { APIError as APIError6 } from "better-call";
@@ -1400,63 +1383,63 @@ var callbackOAuth = createAuthEndpoint(
     }),
     metadata: HIDE_METADATA
   },
-  async (c2) => {
-    if (c2.query.error || !c2.query.code) {
-      const parsedState2 = parseState(c2.query.state);
-      const callbackURL2 = parsedState2.data?.callbackURL || `${c2.context.baseURL}/error`;
-      c2.context.logger.error(c2.query.error, c2.params.id);
-      throw c2.redirect(
-        `${callbackURL2}?error=${c2.query.error || "oAuth_code_missing"}`
+  async (c) => {
+    if (c.query.error || !c.query.code) {
+      const parsedState2 = parseState(c.query.state);
+      const callbackURL2 = parsedState2.data?.callbackURL || `${c.context.baseURL}/error`;
+      c.context.logger.error(c.query.error, c.params.id);
+      throw c.redirect(
+        `${callbackURL2}?error=${c.query.error || "oAuth_code_missing"}`
       );
     }
-    const provider = c2.context.socialProviders.find(
-      (p) => p.id === c2.params.id
+    const provider = c.context.socialProviders.find(
+      (p) => p.id === c.params.id
     );
     if (!provider) {
-      c2.context.logger.error(
+      c.context.logger.error(
         "Oauth provider with id",
-        c2.params.id,
+        c.params.id,
         "not found"
       );
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=oauth_provider_not_found`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=oauth_provider_not_found`
       );
     }
-    const parsedState = parseState(c2.query.state);
+    const parsedState = parseState(c.query.state);
     if (!parsedState.success) {
-      c2.context.logger.error("Unable to parse state");
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      c.context.logger.error("Unable to parse state");
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const {
       data: { callbackURL, currentURL }
     } = parsedState;
-    const storedState = await c2.getSignedCookie(
-      c2.context.authCookies.state.name,
-      c2.context.secret
+    const storedState = await c.getSignedCookie(
+      c.context.authCookies.state.name,
+      c.context.secret
     );
-    if (storedState !== c2.query.state) {
+    if (storedState !== c.query.state) {
       logger.error("OAuth state mismatch");
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const codeVerifier = await c2.getSignedCookie(
-      c2.context.authCookies.pkCodeVerifier.name,
-      c2.context.secret
+    const codeVerifier = await c.getSignedCookie(
+      c.context.authCookies.pkCodeVerifier.name,
+      c.context.secret
     );
     let tokens;
     try {
       tokens = await provider.validateAuthorizationCode(
-        c2.query.code,
+        c.query.code,
         codeVerifier,
-        `${c2.context.baseURL}/callback/${provider.id}`
+        `${c.context.baseURL}/callback/${provider.id}`
       );
     } catch (e) {
-      c2.context.logger.error(e);
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      c.context.logger.error(e);
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const user = await provider.getUserInfo(tokens).then((res) => res?.user);
@@ -1467,24 +1450,24 @@ var callbackOAuth = createAuthEndpoint(
     });
     if (!user || data.success === false) {
       logger.error("Unable to get user info", data.error);
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     if (!callbackURL) {
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const dbUser = await c2.context.internalAdapter.findUserByEmail(user.email, {
+    const dbUser = await c.context.internalAdapter.findUserByEmail(user.email, {
       includeAccounts: true
     }).catch((e) => {
       logger.error(
         "Better auth was unable to query your database.\nError: ",
         e
       );
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=internal_server_error`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=internal_server_error`
       );
     });
     const userId = dbUser?.user.id;
@@ -1492,7 +1475,7 @@ var callbackOAuth = createAuthEndpoint(
       const hasBeenLinked = dbUser.accounts.find(
         (a) => a.providerId === provider.id
       );
-      const trustedProviders = c2.context.options.account?.accountLinking?.trustedProviders;
+      const trustedProviders = c.context.options.account?.accountLinking?.trustedProviders;
       const isTrustedProvider = trustedProviders ? trustedProviders.includes(provider.id) : true;
       if (!hasBeenLinked && (!user.emailVerified || !isTrustedProvider)) {
         let url;
@@ -1500,15 +1483,15 @@ var callbackOAuth = createAuthEndpoint(
           url = new URL(currentURL || callbackURL);
           url.searchParams.set("error", "account_not_linked");
         } catch (e) {
-          throw c2.redirect(
-            `${c2.context.baseURL}/error?error=account_not_linked`
+          throw c.redirect(
+            `${c.context.baseURL}/error?error=account_not_linked`
           );
         }
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
       if (!hasBeenLinked) {
         try {
-          await c2.context.internalAdapter.linkAccount({
+          await c.context.internalAdapter.linkAccount({
             providerId: provider.id,
             accountId: user.id.toString(),
             id: `${provider.id}:${user.id}`,
@@ -1517,14 +1500,14 @@ var callbackOAuth = createAuthEndpoint(
           });
         } catch (e) {
           console.log(e);
-          throw c2.redirect(
-            `${c2.context.baseURL}/error?error=failed_linking_account`
+          throw c.redirect(
+            `${c.context.baseURL}/error?error=failed_linking_account`
           );
         }
       }
     } else {
       try {
-        await c2.context.internalAdapter.createOAuthUser(data.data, {
+        await c.context.internalAdapter.createOAuthUser(data.data, {
           ...getAccountTokens(tokens),
           id: `${provider.id}:${user.id}`,
           providerId: provider.id,
@@ -1534,8 +1517,8 @@ var callbackOAuth = createAuthEndpoint(
       } catch (e) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_user");
-        c2.setHeader("Location", url.toString());
-        throw c2.redirect(url.toString());
+        c.setHeader("Location", url.toString());
+        throw c.redirect(url.toString());
       }
     }
     if (!userId && !id)
@@ -1543,29 +1526,29 @@ var callbackOAuth = createAuthEndpoint(
         message: "Unable to create user"
       });
     try {
-      const session = await c2.context.internalAdapter.createSession(
+      const session = await c.context.internalAdapter.createSession(
         userId || id,
-        c2.request
+        c.request
       );
       if (!session) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
       try {
-        await setSessionCookie(c2, session.id);
+        await setSessionCookie(c, session.id);
       } catch (e) {
-        c2.context.logger.error("Unable to set session cookie", e);
+        c.context.logger.error("Unable to set session cookie", e);
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
     } catch {
       const url = new URL(currentURL || callbackURL || "");
       url.searchParams.set("error", "unable_to_create_session");
-      throw c2.redirect(url.toString());
+      throw c.redirect(url.toString());
     }
-    throw c2.redirect(callbackURL);
+    throw c.redirect(callbackURL);
   }
 );
 
@@ -2222,8 +2205,8 @@ var error = createAuthEndpoint(
     method: "GET",
     metadata: HIDE_METADATA
   },
-  async (c2) => {
-    const query = new URL(c2.request?.url || "").searchParams.get("error") || "Unknown";
+  async (c) => {
+    const query = new URL(c.request?.url || "").searchParams.get("error") || "Unknown";
     return new Response(html(query), {
       headers: {
         "Content-Type": "text/html"
@@ -2617,26 +2600,26 @@ function getEndpoints(ctx, options) {
   let api = {};
   for (const [key, value] of Object.entries(endpoints)) {
     api[key] = async (context) => {
-      let c2 = await ctx;
+      let c = await ctx;
       for (const plugin of options.plugins || []) {
         if (plugin.hooks?.before) {
           for (const hook of plugin.hooks.before) {
             const match = hook.matcher({
               ...value,
               ...context,
-              context: c2
+              context: c
             });
             if (match) {
               const hookRes = await hook.handler({
                 ...context,
                 context: {
-                  ...c2,
+                  ...c,
                   ...context.context
                 }
               });
               if (hookRes && "context" in hookRes) {
-                c2 = {
-                  ...c2,
+                c = {
+                  ...c,
                   ...hookRes.context
                 };
               }
@@ -2647,7 +2630,7 @@ function getEndpoints(ctx, options) {
       const endpointRes = await value({
         ...context,
         context: {
-          ...c2,
+          ...c,
           ...context.context
         }
       });

package/dist/index.js

@@ -1180,39 +1180,39 @@ var signInOAuth = createAuthEndpoint(
     }),
     use: [redirectURLMiddleware]
   },
-  async (c2) => {
-    const provider = c2.context.socialProviders.find(
-      (p) => p.id === c2.body.provider
+  async (c) => {
+    const provider = c.context.socialProviders.find(
+      (p) => p.id === c.body.provider
     );
     if (!provider) {
-      c2.context.logger.error(
+      c.context.logger.error(
         "Provider not found. Make sure to add the provider to your auth config",
         {
-          provider: c2.body.provider
+          provider: c.body.provider
         }
       );
       throw new APIError5("NOT_FOUND", {
         message: "Provider not found"
       });
     }
-    const cookie = c2.context.authCookies;
-    const currentURL = c2.query?.currentURL ? new URL(c2.query?.currentURL) : null;
-    const callbackURL = c2.body.callbackURL?.startsWith("http") ? c2.body.callbackURL : `${currentURL?.origin}${c2.body.callbackURL || ""}`;
+    const cookie = c.context.authCookies;
+    const currentURL = c.query?.currentURL ? new URL(c.query?.currentURL) : null;
+    const callbackURL = c.body.callbackURL?.startsWith("http") ? c.body.callbackURL : `${currentURL?.origin}${c.body.callbackURL || ""}`;
     const state = generateState(
-      callbackURL || currentURL?.origin || c2.context.baseURL,
-      c2.query?.currentURL
+      callbackURL || currentURL?.origin || c.context.baseURL,
+      c.query?.currentURL
     );
-    await c2.setSignedCookie(
+    await c.setSignedCookie(
       cookie.state.name,
       state,
-      c2.context.secret,
+      c.context.secret,
       cookie.state.options
     );
     const codeVerifier = generateCodeVerifier();
-    await c2.setSignedCookie(
+    await c.setSignedCookie(
       cookie.pkCodeVerifier.name,
       codeVerifier,
-      c2.context.secret,
+      c.context.secret,
       cookie.pkCodeVerifier.options
     );
     const url = await provider.createAuthorizationURL({
@@ -1221,9 +1221,9 @@ var signInOAuth = createAuthEndpoint(
     });
     url.searchParams.set(
       "redirect_uri",
-      `${c2.context.baseURL}/callback/${c2.body.provider}`
+      `${c.context.baseURL}/callback/${c.body.provider}`
     );
-    return c2.json({
+    return c.json({
       url: url.toString(),
       state,
       codeVerifier,
@@ -1256,12 +1256,6 @@ var signInEmail = createAuthEndpoint(
         message: "Email and password is not enabled"
       });
     }
-    const currentSession = await getSessionFromCtx(ctx);
-    if (currentSession) {
-      await ctx.context.internalAdapter.deleteSession(
-        currentSession.session.id
-      );
-    }
     const { email, password } = ctx.body;
     const checkEmail = z4.string().email().safeParse(email);
     if (!checkEmail.success) {
@@ -1325,17 +1319,6 @@ var signInEmail = createAuthEndpoint(
     });
   }
 );
-var c = (o) => {
-};
-c({
-  additional: {
-    name: "string"
-  },
-  hooks: {
-    create(user) {
-    }
-  }
-});
 
 // src/api/routes/callback.ts
 import { APIError as APIError6 } from "better-call";
@@ -1506,63 +1489,63 @@ var callbackOAuth = createAuthEndpoint(
     }),
     metadata: HIDE_METADATA
   },
-  async (c2) => {
-    if (c2.query.error || !c2.query.code) {
-      const parsedState2 = parseState(c2.query.state);
-      const callbackURL2 = parsedState2.data?.callbackURL || `${c2.context.baseURL}/error`;
-      c2.context.logger.error(c2.query.error, c2.params.id);
-      throw c2.redirect(
-        `${callbackURL2}?error=${c2.query.error || "oAuth_code_missing"}`
+  async (c) => {
+    if (c.query.error || !c.query.code) {
+      const parsedState2 = parseState(c.query.state);
+      const callbackURL2 = parsedState2.data?.callbackURL || `${c.context.baseURL}/error`;
+      c.context.logger.error(c.query.error, c.params.id);
+      throw c.redirect(
+        `${callbackURL2}?error=${c.query.error || "oAuth_code_missing"}`
       );
     }
-    const provider = c2.context.socialProviders.find(
-      (p) => p.id === c2.params.id
+    const provider = c.context.socialProviders.find(
+      (p) => p.id === c.params.id
     );
     if (!provider) {
-      c2.context.logger.error(
+      c.context.logger.error(
         "Oauth provider with id",
-        c2.params.id,
+        c.params.id,
         "not found"
       );
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=oauth_provider_not_found`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=oauth_provider_not_found`
       );
     }
-    const parsedState = parseState(c2.query.state);
+    const parsedState = parseState(c.query.state);
     if (!parsedState.success) {
-      c2.context.logger.error("Unable to parse state");
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      c.context.logger.error("Unable to parse state");
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const {
       data: { callbackURL, currentURL }
     } = parsedState;
-    const storedState = await c2.getSignedCookie(
-      c2.context.authCookies.state.name,
-      c2.context.secret
+    const storedState = await c.getSignedCookie(
+      c.context.authCookies.state.name,
+      c.context.secret
     );
-    if (storedState !== c2.query.state) {
+    if (storedState !== c.query.state) {
       logger.error("OAuth state mismatch");
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const codeVerifier = await c2.getSignedCookie(
-      c2.context.authCookies.pkCodeVerifier.name,
-      c2.context.secret
+    const codeVerifier = await c.getSignedCookie(
+      c.context.authCookies.pkCodeVerifier.name,
+      c.context.secret
     );
     let tokens;
     try {
       tokens = await provider.validateAuthorizationCode(
-        c2.query.code,
+        c.query.code,
         codeVerifier,
-        `${c2.context.baseURL}/callback/${provider.id}`
+        `${c.context.baseURL}/callback/${provider.id}`
       );
     } catch (e) {
-      c2.context.logger.error(e);
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      c.context.logger.error(e);
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const user = await provider.getUserInfo(tokens).then((res) => res?.user);
@@ -1573,24 +1556,24 @@ var callbackOAuth = createAuthEndpoint(
     });
     if (!user || data.success === false) {
       logger.error("Unable to get user info", data.error);
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     if (!callbackURL) {
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const dbUser = await c2.context.internalAdapter.findUserByEmail(user.email, {
+    const dbUser = await c.context.internalAdapter.findUserByEmail(user.email, {
       includeAccounts: true
     }).catch((e) => {
       logger.error(
         "Better auth was unable to query your database.\nError: ",
         e
       );
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=internal_server_error`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=internal_server_error`
       );
     });
     const userId = dbUser?.user.id;
@@ -1598,7 +1581,7 @@ var callbackOAuth = createAuthEndpoint(
       const hasBeenLinked = dbUser.accounts.find(
         (a) => a.providerId === provider.id
       );
-      const trustedProviders = c2.context.options.account?.accountLinking?.trustedProviders;
+      const trustedProviders = c.context.options.account?.accountLinking?.trustedProviders;
       const isTrustedProvider = trustedProviders ? trustedProviders.includes(provider.id) : true;
       if (!hasBeenLinked && (!user.emailVerified || !isTrustedProvider)) {
         let url;
@@ -1606,15 +1589,15 @@ var callbackOAuth = createAuthEndpoint(
           url = new URL(currentURL || callbackURL);
           url.searchParams.set("error", "account_not_linked");
         } catch (e) {
-          throw c2.redirect(
-            `${c2.context.baseURL}/error?error=account_not_linked`
+          throw c.redirect(
+            `${c.context.baseURL}/error?error=account_not_linked`
           );
         }
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
       if (!hasBeenLinked) {
         try {
-          await c2.context.internalAdapter.linkAccount({
+          await c.context.internalAdapter.linkAccount({
             providerId: provider.id,
             accountId: user.id.toString(),
             id: `${provider.id}:${user.id}`,
@@ -1623,14 +1606,14 @@ var callbackOAuth = createAuthEndpoint(
           });
         } catch (e) {
           console.log(e);
-          throw c2.redirect(
-            `${c2.context.baseURL}/error?error=failed_linking_account`
+          throw c.redirect(
+            `${c.context.baseURL}/error?error=failed_linking_account`
           );
         }
       }
     } else {
       try {
-        await c2.context.internalAdapter.createOAuthUser(data.data, {
+        await c.context.internalAdapter.createOAuthUser(data.data, {
           ...getAccountTokens(tokens),
           id: `${provider.id}:${user.id}`,
           providerId: provider.id,
@@ -1640,8 +1623,8 @@ var callbackOAuth = createAuthEndpoint(
       } catch (e) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_user");
-        c2.setHeader("Location", url.toString());
-        throw c2.redirect(url.toString());
+        c.setHeader("Location", url.toString());
+        throw c.redirect(url.toString());
       }
     }
     if (!userId && !id)
@@ -1649,29 +1632,29 @@ var callbackOAuth = createAuthEndpoint(
         message: "Unable to create user"
       });
     try {
-      const session = await c2.context.internalAdapter.createSession(
+      const session = await c.context.internalAdapter.createSession(
         userId || id,
-        c2.request
+        c.request
       );
       if (!session) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
       try {
-        await setSessionCookie(c2, session.id);
+        await setSessionCookie(c, session.id);
       } catch (e) {
-        c2.context.logger.error("Unable to set session cookie", e);
+        c.context.logger.error("Unable to set session cookie", e);
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
     } catch {
       const url = new URL(currentURL || callbackURL || "");
       url.searchParams.set("error", "unable_to_create_session");
-      throw c2.redirect(url.toString());
+      throw c.redirect(url.toString());
     }
-    throw c2.redirect(callbackURL);
+    throw c.redirect(callbackURL);
   }
 );
 
@@ -2328,8 +2311,8 @@ var error = createAuthEndpoint(
     method: "GET",
     metadata: HIDE_METADATA
   },
-  async (c2) => {
-    const query = new URL(c2.request?.url || "").searchParams.get("error") || "Unknown";
+  async (c) => {
+    const query = new URL(c.request?.url || "").searchParams.get("error") || "Unknown";
     return new Response(html(query), {
       headers: {
         "Content-Type": "text/html"
@@ -2723,26 +2706,26 @@ function getEndpoints(ctx, options) {
   let api = {};
   for (const [key, value] of Object.entries(endpoints)) {
     api[key] = async (context) => {
-      let c2 = await ctx;
+      let c = await ctx;
       for (const plugin of options.plugins || []) {
         if (plugin.hooks?.before) {
           for (const hook of plugin.hooks.before) {
             const match = hook.matcher({
               ...value,
               ...context,
-              context: c2
+              context: c
             });
             if (match) {
               const hookRes = await hook.handler({
                 ...context,
                 context: {
-                  ...c2,
+                  ...c,
                   ...context.context
                 }
               });
               if (hookRes && "context" in hookRes) {
-                c2 = {
-                  ...c2,
+                c = {
+                  ...c,
                   ...hookRes.context
                 };
               }
@@ -2753,7 +2736,7 @@ function getEndpoints(ctx, options) {
       const endpointRes = await value({
         ...context,
         context: {
-          ...c2,
+          ...c,
           ...context.context
         }
       });
@@ -3278,7 +3261,7 @@ async function getMigrations(config2) {
     }
     let toBeAddedFields = {};
     for (const [fieldName, field] of Object.entries(value.fields)) {
-      const column = table.columns.find((c2) => c2.name === fieldName);
+      const column = table.columns.find((c) => c.name === fieldName);
       if (!column) {
         toBeAddedFields[fieldName] = field;
         continue;
@@ -3605,11 +3588,11 @@ function constantTimeEqual(a, b) {
   if (aBuffer.length !== bBuffer.length) {
     return false;
   }
-  let c2 = 0;
+  let c = 0;
   for (let i = 0; i < aBuffer.length; i++) {
-    c2 |= aBuffer[i] ^ bBuffer[i];
+    c |= aBuffer[i] ^ bBuffer[i];
   }
-  return c2 === 0;
+  return c === 0;
 }
 
 // src/crypto/password.ts

package/dist/plugins.js

@@ -995,39 +995,39 @@ var signInOAuth = createAuthEndpoint(
     }),
     use: [redirectURLMiddleware]
   },
-  async (c2) => {
-    const provider = c2.context.socialProviders.find(
-      (p) => p.id === c2.body.provider
+  async (c) => {
+    const provider = c.context.socialProviders.find(
+      (p) => p.id === c.body.provider
     );
     if (!provider) {
-      c2.context.logger.error(
+      c.context.logger.error(
         "Provider not found. Make sure to add the provider to your auth config",
         {
-          provider: c2.body.provider
+          provider: c.body.provider
         }
       );
       throw new APIError4("NOT_FOUND", {
         message: "Provider not found"
       });
     }
-    const cookie = c2.context.authCookies;
-    const currentURL = c2.query?.currentURL ? new URL(c2.query?.currentURL) : null;
-    const callbackURL = c2.body.callbackURL?.startsWith("http") ? c2.body.callbackURL : `${currentURL?.origin}${c2.body.callbackURL || ""}`;
+    const cookie = c.context.authCookies;
+    const currentURL = c.query?.currentURL ? new URL(c.query?.currentURL) : null;
+    const callbackURL = c.body.callbackURL?.startsWith("http") ? c.body.callbackURL : `${currentURL?.origin}${c.body.callbackURL || ""}`;
     const state = generateState(
-      callbackURL || currentURL?.origin || c2.context.baseURL,
-      c2.query?.currentURL
+      callbackURL || currentURL?.origin || c.context.baseURL,
+      c.query?.currentURL
     );
-    await c2.setSignedCookie(
+    await c.setSignedCookie(
       cookie.state.name,
       state,
-      c2.context.secret,
+      c.context.secret,
       cookie.state.options
     );
     const codeVerifier = generateCodeVerifier();
-    await c2.setSignedCookie(
+    await c.setSignedCookie(
       cookie.pkCodeVerifier.name,
       codeVerifier,
-      c2.context.secret,
+      c.context.secret,
       cookie.pkCodeVerifier.options
     );
     const url = await provider.createAuthorizationURL({
@@ -1036,9 +1036,9 @@ var signInOAuth = createAuthEndpoint(
     });
     url.searchParams.set(
       "redirect_uri",
-      `${c2.context.baseURL}/callback/${c2.body.provider}`
+      `${c.context.baseURL}/callback/${c.body.provider}`
     );
-    return c2.json({
+    return c.json({
       url: url.toString(),
       state,
       codeVerifier,
@@ -1071,12 +1071,6 @@ var signInEmail = createAuthEndpoint(
         message: "Email and password is not enabled"
       });
     }
-    const currentSession = await getSessionFromCtx(ctx);
-    if (currentSession) {
-      await ctx.context.internalAdapter.deleteSession(
-        currentSession.session.id
-      );
-    }
     const { email, password } = ctx.body;
     const checkEmail = z3.string().email().safeParse(email);
     if (!checkEmail.success) {
@@ -1140,17 +1134,6 @@ var signInEmail = createAuthEndpoint(
     });
   }
 );
-var c = (o) => {
-};
-c({
-  additional: {
-    name: "string"
-  },
-  hooks: {
-    create(user) {
-    }
-  }
-});
 
 // src/api/routes/callback.ts
 import { APIError as APIError5 } from "better-call";
@@ -1321,63 +1304,63 @@ var callbackOAuth = createAuthEndpoint(
     }),
     metadata: HIDE_METADATA
   },
-  async (c2) => {
-    if (c2.query.error || !c2.query.code) {
-      const parsedState2 = parseState(c2.query.state);
-      const callbackURL2 = parsedState2.data?.callbackURL || `${c2.context.baseURL}/error`;
-      c2.context.logger.error(c2.query.error, c2.params.id);
-      throw c2.redirect(
-        `${callbackURL2}?error=${c2.query.error || "oAuth_code_missing"}`
+  async (c) => {
+    if (c.query.error || !c.query.code) {
+      const parsedState2 = parseState(c.query.state);
+      const callbackURL2 = parsedState2.data?.callbackURL || `${c.context.baseURL}/error`;
+      c.context.logger.error(c.query.error, c.params.id);
+      throw c.redirect(
+        `${callbackURL2}?error=${c.query.error || "oAuth_code_missing"}`
       );
     }
-    const provider = c2.context.socialProviders.find(
-      (p) => p.id === c2.params.id
+    const provider = c.context.socialProviders.find(
+      (p) => p.id === c.params.id
     );
     if (!provider) {
-      c2.context.logger.error(
+      c.context.logger.error(
         "Oauth provider with id",
-        c2.params.id,
+        c.params.id,
         "not found"
       );
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=oauth_provider_not_found`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=oauth_provider_not_found`
       );
     }
-    const parsedState = parseState(c2.query.state);
+    const parsedState = parseState(c.query.state);
     if (!parsedState.success) {
-      c2.context.logger.error("Unable to parse state");
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      c.context.logger.error("Unable to parse state");
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const {
       data: { callbackURL, currentURL }
     } = parsedState;
-    const storedState = await c2.getSignedCookie(
-      c2.context.authCookies.state.name,
-      c2.context.secret
+    const storedState = await c.getSignedCookie(
+      c.context.authCookies.state.name,
+      c.context.secret
     );
-    if (storedState !== c2.query.state) {
+    if (storedState !== c.query.state) {
       logger.error("OAuth state mismatch");
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const codeVerifier = await c2.getSignedCookie(
-      c2.context.authCookies.pkCodeVerifier.name,
-      c2.context.secret
+    const codeVerifier = await c.getSignedCookie(
+      c.context.authCookies.pkCodeVerifier.name,
+      c.context.secret
     );
     let tokens;
     try {
       tokens = await provider.validateAuthorizationCode(
-        c2.query.code,
+        c.query.code,
         codeVerifier,
-        `${c2.context.baseURL}/callback/${provider.id}`
+        `${c.context.baseURL}/callback/${provider.id}`
       );
     } catch (e) {
-      c2.context.logger.error(e);
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      c.context.logger.error(e);
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     const user = await provider.getUserInfo(tokens).then((res) => res?.user);
@@ -1388,24 +1371,24 @@ var callbackOAuth = createAuthEndpoint(
     });
     if (!user || data.success === false) {
       logger.error("Unable to get user info", data.error);
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
     if (!callbackURL) {
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=please_restart_the_process`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=please_restart_the_process`
       );
     }
-    const dbUser = await c2.context.internalAdapter.findUserByEmail(user.email, {
+    const dbUser = await c.context.internalAdapter.findUserByEmail(user.email, {
       includeAccounts: true
     }).catch((e) => {
       logger.error(
         "Better auth was unable to query your database.\nError: ",
         e
       );
-      throw c2.redirect(
-        `${c2.context.baseURL}/error?error=internal_server_error`
+      throw c.redirect(
+        `${c.context.baseURL}/error?error=internal_server_error`
       );
     });
     const userId = dbUser?.user.id;
@@ -1413,7 +1396,7 @@ var callbackOAuth = createAuthEndpoint(
       const hasBeenLinked = dbUser.accounts.find(
         (a) => a.providerId === provider.id
       );
-      const trustedProviders = c2.context.options.account?.accountLinking?.trustedProviders;
+      const trustedProviders = c.context.options.account?.accountLinking?.trustedProviders;
       const isTrustedProvider = trustedProviders ? trustedProviders.includes(provider.id) : true;
       if (!hasBeenLinked && (!user.emailVerified || !isTrustedProvider)) {
         let url;
@@ -1421,15 +1404,15 @@ var callbackOAuth = createAuthEndpoint(
           url = new URL(currentURL || callbackURL);
           url.searchParams.set("error", "account_not_linked");
         } catch (e) {
-          throw c2.redirect(
-            `${c2.context.baseURL}/error?error=account_not_linked`
+          throw c.redirect(
+            `${c.context.baseURL}/error?error=account_not_linked`
           );
         }
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
       if (!hasBeenLinked) {
         try {
-          await c2.context.internalAdapter.linkAccount({
+          await c.context.internalAdapter.linkAccount({
             providerId: provider.id,
             accountId: user.id.toString(),
             id: `${provider.id}:${user.id}`,
@@ -1438,14 +1421,14 @@ var callbackOAuth = createAuthEndpoint(
           });
         } catch (e) {
           console.log(e);
-          throw c2.redirect(
-            `${c2.context.baseURL}/error?error=failed_linking_account`
+          throw c.redirect(
+            `${c.context.baseURL}/error?error=failed_linking_account`
           );
         }
       }
     } else {
       try {
-        await c2.context.internalAdapter.createOAuthUser(data.data, {
+        await c.context.internalAdapter.createOAuthUser(data.data, {
           ...getAccountTokens(tokens),
           id: `${provider.id}:${user.id}`,
           providerId: provider.id,
@@ -1455,8 +1438,8 @@ var callbackOAuth = createAuthEndpoint(
       } catch (e) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_user");
-        c2.setHeader("Location", url.toString());
-        throw c2.redirect(url.toString());
+        c.setHeader("Location", url.toString());
+        throw c.redirect(url.toString());
       }
     }
     if (!userId && !id)
@@ -1464,29 +1447,29 @@ var callbackOAuth = createAuthEndpoint(
         message: "Unable to create user"
       });
     try {
-      const session = await c2.context.internalAdapter.createSession(
+      const session = await c.context.internalAdapter.createSession(
         userId || id,
-        c2.request
+        c.request
       );
       if (!session) {
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
       try {
-        await setSessionCookie(c2, session.id);
+        await setSessionCookie(c, session.id);
       } catch (e) {
-        c2.context.logger.error("Unable to set session cookie", e);
+        c.context.logger.error("Unable to set session cookie", e);
         const url = new URL(currentURL || callbackURL);
         url.searchParams.set("error", "unable_to_create_session");
-        throw c2.redirect(url.toString());
+        throw c.redirect(url.toString());
       }
     } catch {
       const url = new URL(currentURL || callbackURL || "");
       url.searchParams.set("error", "unable_to_create_session");
-      throw c2.redirect(url.toString());
+      throw c.redirect(url.toString());
     }
-    throw c2.redirect(callbackURL);
+    throw c.redirect(callbackURL);
   }
 );
 
@@ -2184,8 +2167,8 @@ var error = createAuthEndpoint(
     method: "GET",
     metadata: HIDE_METADATA
   },
-  async (c2) => {
-    const query = new URL(c2.request?.url || "").searchParams.get("error") || "Unknown";
+  async (c) => {
+    const query = new URL(c.request?.url || "").searchParams.get("error") || "Unknown";
     return new Response(html(query), {
       headers: {
         "Content-Type": "text/html"
@@ -5636,8 +5619,8 @@ var bearer = () => {
               context.request?.headers.get("authorization") || context.headers?.get("authorization")
             );
           },
-          handler: async (c2) => {
-            const token = c2.request?.headers.get("authorization")?.replace("Bearer ", "") || c2.headers?.get("authorization")?.replace("Bearer ", "");
+          handler: async (c) => {
+            const token = c.request?.headers.get("authorization")?.replace("Bearer ", "") || c.headers?.get("authorization")?.replace("Bearer ", "");
             if (!token) {
               return;
             }
@@ -5645,22 +5628,22 @@ var bearer = () => {
             if (token.includes(".")) {
               signedToken = token;
             } else {
-              signedToken = await serializeSigned("", token, c2.context.secret);
+              signedToken = await serializeSigned("", token, c.context.secret);
             }
-            if (c2.request) {
-              c2.request.headers.set(
+            if (c.request) {
+              c.request.headers.set(
                 "cookie",
-                `${c2.context.authCookies.sessionToken.name}=${signedToken.replace("=", "")}`
+                `${c.context.authCookies.sessionToken.name}=${signedToken.replace("=", "")}`
               );
             }
-            if (c2.headers) {
-              c2.headers.set(
+            if (c.headers) {
+              c.headers.set(
                 "cookie",
-                `${c2.context.authCookies.sessionToken.name}=${signedToken.replace("=", "")}`
+                `${c.context.authCookies.sessionToken.name}=${signedToken.replace("=", "")}`
               );
             }
             return {
-              context: c2
+              context: c
             };
           }
         }
@@ -6708,7 +6691,7 @@ var genericOAuth = (options) => {
         async (ctx) => {
           const { providerId } = ctx.body;
           const config = options.config.find(
-            (c2) => c2.providerId === providerId
+            (c) => c.providerId === providerId
           );
           if (!config) {
             throw new APIError28("BAD_REQUEST", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "0.4.9-beta.6",
+  "version": "0.4.9-beta.7",
   "description": "The most comprehensive authentication library for TypeScript.",
   "type": "module",
   "repository": {