Merge branch 'develop' into feature/Web/Hourly-Predictions-and-Recomm…

…endations
COS301-SE-2024 · Sep 26, 2024 · 97d3c14 · 97d3c14
2 parents c5e13fe + fceed30
commit 97d3c14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/occupi-backend/pkg/handlers/auth_handlers.go b/occupi-backend/pkg/handlers/auth_handlers.go
@@ -151,7 +151,6 @@ func BeginLoginAdmin(ctx *gin.Context, appsession *models.AppSession) {
 			http.StatusOK,
 			"Error getting user credentials, please register for WebAuthn",
 			gin.H{"error": "Error getting user credentials, please register for WebAuthn"}))
-		fmt.Printf("error getting user credentials: %v", err)
 		return
 	}
 	webauthnUser := models.NewWebAuthnUser([]byte(requestEmail.Email), requestEmail.Email, requestEmail.Email, cred)

diff --git a/occupi-backend/pkg/handlers/auth_helpers.go b/occupi-backend/pkg/handlers/auth_helpers.go
@@ -299,16 +299,6 @@ func PreLoginAccountChecks(ctx *gin.Context, appsession *models.AppSession, emai
 		return false, err
 	}
 
-	if !verified {
-		ctx.JSON(http.StatusBadRequest, utils.ErrorResponse(
-			http.StatusBadRequest,
-			"Not verified",
-			constants.IncompleteAuthCode,
-			"Please verify your email before logging in",
-			nil))
-		return false, nil
-	}
-
 	// check if the user is an admin
 	if role == constants.Admin {
 		isAdmin, err := database.CheckIfUserIsAdmin(ctx, appsession, email)
@@ -392,7 +382,7 @@ func PreLoginAccountChecks(ctx *gin.Context, appsession *models.AppSession, emai
 	}
 
 	switch {
-	case isVerificationDue:
+	case isVerificationDue, !verified:
 		// update verification status in database to false
 		_, err = database.UpdateVerificationStatusTo(ctx, appsession, email, false)
 		if err != nil {