More development

Author: norkator

ApiTesting.http

@@ -0,0 +1,14 @@
+###################################################################################
+###### CREATE ACCOUNT                                                        ######
+###################################################################################
+### Send POST request with json body
+POST http://localhost:3000/auth/create-account
+Content-Type: application/json
+
+{
+  "name": "Test User",
+  "email": "[email protected]",
+  "password": "toohardpasswd"
+}
+
+###

src/components/Authentication/index.ts

@@ -4,6 +4,8 @@ import HttpError from "../../server/error";
 import * as jwt from 'jsonwebtoken';
 import {UserModel, UserModelInterface} from "../../database/models/user";
 import * as User from '../../database/dao/user'
+import * as crypto from 'crypto';
+import * as bcrypt from 'bcrypt';
 
 /**
  * @export
@@ -16,12 +18,13 @@ export async function createAccount(req: Request, res: Response, next: NextFunct
     try {
 
         const user = <UserModelInterface>{
+            name: req.body.name,
             email: req.body.email,
             password: req.body.password
         };
 
         // Check for mandatory details
-        if (user.email === undefined || user.password === undefined) {
+        if (user.name === undefined || user.email === undefined || user.password === undefined) {
             throw new Error('Missing details!');
         }
 
@@ -32,6 +35,13 @@ export async function createAccount(req: Request, res: Response, next: NextFunct
             throw new Error('This email already exists');
         }
 
+
+        // Hash password before database insert
+        const salt: string = await bcrypt.genSalt(10);
+        const hash: string = await bcrypt.hash(user.password, salt);
+        user.password = hash;
+
+
         // This will insert new user into database
         const saved: UserModelInterface = await User.create(user);
         console.log('new user created: ' + saved);
@@ -43,7 +53,6 @@ export async function createAccount(req: Request, res: Response, next: NextFunct
 
         res.json({
             status: 200,
-            logged: true,
             token: token,
             message: 'Account created successfully'
         });

src/database/models/user.ts

@@ -4,17 +4,6 @@ import sequelize from './index'
 export class UserModel extends Model {
 }
 
-/*
-export class AppUserModel {
-    id: string;
-    name: string;
-    email: string;
-    password: string;
-    createdAt: Date;
-    updatedAt: Date;
-}
-*/
-
 UserModel.init(
     {
         id: {
@@ -24,9 +13,9 @@ UserModel.init(
         },
         name: STRING(50),
         email: STRING(50),
-        password: STRING(50)
+        password: STRING(100)
     },
-    {sequelize, modelName: 'UserModel'}
+    {sequelize, modelName: 'User'}
 );
 
 

src/server/server.ts

@@ -40,38 +40,6 @@ app.set('secret', process.env.JWT_SECRET || '8fa410b58360fd97f3e15a752fd2d6281fc
  */
 app.set('jwt-expire', process.env.JWT_EXPIRE || '60m');
 
-/**
- * Set database dialect (postgres, mariaDb, sqlite..)
- */
-app.set('db-dialect', process.env.DB_DIALECT || 'postgres');
-
-
-/**
- * Set database host address
- */
-app.set('db-host', process.env.DB_HOST || '127.0.0.1');
-
-/**
- * Set database host address
- */
-app.set('db-port', process.env.DB_PORT || '5432');
-
-/**
- * Set database user
- */
-app.set('db-user', process.env.DB_USER || 'postgres');
-
-/**
- * Set database password
- */
-app.set('db-password', process.env.DB_PASSWD || 'BadPassword');
-
-/**
- * Set database name
- */
-app.set('db-database', process.env.DB_DATABASE || 'ApiExample');
-
-
 /**
  * @exports {express.Application}
  */