redone routes

src/routes/auth/auth-authenticated.ts

@@ -1,12 +1,15 @@
-import { FastifyInstance } from "fastify";
-import bcrypt from "bcrypt";
+import { FastifyInstance } from "fastify"
+import bcrypt from "bcrypt"
+import { eq } from "drizzle-orm"
 
+import { authUsers } from "../../../db/schema"  // wichtig: Drizzle Schema importieren!
 
 export default async function authRoutesAuthenticated(server: FastifyInstance) {
+
     server.post("/auth/password/change", {
         schema: {
             tags: ["Auth"],
-            summary: "Reset Password after forced change",
+            summary: "Change password (after login or forced reset)",
             body: {
                 type: "object",
                 required: ["old_password", "new_password"],
@@ -25,54 +28,69 @@ export default async function authRoutesAuthenticated(server: FastifyInstance) {
             },
         },
     }, async (req, reply) => {
-        const { old_password, new_password } = req.body as { old_password: string; new_password: string };
 
-        console.log(req.user)
+        try {
+            const { old_password, new_password } = req.body as {
+                old_password: string
+                new_password: string
+            }
 
-        const user_id = req.user?.user_id; // kommt aus JWT Middleware
-        if (!user_id) {
-            // @ts-ignore
-            return reply.code(401).send({ error: "Unauthorized" });
+            const userId = req.user?.user_id
+            if (!userId) {
+                //@ts-ignore
+                return reply.code(401).send({ error: "Unauthorized" })
+            }
+
+            // -----------------------------------------------------
+            // 1) User laden
+            // -----------------------------------------------------
+            const [user] = await server.db
+                .select({
+                    id: authUsers.id,
+                    passwordHash: authUsers.passwordHash,
+                    mustChangePassword: authUsers.must_change_password
+                })
+                .from(authUsers)
+                .where(eq(authUsers.id, userId))
+                .limit(1)
+
+            if (!user) {
+                //@ts-ignore
+                return reply.code(404).send({ error: "User not found" })
+            }
+
+            // -----------------------------------------------------
+            // 2) Altes PW prüfen
+            // -----------------------------------------------------
+            const valid = await bcrypt.compare(old_password, user.passwordHash)
+            if (!valid) {
+                //@ts-ignore
+                return reply.code(401).send({ error: "Old password incorrect" })
+            }
+
+            // -----------------------------------------------------
+            // 3) Neues PW hashen
+            // -----------------------------------------------------
+            const newHash = await bcrypt.hash(new_password, 10)
+
+            // -----------------------------------------------------
+            // 4) Updaten
+            // -----------------------------------------------------
+            await server.db
+                .update(authUsers)
+                .set({
+                    passwordHash: newHash,
+                    must_change_password: false,
+                    updatedAt: new Date(),
+                })
+                .where(eq(authUsers.id, userId))
+
+            return { success: true }
+
+        } catch (err) {
+            console.error("POST /auth/password/change ERROR:", err)
+            //@ts-ignore
+            return reply.code(500).send({ error: "Internal Server Error" })
         }
-
-        // Nutzer laden
-        const { data: user, error } = await server.supabase
-            .from("auth_users")
-            .select("id, password_hash, must_change_password")
-            .eq("id", user_id)
-            .single();
-
-        if (error || !user) {
-            // @ts-ignore
-            return reply.code(404).send({ error: "User not found" });
-        }
-
-        // Altes Passwort prüfen
-        const valid = await bcrypt.compare(old_password, user.password_hash);
-        if (!valid) {
-            // @ts-ignore
-            return reply.code(401).send({ error: "Old password incorrect" });
-        }
-
-        // Neues Passwort hashen
-        const newHash = await bcrypt.hash(new_password, 10);
-
-        // Speichern + Flag zurücksetzen
-        const { error: updateError } = await server.supabase
-            .from("auth_users")
-            .update({
-                password_hash: newHash,
-                must_change_password: false,
-                updated_at: new Date().toISOString(),
-            })
-            .eq("id", user_id);
-
-        if (updateError) {
-            console.log(updateError);
-            // @ts-ignore
-            return reply.code(500).send({ error: "Password update failed" });
-        }
-
-        return { success: true };
-    });
-}
+    })
+}