@base44-preview/cli 0.0.50-pr.475.b600821 → 0.0.50-pr.475.c453156

package/dist/cli/index.js

@@ -253321,7 +253321,9 @@ class Validator {
 }
 
 // src/cli/dev/dev-server/db/database.ts
+var PRIVATE_COLLECTION_PREFIX = "$";
 var USER_COLLECTION = "user";
+var PRIVATE_USER_COLLECTION = PRIVATE_COLLECTION_PREFIX + USER_COLLECTION;
 
 class Database {
   collections = new Map;
@@ -253343,6 +253345,7 @@ class Database {
     this.schemas.set(USER_COLLECTION, this.buildUserSchema(userEntity));
     const collection = new import_nedb.default;
     this.collections.set(USER_COLLECTION, collection);
+    this.collections.set(PRIVATE_USER_COLLECTION, new import_nedb.default);
     const userInfo = await readAuth();
     const now = getNowISOTimestamp();
     await collection.insertAsync({
@@ -253384,7 +253387,9 @@ class Database {
     return this.collections.get(this.normalizeName(name2));
   }
   getCollectionNames() {
-    return Array.from(this.collections.keys());
+    return Array.from(this.collections.keys()).filter((name2) => {
+      return !name2.startsWith(PRIVATE_COLLECTION_PREFIX);
+    });
   }
   dropAll() {
     for (const collection of this.collections.values()) {
@@ -253461,16 +253466,17 @@ var createJwtToken = (email3) => {
     expiresIn: "360d"
   });
 };
+var LoginBody = object({ email: email2(), password: string2() });
+var VerifyOtpBody = object({ email: email2(), otp_code: string2() });
 function createAuthRouter(db2, logger2) {
   const router = import_express2.Router({ mergeParams: true });
-  const userRegistrPendingMap = new Map;
   const parseBody = import_express2.json();
   router.post("/login", parseBody, async (req, res) => {
-    const { email: email3, password } = req.body;
+    const { email: email3, password } = LoginBody.parse(req.body);
     const result = await db2.getCollection(USER_COLLECTION)?.findOneAsync({ email: email3 });
     if (result) {
-      const registeredUserData = userRegistrPendingMap.get(email3);
-      if (result.role === "admin" || registeredUserData?.password === password) {
+      const privateUserData = await db2.getCollection(PRIVATE_USER_COLLECTION)?.findOneAsync({ email: email3 });
+      if (result.role === "admin" || privateUserData?.password === password) {
         res.json({
           access_token: createJwtToken(email3),
           success: true,
@@ -253490,7 +253496,7 @@ function createAuthRouter(db2, logger2) {
     res.status(401).json({ error: "Unauthorized" });
   });
   router.post("/register", parseBody, async (req, res) => {
-    const { email: email3, password } = req.body;
+    const { email: email3, password } = LoginBody.parse(req.body);
     if ((password || "").length < 8) {
       res.status(400).json({
         detail: "Password must be at least 8 characters long",
@@ -253512,15 +253518,27 @@ function createAuthRouter(db2, logger2) {
       });
       return;
     }
-    const otpCode = generateCode();
-    const id2 = nanoid3();
-    userRegistrPendingMap.set(email3, {
-      id: id2,
-      email: email3,
-      otpCode,
-      password,
-      createdAt: +Date.now()
+    const privateUserCollection = db2.getCollection(PRIVATE_USER_COLLECTION);
+    const privateUserData = await privateUserCollection?.findOneAsync({
+      email: email3
     });
+    const otpCode = generateCode();
+    const id2 = privateUserData ? privateUserData.id : nanoid3();
+    if (!privateUserData) {
+      await privateUserCollection?.insertAsync({
+        id: id2,
+        email: email3,
+        otpCode,
+        password,
+        createdAt: Date.now()
+      });
+    } else {
+      await privateUserCollection?.updateAsync({
+        email: email3
+      }, {
+        $set: { otpCode }
+      });
+    }
     logger2.log(theme.styles.info(`
 In order to complete registration use this verification code: ${otpCode}
 `));
@@ -253531,17 +253549,24 @@ In order to complete registration use this verification code: ${otpCode}
     });
   });
   router.post("/verify-otp", parseBody, async (req, res) => {
-    const { email: email3, otp_code } = req.body;
-    const userData = userRegistrPendingMap.get(email3);
-    if (userData && userData.otpCode === otp_code) {
-      if (+Date.now() - userData.createdAt < 10 * 60 * 1000) {
-        userData.otpCode = undefined;
+    const { email: email3, otp_code } = VerifyOtpBody.parse(req.body);
+    const privateUserCollection = db2.getCollection(PRIVATE_USER_COLLECTION);
+    const privateUserData = await privateUserCollection?.findOneAsync({
+      email: email3
+    });
+    if (privateUserData && privateUserData.otpCode === otp_code) {
+      if (+Date.now() - privateUserData.createdAt < 10 * 60 * 1000) {
+        await privateUserCollection?.updateAsync({
+          email: email3
+        }, {
+          $unset: { otpCode: true }
+        });
         const collection = db2.getCollection(USER_COLLECTION);
         const now = getNowISOTimestamp();
         const nameFromEmailMatch = /^([^@]+)/.exec(email3);
         const fullName = nameFromEmailMatch ? nameFromEmailMatch[1] : email3;
         await collection?.insertAsync({
-          id: userData.id,
+          id: privateUserData.id,
           email: email3,
           full_name: fullName,
           is_service: false,
@@ -253553,7 +253578,7 @@ In order to complete registration use this verification code: ${otpCode}
           updated_date: now
         });
         res.json({
-          id: userData.id,
+          id: privateUserData.id,
           access_token: createJwtToken(email3),
           message: "Email verified successfully. You are now logged in.",
           success: true
@@ -260365,4 +260390,4 @@ export {
   CLIExitError
 };
 
-//# debugId=404C42E5E0DB4C5E64756E2164756E21
+//# debugId=FD0C9C6814D0182C64756E2164756E21