♻️ Refactor basic authentication

Author: hirsch88

src/api/models/User.ts

@@ -38,4 +38,8 @@ export class User {
         return `${this.firstName} ${this.lastName} (${this.email})`;
     }
 
+    public toBase64(): string {
+        return Buffer.from(`${this.username}:${this.password}`).toString('base64');
+    }
+
 }

src/auth/AuthService.ts

@@ -23,24 +23,22 @@ export class AuthService {
             const decodedToken = Buffer.from(authorization.split(' ')[1], 'base64').toString('ascii');
             const username = decodedToken.split(':')[0];
             const password = decodedToken.split(':')[1];
-            return { username, password };
+            if (username && password) {
+                return { username, password };
+            }
         }
 
         this.log.info('No Token provided by the client');
         return undefined;
     }
 
-    public async validateUser(username: string, password: string): Promise<User> {
-        const user = await this.userRepository.findOne({
+    public async findUserByUsernameAndPassword(username: string, password: string): Promise<User> {
+        return this.userRepository.findOne({
             where: {
                 username,
                 password,
             },
         });
-        if (user) {
-            return user;
-        }
-        throw new Error('Invalid credentials');
     }
 
 }

src/auth/authorizationChecker.ts

@@ -22,13 +22,13 @@ export function authorizationChecker(connection: Connection): (action: Action, r
             return false;
         }
 
-        try {
-            action.request.user = await authService.validateUser(credentials.username, credentials.password);
-            log.info('Successfully checked credentials');
-            return true;
-        } catch (e) {
-            log.warn(e);
+        action.request.user = await authService.findUserByUsernameAndPassword(credentials.username, credentials.password);
+        if (action.request.user === undefined) {
+            log.warn('Invalid credentials given');
             return false;
         }
+
+        log.info('Successfully checked credentials');
+        return true;
     };
 }