pull from dev

Author: rafiquecudjoe

backend/package-lock.json

@@ -252,37 +252,15 @@ export default class AuthController {
             return next(error);
         }
     };
-<<<<<<< HEAD
-
-    static deleteUser = async (req, res, next) => {
-        try {
-            // Validate with Joi
-            const validatePayload = Joi.object({
-                email: Joi.string().required(),
-=======
     static resendVerifyEmail = async (req, res, next) => {
         try {
             const validatePayload = Joi.object({
                 email: Joi.string().required().email().label("Email"),
->>>>>>> 23da1948e1d386ee3255c910ef563c1826a4a1dd
             }).strict();
 
             if (validatePayload.validate(req.body).error) {
                 return res.status(400).json(validatePayload.validate(req.body).error.details);
             }
-<<<<<<< HEAD
-            
-            // Deleter Servers
-             await removeuser(req.body)
-
-            // Clear session 
-            res.clearCookie("connect.sid");
-
-
-            res.status(200).json({ message: "User Successfully removed",});
-        } catch (error) {
-            return next(error);
-=======
 
             const user = await resendEmailVerification(req.body);
 
@@ -300,7 +278,29 @@ export default class AuthController {
             });
         } catch (error) {
             next(error);
->>>>>>> 23da1948e1d386ee3255c910ef563c1826a4a1dd
+        }
+    };
+    static deleteUser = async (req, res, next) => {
+        try {
+            // Validate with Joi
+            const validatePayload = Joi.object({
+                email: Joi.string().required(),
+            }).strict();
+
+            if (validatePayload.validate(req.body).error) {
+                return res.status(400).json(validatePayload.validate(req.body).error.details);
+            }
+
+            // Deleter Servers
+            await removeuser(req.body)
+
+            // Clear session 
+            res.clearCookie("connect.sid");
+
+
+            res.status(200).json({ message: "User Successfully removed", });
+        } catch (error) {
+            return next(error);
         }
     };
 }

backend/src/controllers/AuthController.js

@@ -54,7 +54,7 @@
   "resolved" "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz"
   "version" "7.20.1"
 
-"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.20.2", "@babel/core@^7.4.0-0", "@babel/core@>=7.11.0":
+"@babel/core@^7.20.2":
   "integrity" "sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g=="
   "resolved" "https://registry.npmjs.org/@babel/core/-/core-7.20.2.tgz"
   "version" "7.20.2"
@@ -963,7 +963,7 @@
   dependencies:
     "text-decoding" "^1.0.0"
 
-"@firebase/app-types@0.8.1", "@firebase/app-types@0.x":
+"@firebase/app-types@0.8.1":
   "integrity" "sha512-p75Ow3QhB82kpMzmOntv866wH9eZ3b4+QbUY+8/DA5Zzdf1c8Nsk8B7kbFpzJt4wwHMdy5LTF5YUnoTc1JiWkw=="
   "resolved" "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.8.1.tgz"
   "version" "0.8.1"
@@ -1020,7 +1020,7 @@
   dependencies:
     "tslib" "^2.1.0"
 
-"@firebase/util@1.7.3", "@firebase/util@1.x":
+"@firebase/util@1.7.3":
   "integrity" "sha512-wxNqWbqokF551WrJ9BIFouU/V5SL1oYCGx1oudcirdhadnQRFH5v1sjgGL7cUV/UsekSycygphdrF2lxBxOYKg=="
   "resolved" "https://registry.npmjs.org/@firebase/util/-/util-1.7.3.tgz"
   "version" "1.7.3"
@@ -1397,7 +1397,7 @@
   "resolved" "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz"
   "version" "4.0.2"
 
-"@types/markdown-it@*", "@types/markdown-it@^12.2.3":
+"@types/markdown-it@^12.2.3":
   "integrity" "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="
   "resolved" "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.2.3.tgz"
   "version" "12.2.3"
@@ -1463,7 +1463,7 @@
   "resolved" "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   "version" "5.3.2"
 
-"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", "acorn@^8.8.0":
+"acorn@^8.8.0":
   "integrity" "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="
   "resolved" "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"
   "version" "8.8.1"
@@ -2006,7 +2006,7 @@
   "resolved" "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz"
   "version" "1.3.1"
 
-"browserslist@^4.21.3", "browserslist@^4.21.4", "browserslist@>= 4.21.0":
+"browserslist@^4.21.3", "browserslist@^4.21.4":
   "integrity" "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="
   "resolved" "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz"
   "version" "4.21.4"
@@ -2764,7 +2764,7 @@
   "resolved" "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   "version" "3.3.0"
 
-"eslint@^7.5.0 || ^8.0.0", "eslint@^8.27.0", "eslint@>= 4.12.1", "eslint@>=5":
+"eslint@^8.27.0":
   "integrity" "sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ=="
   "resolved" "https://registry.npmjs.org/eslint/-/eslint-8.27.0.tgz"
   "version" "8.27.0"
@@ -2967,7 +2967,7 @@
     "lodash" "^4.17.21"
     "validator" "^13.7.0"
 
-"express@^4.18.2", "express@>=4.0.0":
+"express@^4.18.2":
   "integrity" "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="
   "resolved" "https://registry.npmjs.org/express/-/express-4.18.2.tgz"
   "version" "4.18.2"
@@ -4038,7 +4038,7 @@
   "resolved" "https://registry.npmjs.org/joi-password-complexity/-/joi-password-complexity-5.1.0.tgz"
   "version" "5.1.0"
 
-"joi@^17.7.0", "joi@>= 17":
+"joi@^17.7.0":
   "integrity" "sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg=="
   "resolved" "https://registry.npmjs.org/joi/-/joi-17.7.0.tgz"
   "version" "17.7.0"
@@ -4557,7 +4557,7 @@
   "resolved" "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz"
   "version" "8.6.5"
 
-"markdown-it@*", "markdown-it@^12.3.2":
+"markdown-it@^12.3.2":
   "integrity" "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="
   "resolved" "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz"
   "version" "12.3.2"
@@ -5062,11 +5062,6 @@
   dependencies:
     "mimic-fn" "^4.0.0"
 
-"openapi-types@>=7":
-  "integrity" "sha512-XpeCy01X6L5EpP+6Hc3jWN7rMZJ+/k1lwki/kTmWzbVhdPie3jd5O2ZtedEx8Yp58icJ0osVldLMrTB/zslQXA=="
-  "resolved" "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.0.tgz"
-  "version" "12.1.0"
-
 "optionator@^0.8.1":
   "integrity" "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="
   "resolved" "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"