✨ Add simple basic auth authentication

Author: hirsch88

src/api/controllers/UserController.ts

@@ -12,7 +12,9 @@ export class UserController {
 
     constructor(
         private userService: UserService
-    ) { }
+    ) {
+        console.log('UserControllerUserControllerUserController');
+    }
 
     @Get()
     public find( @CurrentUser() user?: User): Promise<User[]> {

src/api/models/User.ts

@@ -1,3 +1,4 @@
+import { Exclude } from 'class-transformer';
 import { IsNotEmpty } from 'class-validator';
 import { Column, Entity, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
 
@@ -21,6 +22,15 @@ export class User {
     @Column()
     public email: string;
 
+    @IsNotEmpty()
+    @Column()
+    @Exclude()
+    public password: string;
+
+    @IsNotEmpty()
+    @Column()
+    public username: string;
+
     @OneToMany(type => Pet, pet => pet.user)
     public pets: Pet[];
 

src/api/swagger.json

@@ -15,10 +15,8 @@
     ],
     "schemes": [],
     "securityDefinitions": {
-        "JWT": {
-            "type": "apiKey",
-            "in": "header",
-            "name": "Authorization"
+        "basicAuth": {
+            "type": "basic"
         }
     },
     "tags": [
@@ -58,7 +56,7 @@
                 "operationId": "FindAllUsers",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "responses": {
@@ -93,7 +91,7 @@
                 "operationId": "CreateUser",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [
@@ -138,7 +136,7 @@
                 "operationId": "FindUser",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [
@@ -180,7 +178,7 @@
                 "operationId": "UpdateUser",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [
@@ -231,7 +229,7 @@
                 "operationId": "DeleteUser",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [
@@ -272,7 +270,7 @@
                 "operationId": "FindAllPets",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "responses": {
@@ -307,7 +305,7 @@
                 "operationId": "CreatePet",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [
@@ -352,7 +350,7 @@
                 "operationId": "FindPet",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [
@@ -394,7 +392,7 @@
                 "operationId": "UpdatePet",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [
@@ -445,7 +443,7 @@
                 "operationId": "DeletePet",
                 "security": [
                     {
-                        "JWT": []
+                        "basicAuth": []
                     }
                 ],
                 "parameters": [

src/auth/AuthService.ts

@@ -1,56 +1,46 @@
 import * as express from 'express';
-import * as request from 'request';
 import { Service } from 'typedi';
+import { OrmRepository } from 'typeorm-typedi-extensions';
 
+import { User } from '../api/models/User';
+import { UserRepository } from '../api/repositories/UserRepository';
 import { Logger, LoggerInterface } from '../decorators/Logger';
-import { env } from '../env';
-import { TokenInfoInterface } from './TokenInfoInterface';
 
 @Service()
 export class AuthService {
 
-    private httpRequest: typeof request;
-
     constructor(
-        @Logger(__filename) private log: LoggerInterface
-    ) {
-        this.httpRequest = request;
-    }
+        @Logger(__filename) private log: LoggerInterface,
+        @OrmRepository() private userRepository: UserRepository
+    ) { }
 
-    public parseTokenFromRequest(req: express.Request): string | undefined {
+    public parseBasicAuthFromRequest(req: express.Request): { username: string, password: string } {
         const authorization = req.header('authorization');
 
         // Retrieve the token form the Authorization header
-        if (authorization && authorization.split(' ')[0] === 'Bearer') {
+        if (authorization && authorization.split(' ')[0] === 'Basic') {
             this.log.info('Token provided by the client');
-            return authorization.split(' ')[1];
+            const decodedToken = Buffer.from(authorization.split(' ')[1], 'base64').toString('ascii');
+            const username = decodedToken.split(':')[0];
+            const password = decodedToken.split(':')[1];
+            return { username, password };
         }
 
         this.log.info('No Token provided by the client');
         return undefined;
     }
 
-    public getTokenInfo(token: string): Promise<TokenInfoInterface> {
-        return new Promise((resolve, reject) => {
-            this.httpRequest({
-                method: 'POST',
-                url: env.auth.route,
-                form: {
-                    id_token: token,
-                },
-            }, (error: any, response: request.RequestResponse, body: any) => {
-                // Verify if the requests was successful and append user
-                // information to our extended express request object
-                if (!error) {
-                    if (response.statusCode === 200) {
-                        const tokeninfo = JSON.parse(body);
-                        return resolve(tokeninfo);
-                    }
-                    return reject(body);
-                }
-                return reject(error);
-            });
+    public async validateUser(username: string, password: string): Promise<User> {
+        const user = await this.userRepository.findOne({
+            where: {
+                username,
+                password,
+            },
         });
+        if (user) {
+            return user;
+        }
+        throw new Error('Invalid credentials');
     }
 
 }

src/auth/TokenInfoInterface.ts

@@ -15,18 +15,16 @@ export function authorizationChecker(connection: Connection): (action: Action, r
         // you can use them to provide granular access check
         // checker must return either boolean (true or false)
         // either promise that resolves a boolean value
-        // demo code:
-        const token = authService.parseTokenFromRequest(action.request);
+        const credentials = authService.parseBasicAuthFromRequest(action.request);
 
-        if (token === undefined) {
-            log.warn('No token given');
+        if (credentials === undefined) {
+            log.warn('No credentials given');
             return false;
         }
 
-        // Request user info at auth0 with the provided token
         try {
-            action.request.tokeninfo = await authService.getTokenInfo(token);
-            log.info('Successfully checked token');
+            action.request.user = await authService.validateUser(credentials.username, credentials.password);
+            log.info('Successfully checked credentials');
             return true;
         } catch (e) {
             log.warn(e);

src/auth/authorizationChecker.ts

@@ -2,29 +2,9 @@ import { Action } from 'routing-controllers';
 import { Connection } from 'typeorm';
 
 import { User } from '../api/models/User';
-import { Logger } from '../lib/logger';
-import { TokenInfoInterface } from './TokenInfoInterface';
 
 export function currentUserChecker(connection: Connection): (action: Action) => Promise<User | undefined> {
-    const log = new Logger(__filename);
-
     return async function innerCurrentUserChecker(action: Action): Promise<User | undefined> {
-        // here you can use request/response objects from action
-        // you need to provide a user object that will be injected in controller actions
-        // demo code:
-        const tokeninfo: TokenInfoInterface = action.request.tokeninfo;
-        const em = connection.createEntityManager();
-        const user = await em.findOne<User>(User, {
-            where: {
-                email: tokeninfo.user_id.replace('auth0|', ''),
-            },
-        });
-        if (user) {
-            log.info('Current user is ', user.toString());
-        } else {
-            log.info('Current user is undefined');
-        }
-
-        return user;
+        return action.request.user;
     };
 }

src/auth/currentUserChecker.ts

@@ -8,10 +8,13 @@ define(User, (faker: typeof Faker, settings: { role: string }) => {
     const firstName = faker.name.firstName(gender);
     const lastName = faker.name.lastName(gender);
     const email = faker.internet.email(firstName, lastName);
+    const username = faker.internet.userName(firstName, lastName);
 
     const user = new User();
     user.firstName = firstName;
     user.lastName = lastName;
     user.email = email;
+    user.username = username;
+    user.password = '1234';
     return user;
 });

src/database/factories/UserFactory.ts

@@ -30,6 +30,18 @@ export class CreateUserTable1511105183653 implements MigrationInterface {
                     length: '255',
                     isPrimary: false,
                     isNullable: false,
+                }, {
+                    name: 'username',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: false,
+                    isNullable: false,
+                } , {
+                    name: 'password',
+                    type: 'varchar',
+                    length: '255',
+                    isPrimary: false,
+                    isNullable: false,
                 },
             ],
         });

src/database/migrations/1511105183653-CreateUserTable.ts

@@ -32,6 +32,8 @@ export class CreateBruce implements Seed {
         user.firstName = 'Bruce';
         user.lastName = 'Wayne';
         user.email = 'bruce.wayne@wayne-enterprises.com';
+        user.username = 'bruce';
+        user.password = '1234';
         return await em.save(user);
     }