Merge branch 'main' of https://github.com/CSC-308-TeamC/BE-scheduling

CSC-308-TeamC · Jun 3, 2022 · fb9ef64 · fb9ef64
2 parents 8348205 + 2e6f936
commit fb9ef64
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -15,7 +15,7 @@ jobs:
         os: [ubuntu-latest] # macos-latest, windows-latest
         node-version: [16.x]
         #See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-        #
+
 
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,6 @@ jobs:
       - run: npm test
       - uses: akhileshns/[email protected]
         with:
-
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
           heroku_app_name: "dog-grooming-api"
           heroku_email: "[email protected]"
diff --git a/API-Modules/Controllers/User-Controller.js b/API-Modules/Controllers/User-Controller.js
@@ -24,11 +24,12 @@ function generateAccessToken(email) {
 
 async function signUp(req, res) {
   if (!req.body.email || !req.body.password) {
+    console.log("fail 1");
     //Missing password or Missing Email
     res.status(400).send("Bad request: Missing field.");
   } else {
     //Has password and email
-    if (userServices.getUserByEmail(req.body.email)) {
+    if (await userServices.getUserByEmail(req.body.email)) {
       //Email has already been used
       res.status(409).send("Email already taken.");
     } else {

diff --git a/DB-Modules/Services/user-services.js b/DB-Modules/Services/user-services.js
@@ -28,6 +28,7 @@ async function getUserByEmail(email) {
 }
 
 async function addUser(user) {
+  console.log("From add user" + user);
   dbC = dbConnection.getDbConnection(dbC);
   const userModel = dbC.model("User", UserSchema);
   // generate salt to hash password