code improvements

uoa-compsci399-s1-2024 · Apr 26, 2024 · f125049 · f125049
1 parent aa15f26
commit f125049
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/backend/src/services/auth/auth.service.ts b/backend/src/services/auth/auth.service.ts
@@ -21,24 +21,20 @@ export default class AuthContext {
     }
 
     async login(username: string, password: string): Promise<Nullable<{ token: string; user: User }>> {
-        try {
-            await this.authServiceProvider.authenticateUser(username, password)
-
-            // no error? means auth succeeded
-
-            // update this to show additional user details
-            const authenticatedUser = new User({
-                username: username,
-                email: username,
-                displayName: "Admin",
-                verified: true,
-                registeredAt: undefined,
-            })
-
-            return { token: this.issueToken(username), user: authenticatedUser }
-        } catch (e) {
+        if (!(await this.authServiceProvider.authenticateUser(username, password))) {
             return null
         }
+
+        // update this to show additional user details
+        const authenticatedUser = new User({
+            username: username,
+            email: username,
+            displayName: "Admin",
+            verified: true,
+            registeredAt: undefined,
+        })
+
+        return { token: this.issueToken(username), user: authenticatedUser }
     }
 
     verifyToken(token: string): Nullable<string | JwtPayload> {