@base44-preview/cli 0.0.50-pr.475.6fca043 → 0.0.50-pr.475.7817b8d

package/dist/cli/index.js

@@ -243211,6 +243211,7 @@ var package_default = {
     "@types/ejs": "^3.1.5",
     "@types/express": "^5.0.6",
     "@types/json-schema": "^7.0.15",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/lodash": "^4.17.24",
     "@types/multer": "^2.0.0",
     "@types/node": "^22.10.5",
@@ -243229,6 +243230,7 @@ var package_default = {
     globby: "^16.1.0",
     "http-proxy-middleware": "^3.0.5",
     "json-schema-to-typescript": "^15.0.4",
+    jsonwebtoken: "^9.0.3",
     json5: "^2.2.3",
     ky: "^1.14.2",
     lodash: "^4.17.23",
@@ -253094,9 +253096,13 @@ function createFunctionRouter(manager, logger2) {
     on: {
       proxyReq: (proxyReq, req) => {
         const xAppId = req.headers["x-app-id"];
+        const authorization = req.headers.authorization;
         if (xAppId) {
           proxyReq.setHeader("Base44-App-Id", xAppId);
         }
+        if (authorization) {
+          proxyReq.setHeader("Base44-Service-Authorization", authorization);
+        }
         proxyReq.setHeader("Base44-Api-Url", `${req.protocol}://${req.headers.host}`);
       },
       error: (err, _req, res) => {
@@ -253466,11 +253472,13 @@ 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 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 privateUserData = await db2.getCollection(PRIVATE_USER_COLLECTION)?.findOneAsync({ email: email3 });
@@ -253494,7 +253502,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",
@@ -253520,7 +253528,7 @@ function createAuthRouter(db2, logger2) {
     const privateUserData = await privateUserCollection?.findOneAsync({
       email: email3
     });
-    const otpCode = privateUserData ? privateUserData.otpCode : generateCode();
+    const otpCode = generateCode();
     const id2 = privateUserData ? privateUserData.id : nanoid3();
     if (!privateUserData) {
       await privateUserCollection?.insertAsync({
@@ -253528,7 +253536,16 @@ function createAuthRouter(db2, logger2) {
         email: email3,
         otpCode,
         password,
-        createdAt: +Date.now()
+        createdAt: Date.now()
+      });
+    } else {
+      await privateUserCollection?.updateAsync({
+        email: email3
+      }, {
+        $set: {
+          otpCode,
+          createdAt: Date.now()
+        }
       });
     }
     logger2.log(theme.styles.info(`
@@ -253541,19 +253558,17 @@ 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 { 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) {
-        privateUserCollection?.updateAsync({
+        await privateUserCollection?.updateAsync({
           email: email3
         }, {
-          $set: {
-            otpCode: undefined
-          }
+          $unset: { otpCode: true }
         });
         const collection = db2.getCollection(USER_COLLECTION);
         const now = getNowISOTimestamp();
@@ -260384,4 +260399,4 @@ export {
   CLIExitError
 };
 
-//# debugId=00A0741C1AAAE2DF64756E2164756E21
+//# debugId=CB186C06DA18198C64756E2164756E21