✅ Adjust tests for new AuthService

Author: hirsch88

test/e2e/api/users.test.ts

@@ -5,7 +5,6 @@ import { User } from '../../../src/api/models/User';
 import { CreateBruce } from '../../../src/database/seeds/CreateBruce';
 import { runSeed } from '../../../src/lib/seed';
 import { closeDatabase } from '../../utils/database';
-import { fakeAuthenticationForUser } from '../utils/auth';
 import { BootstrapSettings } from '../utils/bootstrap';
 import { prepareServer } from '../utils/server';
 
@@ -21,7 +20,6 @@ describe('/api/users', () => {
     beforeAll(async () => {
         settings = await prepareServer({ migrate: true });
         bruce = await runSeed<User>(CreateBruce);
-        fakeAuthenticationForUser(bruce, true);
     });
 
     // -------------------------------------------------------------------------
@@ -40,7 +38,7 @@ describe('/api/users', () => {
     test('GET: / should return a list of users', async (done) => {
         const response = await request(settings.app)
             .get('/api/users')
-            .set('Authorization', `Bearer 1234`)
+            .set('Authorization', `Basic ${bruce.toBase64()}`)
             .expect('Content-Type', /json/)
             .expect(200);
 
@@ -51,7 +49,7 @@ describe('/api/users', () => {
     test('GET: /:id should return bruce', async (done) => {
         const response = await request(settings.app)
             .get(`/api/users/${bruce.id}`)
-            .set('Authorization', `Bearer 1234`)
+            .set('Authorization', `Basic ${bruce.toBase64()}`)
             .expect('Content-Type', /json/)
             .expect(200);
 

test/unit/auth/AuthService.test.ts

@@ -1,76 +1,55 @@
 import { Request } from 'express';
 import * as MockExpressRequest from 'mock-express-request';
-import * as nock from 'nock';
-import * as request from 'request';
+import { User } from 'src/api/models/User';
 
 import { AuthService } from '../../../src/auth/AuthService';
-import { env } from '../../../src/env';
 import { LogMock } from '../lib/LogMock';
+import { RepositoryMock } from '../lib/RepositoryMock';
 
 describe('AuthService', () => {
 
     let authService: AuthService;
+    let userRepository: RepositoryMock<User>;
     let log: LogMock;
     beforeEach(() => {
         log = new LogMock();
-        authService = new AuthService(log);
+        userRepository = new RepositoryMock<User>();
+        authService = new AuthService(log, userRepository as any);
     });
 
     describe('parseTokenFromRequest', () => {
-        test('Should return the token without Bearer', () => {
+        test('Should return the credentials of the basic authorization header', () => {
+            const base64 = Buffer.from(`bruce:1234`).toString('base64');
             const req: Request = new MockExpressRequest({
                 headers: {
-                    Authorization: 'Bearer 1234',
+                    Authorization: `Basic ${base64}`,
                 },
             });
-            const token = authService.parseTokenFromRequest(req);
-            expect(token).toBe('1234');
+            const credentials = authService.parseBasicAuthFromRequest(req);
+            expect(credentials.username).toBe('bruce');
+            expect(credentials.password).toBe('1234');
         });
 
-        test('Should return undefined if there is no Bearer', () => {
+        test('Should return undefined if there is no basic authorization header', () => {
             const req: Request = new MockExpressRequest({
-                headers: {
-                    Authorization: 'Basic 1234',
-                },
+                headers: {},
             });
-            const token = authService.parseTokenFromRequest(req);
+            const token = authService.parseBasicAuthFromRequest(req);
             expect(token).toBeUndefined();
             expect(log.infoMock).toBeCalledWith('No Token provided by the client', []);
         });
 
-        test('Should return undefined if there is no "Authorization" header', () => {
-            const req: Request = new MockExpressRequest();
-            const token = authService.parseTokenFromRequest(req);
+        test('Should return undefined if there is a invalid basic authorization header', () => {
+            const req: Request = new MockExpressRequest({
+                headers: {
+                    Authorization: 'Basic 1234',
+                },
+            });
+            const token = authService.parseBasicAuthFromRequest(req);
             expect(token).toBeUndefined();
             expect(log.infoMock).toBeCalledWith('No Token provided by the client', []);
         });
-    });
 
-    describe('getTokenInfo', () => {
-        test('Should get the tokeninfo', async (done) => {
-            nock(env.auth.route)
-                .post('')
-                .reply(200, {
-                    user_id: 'auth0|test@test.com',
-                });
-
-            const tokeninfo = await authService.getTokenInfo('1234');
-            expect(tokeninfo.user_id).toBe('auth0|test@test.com');
-            done();
-        });
-
-        test('Should fail due to invalid token', async (done) => {
-            nock(env.auth.route)
-                .post('')
-                .reply(401, 'Invalid token');
-
-            try {
-                await authService.getTokenInfo('1234');
-            } catch (error) {
-                expect(error).toBe('Invalid token');
-            }
-            done();
-        });
     });
 
 });

test/unit/validations/UserValidations.test.ts

@@ -36,6 +36,8 @@ describe('UserValidations', () => {
         user.firstName = 'TestName';
         user.lastName = 'TestName';
         user.email = 'test@test.com';
+        user.username = 'test';
+        user.password = '1234';
         const errors = await validate(user);
         expect(errors.length).toEqual(0);
         done();