Setup improvements

Author: larswaechter

db/index.js

@@ -1,36 +1,46 @@
 const mysql = require('mysql');
 const fs = require('fs');
+const bcrypt = require('bcryptjs');
 
 console.log('Running SQL seed...');
 
 // Read MySQL config
 const config = JSON.parse(
-  fs.readFileSync('ormconfig.json', {
-    encoding: 'utf-8'
-  })
+	fs.readFileSync('ormconfig.json', {
+		encoding: 'utf-8'
+	})
 );
 
 // Read SQL seed
 const seedQuery = fs.readFileSync('db/seeds.sql', {
-  encoding: 'utf-8'
+	encoding: 'utf-8'
 });
 
 // Connect to database
 const connection = mysql.createConnection({
-  host: config.host,
-  user: config.username,
-  password: config.password,
-  database: config.database,
-  multipleStatements: true
+	host: config.host,
+	user: config.username,
+	password: config.password,
+	database: config.database,
+	multipleStatements: true
 });
 
 connection.connect();
 
+// Generate random password for initial admin account
+const psw = Math.random().toString(36).substring(7);
+const hash = bcrypt.hashSync(psw, 10);
+
+// Query arguments
+const queryArgs = [hash];
+
 // Run seed query
-connection.query(seedQuery, (err, res) => {
-  if (err) {
-    throw err;
-  }
+connection.query(seedQuery, queryArgs, (err) => {
+	if (err) {
+		throw err;
+	}
+
+	console.log('SQL seed completed! Password for initial admin account: ' + psw);
 });
 
 connection.end();

db/seeds.sql

@@ -13,6 +13,10 @@ INSERT INTO user_role (name)
 VALUES	('Admin'),
 				('User');
 
+/* Insert admin account */
+INSERT INTO user (email, firstname, lastname, password, userRoleId)
+VALUES	('[email protected]', 'Admin', 'Admin', ?, 1);
+
 /* Insert task status */
 INSERT INTO task_status (title, sort)
 VALUES	('To Do', 1),

gulpfile.js

@@ -2,26 +2,26 @@ const gulp = require('gulp')
 const merge = require('gulp-merge-json')
 
 const bases = {
-  src: 'src/',
-  dist: 'dist/',
-  components: 'api/components/',
-  output: 'output/'
+	src: 'src/',
+	dist: 'dist/',
+	components: 'api/components/',
+	output: 'output/'
 }
 
 const paths = {
-  policy: 'api/components/**/policy.json',
-  html: 'api/components/**/templates/*.html'
+	policy: 'api/components/**/policy.json',
+	html: 'api/components/**/templates/*.html'
 }
 
 // Task for copying html templates
-gulp.task('copy', function() {
-  gulp.src(paths.html, { cwd: bases.src }).pipe(gulp.dest(bases.components, { cwd: bases.dist }))
+gulp.task('copy', () => {
+	return gulp.src(paths.html, { cwd: bases.src }).pipe(gulp.dest(bases.components, { cwd: bases.dist }));
 })
 
 // Task for merging policies
 gulp.task('merge', () => {
-  gulp
-    .src(paths.policy, { cwd: bases.src })
-    .pipe(merge({ fileName: 'policies.combined.json', concatArrays: true }))
-    .pipe(gulp.dest(bases.output, { cwd: bases.dist }))
+	return gulp
+		.src(paths.policy, { cwd: bases.src })
+		.pipe(merge({ fileName: 'policies.combined.json', concatArrays: true }))
+		.pipe(gulp.dest(bases.output, { cwd: bases.dist }))
 })

package.json

@@ -27,6 +27,7 @@
 	"devDependencies": {
 		"@types/acl": "^0.4.37",
 		"@types/bcrypt-nodejs": "0.0.30",
+		"@types/bcryptjs": "^2.4.2",
 		"@types/compression": "^1.0.1",
 		"@types/cors": "^2.8.4",
 		"@types/dotenv": "^6.1.0",
@@ -40,7 +41,7 @@
 		"@types/passport-jwt": "^3.0.1",
 		"@types/uuid": "^3.4.5",
 		"@types/validator": "^10.11.1",
-		"gulp": "^3.9.1",
+		"gulp": "^4.0.2",
 		"gulp-merge-json": "^1.3.1",
 		"nodemon": "^1.19.1",
 		"prettier": "^1.18.2",
@@ -50,12 +51,12 @@
 		"tslint-config-airbnb": "^5.11.1",
 		"tslint-config-prettier": "^1.17.0",
 		"typedoc": "^0.14.2",
-		"typescript": "3.5.2"
+		"typescript": "^3.7.2"
 	},
 	"dependencies": {
 		"acl": "^0.4.11",
 		"axios": "^0.18.1",
-		"bcrypt-nodejs": "0.0.3",
+		"bcryptjs": "^2.4.3",
 		"body-parser": "^1.18.3",
 		"compression": "^1.7.3",
 		"cors": "^2.8.5",

src/services/helper/utility.ts

@@ -1,4 +1,4 @@
-import { compare, genSalt, hash } from 'bcrypt-nodejs';
+import { compare, genSalt, hash } from 'bcryptjs';
 import { v1 as uuidv1 } from 'uuid';
 
 import * as crypto from 'crypto';
@@ -29,17 +29,14 @@ export class UtilityService {
 	 */
 	public static hashPassword(plainPassword: string): Promise<string> {
 		return new Promise((resolve, reject) => {
-			genSalt(10, (err, salt) => {
+			genSalt((err, salt) => {
 				if (err) {
 					reject(err);
 				}
 
 				hash(
 					plainPassword,
 					salt,
-					() => {
-						// just leave this empty
-					},
 					(error, hashedVal) => {
 						if (error) {
 							reject(error);