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

package/dist/cli/index.js

@@ -253461,26 +253461,30 @@ var createJwtToken = (email3) => {
     expiresIn: "360d"
   });
 };
-var UserRegiterSchema = object({
-  id: string2(),
-  email: email2(),
-  otpCode: string2().length(6),
-  password: string2().min(8),
-  createdAt: number2().min(1)
-});
 function createAuthRouter(db2, logger2) {
   const router = import_express2.Router({ mergeParams: true });
-  const userRegitrPendingMap = new Map;
+  const userRegistrPendingMap = new Map;
   const parseBody = import_express2.json();
   router.post("/login", parseBody, async (req, res) => {
-    const { email: email3, password: _password } = req.body;
+    const { email: email3, password } = req.body;
     const result = await db2.getCollection(USER_COLLECTION)?.findOneAsync({ email: email3 });
     if (result) {
-      res.json({
-        access_token: createJwtToken(email3),
-        success: true,
-        user: {}
-      });
+      const registeredUserData = userRegistrPendingMap.get(email3);
+      if (result.role === "admin" || registeredUserData?.password === password) {
+        res.json({
+          access_token: createJwtToken(email3),
+          success: true,
+          user: {}
+        });
+      } else {
+        res.status(400).json({
+          detail: "Invalid email or password",
+          error_type: "HTTPException",
+          message: "Invalid email or password",
+          request_id: null,
+          traceback: ""
+        });
+      }
       return;
     }
     res.status(401).json({ error: "Unauthorized" });
@@ -253510,7 +253514,7 @@ function createAuthRouter(db2, logger2) {
     }
     const otpCode = generateCode();
     const id2 = nanoid3();
-    userRegitrPendingMap.set(email3, {
+    userRegistrPendingMap.set(email3, {
       id: id2,
       email: email3,
       otpCode,
@@ -253528,9 +253532,10 @@ 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 = userRegitrPendingMap.get(email3);
+    const userData = userRegistrPendingMap.get(email3);
     if (userData && userData.otpCode === otp_code) {
       if (+Date.now() - userData.createdAt < 10 * 60 * 1000) {
+        userData.otpCode = undefined;
         const collection = db2.getCollection(USER_COLLECTION);
         const now = getNowISOTimestamp();
         const nameFromEmailMatch = /^([^@]+)/.exec(email3);
@@ -260360,4 +260365,4 @@ export {
   CLIExitError
 };
 
-//# debugId=7F65D5426750E8BD64756E2164756E21
+//# debugId=404C42E5E0DB4C5E64756E2164756E21