create-sip 0.10.6 → 0.10.8

package/expressapi/app/controllers/authcontroller.js

@@ -1,8 +1,8 @@
-const bcrypt = require('bcryptjs')
-const jwt = require('jsonwebtoken')
-const User = require('../models/user')
-const config = require('../../config/default.json')
- 
+import bcrypt from 'bcryptjs'
+import jwt from 'jsonwebtoken'
+import User from '../models/user.js'
+import config from '../../config/default.json' assert { type: 'json' }
+
 const AuthController = {
     async register(req, res) {        
         var clientError = false;
@@ -100,4 +100,4 @@ const AuthController = {
     }
 }
  
-module.exports = AuthController
+export default AuthController

package/expressapi/app/controllers/usercontroller.js

@@ -1,4 +1,4 @@
-const User = require('../models/user')
+import User from '../models/user.js'
 
 const UserController = {
     async index(req, res) {
@@ -22,4 +22,4 @@ const UserController = {
     }
 }
 
-module.exports = UserController
+export default UserController

package/expressapi/app/database/database.js

@@ -1,5 +1,5 @@
-const Sequelize = require('sequelize')
-const config = require('../../config/default.json')
+import Sequelize from 'sequelize'
+import config from '../../config/default.json' assert { type: 'json' }
 
 if(config.app.log != false) {
     var log = console.log
@@ -19,4 +19,4 @@ const sequelize = new Sequelize(
     }
 )
  
-module.exports = sequelize
+export default sequelize

package/expressapi/app/index.js

@@ -1,16 +1,18 @@
-const express = require('express')
-const morgan = require('morgan')
+import express from 'express'
+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' }
+
 const app = express()
-const fs = require('fs')
-const router = require('./routes/api')
-const config = require('../config/default.json')
 
 const PORT = config.app.port || 8000
 
 const logfile = 'access.log'
 var accessLogStream = fs.createWriteStream(logfile, { flags: 'a' })
 app.use(morgan('dev', { stream: accessLogStream }))
-
+app.use(cors())
 app.use(express.json())
 app.use('/api', router);
 

package/expressapi/app/middlewares/authjwt.js

@@ -1,7 +1,7 @@
-const jwt = require("jsonwebtoken");
-const config = require('../../config/default.json')
- 
-exports.verifyToken = (req, res, next) => {
+import jwt from 'jsonwebtoken';
+import config from '../../config/default.json' assert { type: 'json' };
+
+const verifyToken = (req, res, next) => {
     let authData = req.headers.authorization;
     if(!authData) {
         return res.status(403).send({
@@ -20,3 +20,5 @@ exports.verifyToken = (req, res, next) => {
         next()
     })
 };
+
+export default verifyToken

package/expressapi/app/models/user.js

@@ -1,6 +1,6 @@
-const { DataTypes } = require('sequelize')
-const sequelize = require('../database/database')
- 
+import { DataTypes } from 'sequelize'
+import sequelize from '../database/database.js'
+
 const User = sequelize.define('User', {
     id: { 
         type: DataTypes.INTEGER,
@@ -16,4 +16,5 @@ const User = sequelize.define('User', {
 sequelize.sync({
     force: false
 })
-module.exports = User
+
+export default User

package/expressapi/app/routes/api.js

@@ -1,12 +1,12 @@
-const Router = require('express')
+import Router from 'express'
 const router = Router()
 
-const AuthController = require('../controllers/authcontroller')
-const UserController = require('../controllers/usercontroller')
-const { verifyToken } = require('../middlewares/authjwt')
+import AuthController from '../controllers/authcontroller.js';
+import UserController from '../controllers/usercontroller.js';
+import verifyToken from '../middlewares/authjwt.js';
  
 router.post('/register', AuthController.register)
 router.post('/login', AuthController.login)
 router.get('/users', [verifyToken], UserController.index)
  
-module.exports = router
+export default router

package/expressapi/package.json

@@ -16,6 +16,7 @@
   "license": "ISC",
   "dependencies": {
     "bcryptjs": "^2.4.3",
+    "cors": "^2.8.5",
     "express": "^4.18.2",
     "generate-api-key": "^1.0.2",
     "jsonwebtoken": "^9.0.0",
@@ -28,5 +29,6 @@
   "devDependencies": {
     "nodemon": "^2.0.22",
     "supertest": "^6.3.3"
-  }
+  },
+  "type": "module"
 }

package/expressapi/tools/genconf.js

@@ -0,0 +1,12 @@
+import fs from 'fs/promises'
+import path from 'path';
+import url from 'url';
+
+const __filename = url.fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const sourceFileName = path.join(__dirname, '../config/default.json.example');
+const destinationFileName = path.join(__dirname, '../config/default.json');
+
+fs.copyFile(sourceFileName, destinationFileName)
+    .catch(error => console.log(error));
+

package/expressapi/tools/genkey.js

@@ -1,19 +1,23 @@
-const fs = require('fs').promises
-const path = require('path')
-const fileName = '../config/default.json'
-const { generateApiKey } = require('generate-api-key')
+import fs from 'fs/promises'
+import { generateApiKey } from 'generate-api-key'
+import path, { dirname } from 'path';
+import url from 'url';
+
+const __filename = url.fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const fileName = path.join(__dirname, '../config/default.json');
 
 function generateKey(size = 32, format = 'base64') {
     const buffer = crypto.randomBytes(size);
     return buffer.toString(format);
 }
 
-fs.readFile(path.join(__dirname, fileName))
+fs.readFile(fileName)
     .then(body => JSON.parse(body))
     .then(json => {
         json.app.key = generateApiKey({method: 'bytes', length: 32})
         return json
     })
     .then(json => JSON.stringify(json, null, 4))
-    .then(body => fs.writeFile(path.join(__dirname, fileName), body, 'utf8'))
+    .then(body => fs.writeFile(fileName, body, 'utf8'))
     .catch(error => console.log(error))

package/manager.js

@@ -60,8 +60,13 @@ const genExpressApi = (target) => {
   copyDir(`${dir}/expressapi`, target);
   updatePackageName(`${target}/package.json`, target);
   console.log('ExpressJS REST API sablon created');
-  console.log('Make a config/default.json');
   console.log('Read docs/user_doc.md');
+  console.log('Run next commands:');
+  console.log(`  cd ${target}`);
+  console.log('  npm install');
+  console.log('  node tools/genconf.js');
+  console.log('  node tools/genkey.js');  
+  console.log('  npm run dev');
 }
 
 module.exports = {

package/package.json

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