create-sip 1.3.6 → 1.3.8

package/expressapi/README.md

@@ -2,178 +2,11 @@
 
 Express based REST API template
 
-## Install
+## Install dependencies
 
 ```cmd
 npm install
-```
-
-## Copy config file
-
-Copy **config/default.json.example** to **config/default.json** file.
-
-## APP KEY generation
-
-Run the genkey:
-
-```cmd
-node op key:generate
-```
-
-## Database settings
-
-The database settings can be found at the following location:
-
-* config/default.json
-
-### Database dialect
-
-The default database is an in-memory database. Its contents are cleared after the server is restarted.
-
-One of:
-
-* sqlite
-* mariadb
-
-After installing the appropriate dependencies, it can be used:
-
-* mysql
-* postgres
-* mssql
-* db2
-* snowflake
-* oracle
-
-With the `sqlite` option, the usual path setting is `database.sqlite`. The default storage is :memory:, where data is stored in memory only.
-
-## Starting
-
-For development:
-
-```cmd
 npm run dev
 ```
 
-Run productum:
-
-```cmd
-npm start
-```
-
-## Model and controller creation
-
-You can generate a model and controller with the following commands:
-
-```bash
-node op make:model something
-node op make:controller something
-```
-
-The name after the model and controller statements must be given in the singular. Controller generation automatically appends the "Controller" suffix.
-
-## Admin user
-
-The admin user can be created with the following command:
-
-```bash
-node op admin:generate
-```
-
-The command will prompt for the password.
-
-## Config generation
-
-The next command generates the default config file:
-
-```bash
-node op conf:generate
-```
-
-## Database import
-
-The database can be seeded with the following command:
-
-```bash
-node op db:import <model_name> <file_path>
-```
-
-The model name must be given in the singular and lowercase. The file extension must be:
-
-* .json
-* .csv
-
-The keys in the JSON file and the field names in the CSV file must match the model fields.
-
-If the CSV file contains quotation marks, they are automatically removed.
-
-## Database synchronization
-
-Models and database tables can be synchronized, but this can be dangerous.
-
-Database synchronization can be set up in the app/models/modrels.js file. Default values are:
-
-```js
-{ alter: true }
-```
-
-This preserves the data and existing structure.
-
-Possible values:
-
-```js
-{ force: true }
-```
-
-The latter deletes the contents of the database table!
-
-If the value is false, there is no synchronization in either case.
-
-## Migration
-
-Generate a migration:
-
-```bash
-node op make/migration thing
-```
-
-Run all migration:
-
-```bash
-node op migration:run
-```
-
-Run a migration:
-
-```bash
-node op migration:run <migration_name>
-```
-
-Rollback a migration:
-
-```bash
-node op migration:rollback
-```
-
-Rollback two migrations:
-
-```bash
-node op migration:rollback 2
-```
-
-Reset the database:
-
-```bash
-node op migration:reset
-```
-
-Reset the database and run all migrations:
-
-```bash
-node op migration:fresh
-```
-
-## Licence
-
-May be freely distributed under the MIT license.
-
-Copyright (c) 2023 Sallai András
+See the docs directory for details.

package/expressapi/app/database/database.js

@@ -1,10 +1,10 @@
 import Sequelize from 'sequelize'
-import dotenv from '@dotenvx/dotenvx'
+import dotenvFlow from 'dotenv-flow'
 
 if (process.env.NODE_ENV === 'test') {
-    dotenv.config({ path: '.env.test', quiet: true })
+    dotenv.config({ path: '.env.test' })
 }else {
-    dotenv.config({ quiet: true })    
+    dotenv.config()    
 }
 
 const sequelize = new Sequelize(

package/expressapi/app/index.js

@@ -1,7 +1,7 @@
 import app from './app.js'
-import dotenv from '@dotenvx/dotenvx'
+import dotenvFlow from 'dotenv-flow'
 
-dotenv.config({ quiet: true })
+dotenv.config()
 
 const PORT = process.env.APP_PORT || 8000
 

package/expressapi/app/middleware/authjwt.js

@@ -1,6 +1,6 @@
 import jwt from 'jsonwebtoken';
-import dotenv from '@dotenvx/dotenvx'
-dotenv.config({ quiet: true })
+import dotenvFlow from 'dotenv-flow';
+dotenv.config()
 
 const verifyToken = (req, res, next) => {
     let authData = req.headers.authorization;

package/expressapi/op

@@ -324,13 +324,6 @@ async function startGenerateAdmin() {
     const { default: User } = await import('./app/models/user.js')
     await User.sync()
 
-    await import('dotenv').then((dotenv) => dotenv.config())
-    const isMemoryDb = process.env.DB_PATH === ':memory:';
-    if(isMemoryDb) {
-      console.log('Admin cannot be created in memory db!')
-      return;
-    }
-
     const isUserExist = await User.findOne({ where: { name: 'admin' } })
     if (isUserExist) {
       console.log('Admin already exists!')

package/expressapi/package-lock.json

@@ -12,6 +12,7 @@
         "@dotenvx/dotenvx": "^1.51.0",
         "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",
@@ -1394,6 +1395,30 @@
         "url": "https://dotenvx.com"
       }
     },
+    "node_modules/dotenv-flow": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/dotenv-flow/-/dotenv-flow-4.1.0.tgz",
+      "integrity": "sha512-0cwP9jpQBQfyHwvE0cRhraZMkdV45TQedA8AAUZMsFzvmLcQyc1HPv+oX0OOYwLFjIlvgVepQ+WuQHbqDaHJZg==",
+      "license": "MIT",
+      "dependencies": {
+        "dotenv": "^16.0.0"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
+    "node_modules/dotenv-flow/node_modules/dotenv": {
+      "version": "16.6.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
+      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dottie": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.6.tgz",

package/expressapi/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "NODE_ENV=test mocha",
-    "dev": "nodemon app --watch app --watch config",
+    "dev": "nodemon app",
     "start": "node app"
   },
   "keywords": [
@@ -18,6 +18,7 @@
     "@dotenvx/dotenvx": "^1.51.0",
     "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",

package/package.json

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