better-auth 0.0.9-beta.5 → 0.0.9-beta.7

package/dist/index.js

@@ -1750,17 +1750,24 @@ var changePassword = createAuthEndpoint(
   {
     method: "POST",
     body: z.object({
+      /**
+       * The new password to set
+       */
       newPassword: z.string(),
       /**
-       * If the user has not set a password yet,
-       * they can set it with this field.
+       * The current password of the user
+       */
+      currentPassword: z.string(),
+      /**
+       * revoke all sessions that are not the
+       * current one logged in by the user
        */
-      oldPassword: z.string()
+      revokeOtherSessions: z.boolean().optional()
     }),
     use: [sessionMiddleware]
   },
   async (ctx) => {
-    const { newPassword, oldPassword } = ctx.body;
+    const { newPassword, currentPassword, revokeOtherSessions } = ctx.body;
     const session = ctx.context.session;
     const minPasswordLength = ctx.context.options?.emailAndPassword?.minPasswordLength || 8;
     if (newPassword.length < minPasswordLength) {
@@ -1790,7 +1797,7 @@ var changePassword = createAuthEndpoint(
     if (account.password) {
       const verify = await ctx.context.password.verify(
         account.password,
-        oldPassword
+        currentPassword
       );
       if (!verify) {
         return ctx.json(null, {
@@ -1802,6 +1809,13 @@ var changePassword = createAuthEndpoint(
     await ctx.context.internalAdapter.updateAccount(account.id, {
       password: passwordHash
     });
+    if (revokeOtherSessions) {
+      await ctx.context.internalAdapter.deleteSessions(session.user.id);
+      const newSession = await ctx.context.internalAdapter.createSession(
+        session.user.id
+      );
+      await setSessionCookie(ctx, newSession.id);
+    }
     return ctx.json(session.user);
   }
 );
@@ -1950,6 +1964,127 @@ var router = (ctx, _options) => {
     }
   });
 };
+
+// src/adapters/get-tables.ts
+var getAuthTables = (options) => {
+  const pluginSchema = options.plugins?.reduce(
+    (acc, plugin) => {
+      const schema = plugin.schema;
+      if (!schema) return acc;
+      for (const [key, value] of Object.entries(schema)) {
+        acc[key] = {
+          fields: {
+            ...acc[key]?.fields,
+            ...value.fields
+          },
+          tableName: key
+        };
+      }
+      return acc;
+    },
+    {}
+  );
+  return {
+    ...pluginSchema,
+    user: {
+      tableName: options.user?.modelName || "user",
+      fields: {
+        name: {
+          type: "string"
+        },
+        email: {
+          type: "string"
+        },
+        emailVerified: {
+          type: "boolean",
+          defaultValue: () => false
+        },
+        image: {
+          type: "string",
+          required: false
+        },
+        createdAt: {
+          type: "date",
+          defaultValue: () => /* @__PURE__ */ new Date()
+        },
+        updatedAt: {
+          type: "date",
+          defaultValue: () => /* @__PURE__ */ new Date()
+        },
+        ...pluginSchema?.user?.fields
+      }
+    },
+    session: {
+      tableName: options.session?.modelName || "session",
+      fields: {
+        expiresAt: {
+          type: "date"
+        },
+        ipAddress: {
+          type: "string",
+          required: false
+        },
+        userAgent: {
+          type: "string",
+          required: false
+        },
+        userId: {
+          type: "string",
+          references: {
+            model: "user",
+            field: "id",
+            onDelete: "cascade"
+          }
+        },
+        ...pluginSchema?.session?.fields
+      }
+    },
+    account: {
+      tableName: options.account?.modelName || "account",
+      fields: {
+        accountId: {
+          type: "string"
+        },
+        providerId: {
+          type: "string"
+        },
+        userId: {
+          type: "string",
+          references: {
+            model: "user",
+            field: "id",
+            onDelete: "cascade"
+          }
+        },
+        accessToken: {
+          type: "string",
+          required: false
+        },
+        refreshToken: {
+          type: "string",
+          required: false
+        },
+        idToken: {
+          type: "string",
+          required: false
+        },
+        accessTokenExpiresAt: {
+          type: "date",
+          required: false
+        },
+        refreshTokenExpiresAt: {
+          type: "date",
+          required: false
+        },
+        password: {
+          type: "string",
+          required: false
+        },
+        ...pluginSchema?.account?.fields
+      }
+    }
+  };
+};
 var { Pool } = pg;
 function convertWhere(w) {
   if (!w)
@@ -2177,127 +2312,6 @@ var getDatabaseType = (config2) => {
   return "sqlite";
 };
 
-// src/adapters/get-tables.ts
-var getAuthTables = (options) => {
-  const pluginSchema = options.plugins?.reduce(
-    (acc, plugin) => {
-      const schema = plugin.schema;
-      if (!schema) return acc;
-      for (const [key, value] of Object.entries(schema)) {
-        acc[key] = {
-          fields: {
-            ...acc[key]?.fields,
-            ...value.fields
-          },
-          tableName: key
-        };
-      }
-      return acc;
-    },
-    {}
-  );
-  return {
-    ...pluginSchema,
-    user: {
-      tableName: options.user?.modelName || "user",
-      fields: {
-        name: {
-          type: "string"
-        },
-        email: {
-          type: "string"
-        },
-        emailVerified: {
-          type: "boolean",
-          defaultValue: () => false
-        },
-        image: {
-          type: "string",
-          required: false
-        },
-        createdAt: {
-          type: "date",
-          defaultValue: () => /* @__PURE__ */ new Date()
-        },
-        updatedAt: {
-          type: "date",
-          defaultValue: () => /* @__PURE__ */ new Date()
-        },
-        ...pluginSchema?.user?.fields
-      }
-    },
-    session: {
-      tableName: options.session?.modelName || "session",
-      fields: {
-        expiresAt: {
-          type: "date"
-        },
-        ipAddress: {
-          type: "string",
-          required: false
-        },
-        userAgent: {
-          type: "string",
-          required: false
-        },
-        userId: {
-          type: "string",
-          references: {
-            model: "user",
-            field: "id",
-            onDelete: "cascade"
-          }
-        },
-        ...pluginSchema?.session?.fields
-      }
-    },
-    account: {
-      tableName: options.account?.modelName || "account",
-      fields: {
-        accountId: {
-          type: "string"
-        },
-        providerId: {
-          type: "string"
-        },
-        userId: {
-          type: "string",
-          references: {
-            model: "user",
-            field: "id",
-            onDelete: "cascade"
-          }
-        },
-        accessToken: {
-          type: "string",
-          required: false
-        },
-        refreshToken: {
-          type: "string",
-          required: false
-        },
-        idToken: {
-          type: "string",
-          required: false
-        },
-        accessTokenExpiresAt: {
-          type: "date",
-          required: false
-        },
-        refreshTokenExpiresAt: {
-          type: "date",
-          required: false
-        },
-        password: {
-          type: "string",
-          required: false
-        },
-        ...pluginSchema?.account?.fields
-      }
-    }
-  };
-};
-
 // src/adapters/utils.ts
 function getAdapter(options) {
   if (!options.database) {
@@ -2356,7 +2370,7 @@ var verifyPassword = async (hash, password) => {
   const targetKey = await generateKey(password, salt);
   return constantTimeEqual(targetKey, decodeHex(key));
 };
-var createInternalAdapter = (adapter, options) => {
+var createInternalAdapter = (adapter, db, options) => {
   const sessionExpiration = options.session?.expiresIn || 60 * 60 * 24 * 7;
   const tables = getAuthTables(options);
   return {
@@ -2460,6 +2474,13 @@ var createInternalAdapter = (adapter, options) => {
       });
       return session;
     },
+    /**
+     * @requires db
+     */
+    deleteSessions: async (userId) => {
+      const sessions = await db.deleteFrom(tables.session.tableName).where("userId", "=", userId).execute();
+      return sessions;
+    },
     findUserByEmail: async (email) => {
       const user = await adapter.findOne({
         model: tables.user.tableName,
@@ -2571,9 +2592,13 @@ var DEFAULT_SECRET = "better-auth-secret-123456789";
 var init = (options) => {
   const adapter = getAdapter(options);
   const db = createKyselyAdapter(options);
+  if (!db) {
+    throw new Error("No database adapter found");
+  }
   const baseURL = getBaseURL(options.baseURL, options.basePath);
   const secret = options.secret || process.env.BETTER_AUTH_SECRET || process.env.AUTH_SECRET || DEFAULT_SECRET;
   const cookies = getCookies(options);
+  const tables = getAuthTables(options);
   return {
     appName: options.appName || "Better Auth",
     options: {
@@ -2581,6 +2606,7 @@ var init = (options) => {
       baseURL: baseURL ? new URL(baseURL).origin : "",
       basePath: options.basePath || "/api/auth"
     },
+    tables,
     baseURL: baseURL || "",
     session: {
       updateAge: options.session?.updateAge || 24 * 60 * 60,
@@ -2599,7 +2625,7 @@ var init = (options) => {
       verify: options.emailAndPassword?.password?.verify || verifyPassword
     },
     adapter,
-    internalAdapter: createInternalAdapter(adapter, options),
+    internalAdapter: createInternalAdapter(adapter, db, options),
     createAuthCookie: createCookieGetter(options)
   };
 };