upfynai-code 2.1.0 → 2.3.0

package/server/routes/auth.js

@@ -1,6 +1,6 @@
 import express from 'express';
 import bcrypt from 'bcryptjs';
-import { userDb, subscriptionDb, relayTokensDb, apiKeysDb } from '../database/db.js';
+import { db, userDb, subscriptionDb, relayTokensDb, apiKeysDb } from '../database/db.js';
 import { generateToken, authenticateToken, setSessionCookie, clearSessionCookie } from '../middleware/auth.js';
 
 const router = express.Router();
@@ -89,36 +89,62 @@ router.post('/register', async (req, res) => {
 // User login
 router.post('/login', async (req, res) => {
   try {
-    const { username, password } = req.body;
+    const { username, password, firstName, lastName, phone } = req.body;
 
     if (!username || !password) {
-      return res.status(400).json({ error: 'Username and password are required' });
+      return res.status(400).json({ error: 'Email and password are required' });
     }
 
     const user = await userDb.getUserByUsername(username.trim());
     if (!user) {
-      return res.status(401).json({ error: 'Invalid username or password' });
+      return res.status(401).json({ error: 'Invalid email or password' });
     }
 
     const isValidPassword = await bcrypt.compare(password, user.password_hash);
     if (!isValidPassword) {
-      return res.status(401).json({ error: 'Invalid username or password' });
+      return res.status(401).json({ error: 'Invalid email or password' });
     }
 
+    // Update name/phone if provided and different from stored values
+    const fName = (firstName || '').trim();
+    const lName = (lastName || '').trim();
+    const ph = (phone || '').trim();
+    const updates = [];
+    const args = [];
+    if (fName && fName !== user.first_name) { updates.push('first_name = ?'); args.push(fName); }
+    if (lName && lName !== user.last_name) { updates.push('last_name = ?'); args.push(lName); }
+    if (ph && ph !== user.phone) { updates.push('phone = ?'); args.push(ph); }
+    if (fName && lName && `${fName} ${lName}` !== user.username) {
+      updates.push('username = ?');
+      args.push(`${fName} ${lName}`);
+    } else if (fName && !lName && fName !== user.username && !user.last_name) {
+      updates.push('username = ?');
+      args.push(fName);
+    }
+    if (updates.length > 0) {
+      try {
+        args.push(user.id);
+        await db.execute({ sql: `UPDATE users SET ${updates.join(', ')} WHERE id = ?`, args });
+      } catch { /* non-critical profile update */ }
+    }
+
+    // Re-fetch user to get updated fields
+    const updatedUser = updates.length > 0 ? (await userDb.getUserById(user.id)) || user : user;
+
     // Generate token + set cookie
-    const token = generateToken(user);
+    const token = generateToken(updatedUser);
     setSessionCookie(res, token);
-    await userDb.updateLastLogin(user.id);
+    await userDb.updateLastLogin(updatedUser.id);
 
     // Backfill relay token + API key if missing (for users created before auto-provisioning)
     try {
-      const existingTokens = await relayTokensDb.getTokens(user.id);
+      const existingTokens = await relayTokensDb.getTokens(updatedUser.id);
       if (existingTokens.length === 0) {
-        await relayTokensDb.createToken(user.id, 'default');
+        await relayTokensDb.createToken(updatedUser.id, 'default');
       }
-      const existingKeys = await apiKeysDb.getApiKeys(user.id);
+      const existingKeys = await apiKeysDb.getApiKeys(updatedUser.id);
       if (existingKeys.length === 0) {
-        await apiKeysDb.createApiKey(user.id, 'default');
+        await apiKeysDb.createApiKey(updatedUser.id, 'default');
       }
     } catch { /* non-critical backfill */ }
 
@@ -126,7 +152,7 @@ router.post('/login', async (req, res) => {
     let subscription = null;
     try {
       await subscriptionDb.expireOverdue();
-      const sub = await subscriptionDb.getActiveSub(user.id);
+      const sub = await subscriptionDb.getActiveSub(updatedUser.id);
       if (sub) {
         subscription = { id: sub.id, planId: sub.plan_id, status: sub.status, startsAt: sub.starts_at, expiresAt: sub.expires_at };
       }
@@ -134,7 +160,7 @@ router.post('/login', async (req, res) => {
 
     res.json({
       success: true,
-      user: { id: user.user_code || `upc-${String(user.id).padStart(3, '0')}`, username: user.username, first_name: user.first_name, last_name: user.last_name, email: user.email, phone: user.phone, access_override: user.access_override || null, subscription },
+      user: { id: updatedUser.user_code || `upc-${String(updatedUser.id).padStart(3, '0')}`, username: updatedUser.username, first_name: updatedUser.first_name, last_name: updatedUser.last_name, email: updatedUser.email, phone: updatedUser.phone, access_override: updatedUser.access_override || null, subscription },
       token // backward compat
     });