remove nesting; add error msg to jwt gen func

Author: DylanBulmer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codrjs/core",
-  "version": "1.0.6-patch4",
+  "version": "1.0.6-patch5",
   "description": "An open-sourced customizable annotation tool",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

src/classes/JWT.ts

@@ -64,7 +64,10 @@ export function generateToken(payload: IUser) {
       subject: payload?._id,
     };
     return jwt.sign(payload, <string>process.env.JWT_SECRET, signOpts);
-  } catch (err) {
-    throw new Error({ status: 500, message: <string>err });
+  } catch (err: any) {
+    throw new Error({
+      status: 500,
+      message: err?.message || "Could generate the JWT token",
+    });
   }
 }

src/services/auth.ts

@@ -45,98 +45,90 @@ class Authentication {
       });
     }
 
-    try {
-      const user = await User.findOne({ email });
-      if (!user) {
-        // is user cannot be found, then they are not allowed in.
-        throw new Error({
-          status: 401,
-          message:
-            "It appears you do not have an account using this email, please contact your Codr admin to gain access.",
+    const user = await User.findOne({ email });
+    if (!user) {
+      // is user cannot be found, then they are not allowed in.
+      throw new Error({
+        status: 401,
+        message:
+          "It appears you do not have an account using this email, please contact your Codr admin to gain access.",
+      });
+    } else if (!token) {
+      try {
+        // init access token
+        const uuid = uuidv4();
+        const accessToken = new AccessToken(uuid);
+        await user.updateOne({
+          accessToken: accessToken.encode(),
         });
-      } else if (!token) {
-        try {
-          // init access token
-          const uuid = uuidv4();
-          const accessToken = new AccessToken(uuid);
-          await user.updateOne({
-            accessToken: accessToken.encode(),
-          });
-
-          // send email with access code/token
-          const link =
-            `${process.env.HOST}${process.env.API_PATH}` +
-            "/auth/email/verify?token=" +
-            encrypt(JSON.stringify({ email: email, token: uuid }));
-          const template = new SigninTemplate();
-          await Mail.send(await template.html({ link }), {
-            ...template.config,
-            to: email,
-          });
-          return new Response({
-            message: "An email has been sent to your inbox.",
-          });
-        } catch (e: any) {
-          throw new Error({
-            status: 500,
-            message: e?.message || "An unknown error occured",
-          });
-        }
-      } else if (user.accessToken) {
-        // decrypt the stored access code
-        const accessToken = new AccessToken(user.accessToken);
 
-        // check if:
-        // * the tokens match
-        // * the token was created less than 5 minutes ago
-        // * and the token is not expired (has not been used already)
-        if (accessToken.isValid(token)) {
+        // send email with access code/token
+        const link =
+          `${process.env.HOST}${process.env.API_PATH}` +
+          "/auth/email/verify?token=" +
+          encrypt(JSON.stringify({ email: email, token: uuid }));
+        const template = new SigninTemplate();
+        await Mail.send(await template.html({ link }), {
+          ...template.config,
+          to: email,
+        });
+        return new Response({
+          message: "An email has been sent to your inbox.",
+        });
+      } catch (e: any) {
+        throw new Error({
+          status: 500,
+          message: e?.message || "An unknown error occured",
+          details: e,
+        });
+      }
+    } else if (user.accessToken) {
+      // decrypt the stored access code
+      const accessToken = new AccessToken(user.accessToken);
 
-          // update access token
-          accessToken.use();
+      // check if:
+      // * the tokens match
+      // * the token was created less than 5 minutes ago
+      // * and the token is not expired (has not been used already)
+      if (accessToken.isValid(token)) {
+        // update access token
+        accessToken.use();
 
-          // init user update
-          const update = {
-            accessToken: accessToken.encode(),
-            refreshToken: new AccessToken(uuidv4()).encode(),
-          };
+        // init user update
+        const update = {
+          accessToken: accessToken.encode(),
+          refreshToken: new AccessToken(uuidv4()).encode(),
+        };
 
-          try {
-            // update user
-            await user.updateOne(update);
+        try {
+          // update user
+          await user.updateOne(update);
 
-            // generate JWT token
-            const token = generateToken({ ...user, ...update } as IUser);
+          // generate JWT token
+          const token = generateToken({ ...user, ...update } as IUser);
 
-            // send response
-            return new Response<{ token: string }>({
-              message: `Login successful.`,
-              details: { token },
-            });
-          } catch (e: any) {
-            throw new Error({
-              status: 500,
-              message:
-                e?.message ||
-                "An unexpected error occured while updating a user.",
-            });
-          }
-        } else
+          // send response
+          return new Response<{ token: string }>({
+            message: `Login successful.`,
+            details: { token },
+          });
+        } catch (e: any) {
           throw new Error({
             status: 500,
-            message: "Login link expired or is invalid.",
+            message: "An unexpected error occured while updating a user.",
+            details: e,
           });
-      } else {
+        }
+      } else
         throw new Error({
           status: 500,
-          message:
-            "An unknown error occured while authenticating an access token.",
+          message: "Login link expired or is invalid.",
         });
-      }
-    } catch (e: any) {
+    } else {
       throw new Error({
         status: 500,
-        message: e?.message || "An unknown error occured",
+        message:
+          "An unknown error occured while authenticating an access token.",
       });
     }
   }