create-sip 0.12.2 → 0.13.0

package/expressapi/app/controllers/authcontroller.js

@@ -1,7 +1,9 @@
 import bcrypt from 'bcryptjs'
 import jwt from 'jsonwebtoken'
 import User from '../models/user.js'
-import config from '../../config/default.json' assert { type: 'json' }
+import { readJson } from '../../tools/readjson.js'
+
+const config = await readJson('config/default.json')
 
 const AuthController = {
     async register(req, res) {        

package/expressapi/app/database/database.js

@@ -1,11 +1,12 @@
 import Sequelize from 'sequelize'
-import config from '../../config/default.json' assert { type: 'json' }
+import { readJson } from '../../tools/readjson.js'
+
+const config = await readJson('config/default.json')
 
 if(config.app.log != false) {
     var log = console.log
 }
 
-console.log(typeof console.log)
 const sequelize = new Sequelize(
     config.db.name,
     config.db.user, 

package/expressapi/app/index.js

@@ -3,7 +3,9 @@ import morgan from 'morgan'
 import cors from 'cors'
 import fs from 'fs'
 import router from './routes/api.js'
-import config from '../config/default.json' assert { type: 'json' }
+import { readJson } from '../tools/readjson.js'
+
+const config = await readJson('config/default.json')
 
 const app = express()
 

package/expressapi/app/middlewares/authjwt.js

@@ -1,5 +1,7 @@
 import jwt from 'jsonwebtoken';
-import config from '../../config/default.json' assert { type: 'json' };
+import { readJson } from '../../tools/readjson.js'
+
+const config = await readJson('config/default.json')
 
 const verifyToken = (req, res, next) => {
     let authData = req.headers.authorization;

package/expressapi/op

@@ -4,12 +4,15 @@ import fs from 'fs-extra';
 import fsp from 'fs/promises'
 import { generateApiKey } from 'generate-api-key'
 
-console.log(process.argv[2])
+import bcrypt from 'bcryptjs';
+import path from 'path';
 
 if(process.argv.length == 3 && process.argv[2] == 'key:generate') {
   startGenerateKey();
 } else if(process.argv.length == 3 && process.argv[2] == 'conf:generate') {
   startGenerateConf();
+} else if(process.argv.length == 3 && process.argv[2] == 'admin:generate') {
+  startGenerateAdmin();
 } else if(process.argv.length < 4) {
   console.log('Usage:');
   console.log('node op <command> <type> <name>');
@@ -102,3 +105,46 @@ function startGenerateConf() {
   fs.copyFile(sourceFileName, destinationFileName)
       .catch(error => console.log(error));
 }
+
+async function loadConfig() {
+  try {
+    const filePath = path.resolve('./config/default.json');
+    const data = await fsp.readFile(filePath, 'utf8');
+    const config = JSON.parse(data);
+    return config;
+  } catch (error) {
+    console.error('Error loading config:', error);
+    return null;
+  }
+}
+
+async function startGenerateAdmin() {
+  console.log('Generate admin...')
+  try {
+    const config = await loadConfig();
+    const isMemoryDb = config.db.path === ':memory:';
+    if(isMemoryDb) {
+      console.log('Admin cannot be created in memory db!')
+    }else {
+      const { default: User } = await import('./app/models/user.js')
+      await User.sync()
+
+      const isUserExist = await User.findOne({ where: { name: 'admin' } })
+      if (isUserExist) {
+        console.log('Admin already exists!')
+        return;
+      }
+
+      const hashedPassword = await bcrypt.hash('admin', 10);
+      await User.create({
+        name: 'admin',
+        email: 'admin',
+        password: hashedPassword
+      })
+      console.log('Admin created!')
+    }
+  } catch( err) {
+    console.error('Error creating admin!')
+    console.error(err)
+  }
+}

package/expressapi/tools/readjson.js

@@ -0,0 +1,17 @@
+
+import fsp from 'fs/promises'
+import path from 'path'
+
+async function readJson(dirPath) {
+  try {
+    const filePath = path.resolve(dirPath);
+    const data = await fsp.readFile(filePath, 'utf8');
+    const dataObject = JSON.parse(data);
+    return dataObject;
+  } catch (error) {
+    console.error('Error loading config:', error);
+    return null;
+  }
+}
+
+export { readJson }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sip",
-  "version": "0.12.2",
+  "version": "0.13.0",
   "main": "index.js",
   "bin": {
     "create-sip": "create-sip.js"