create-sipere 0.9.3 → 0.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-sipere",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "main": "create-sipere.js",
   "bin": {
     "create-sipere": "create-sipere.js"

package/templates/js-rest-api/app/controllers/authController.js

@@ -1,8 +1,8 @@
 import bcrypt from 'bcryptjs'
 import jwt from 'jsonwebtoken'
 import User from '../models/user.js'
-import dotenv from '@dotenvx/dotenvx'
-dotenv.config({ quiet: true })
+import dotenvFlow from 'dotenv-flow'
+dotenvFlow.config() 
 
 const AuthController = {
     async register(req, res) {        

package/templates/js-rest-api/app/database/database.js

@@ -1,11 +1,7 @@
 import Sequelize from 'sequelize'
 import dotenvFlow from 'dotenv-flow'
 
-if (process.env.NODE_ENV === 'test') {
-    dotenvFlow.config({ path: '.env.test' })
-}else {
-    dotenvFlow.config()    
-}
+dotenvFlow.config()
 
 const sequelize = new Sequelize(
     process.env.DB_NAME,

package/templates/js-rest-api/package.json

@@ -4,7 +4,7 @@
   "description": "Express API with simple Sequelize",
   "main": "index.js",
   "scripts": {
-    "test": "NODE_ENV=test mocha",
+    "test": "NODE_ENV=test mocha --file test/mocha.setup.js 'test/**/*.spec.js'",
     "dev": "nodemon app",
     "start": "node app"
   },
@@ -15,22 +15,16 @@
   "author": "your name",
   "license": "ISC",
   "dependencies": {
-    "@dotenvx/dotenvx": "^1.51.0",
-    "@sipere/op-cli": "^0.9.2",
+    "@sipere/op-cli": "^0.9.3",
     "bcryptjs": "^2.4.3",
     "cors": "^2.8.5",
     "dotenv-flow": "^4.1.0",
     "express": "^4.18.2",
-    "generate-api-key": "^1.0.2",
     "jsonwebtoken": "^9.0.0",
     "mariadb": "^3.1.2",
     "morgan": "^1.10.0",
-    "read": "^4.1.0",
-    "replace": "^1.2.2",
     "sequelize": "^6.32.0",
     "sqlite3": "^5.1.6",
-    "umzug": "^3.8.2",
-    "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@types/bcryptjs": "^2.4.6",

package/templates/js-rest-api/test/mocha.setup.js

@@ -0,0 +1,8 @@
+import sequelize from '../app/database/database.js'
+
+before(async() => {
+  await sequelize.sync({ force: true })
+})
+after(async() => {
+  await sequelize.close()
+})

package/templates/js-rest-api/test/user.spec.js

@@ -5,8 +5,8 @@ describe('/api/register and /api/login', () => {
     const restype= 'application/json; charset=utf-8'
     var token = null
 
-    it('post /register ', function(done) {
-      supertest(app)
+    it('post /register ', async () => {
+      await supertest(app)
         .post('/api/register')
         .set('Accept', 'application/json')
         .send({
@@ -16,11 +16,11 @@ describe('/api/register and /api/login', () => {
             password_confirmation: 'titok'
         })
         .expect('Content-Type', restype)
-        .expect(201, done)
+        .expect(201)
 
     })
-    it('post /login ', (done) => {
-      supertest(app)
+    it('post /login ', async () => {
+      const res = await supertest(app)
         .post('/api/login')
         .set('Accept', 'application/json')
         .send({
@@ -28,16 +28,17 @@ describe('/api/register and /api/login', () => {
             password: 'titok'
         })
         .expect('Content-Type', restype)
-        .expect(200, done)
-        .expect(res => {
-          token = res.body.accessToken
-        })
+        .expect(200)
+        token = res.body.accessToken
+        if(!token) {
+          throw new Error('No token')
+        }        
     })
-    it('get /users ', function(done) {
-      supertest(app)
+    it('get /users ', async () => {
+      await supertest(app)
         .get('/api/users')
         .set('Accept', 'application/json')
         .set('Authorization', 'Bearer ' + token)
-        .expect(200, done)
+        .expect(200)
     })
   })