create-sip 0.13.0 → 0.14.1

package/README.md

@@ -78,3 +78,11 @@ Default database type is sqlite :memory:. If you want to use another database, e
 ```
 
 Must be set the database path in the config/default.json file.
+
+### Default admin user
+
+Generate admin user:
+
+```bash
+node op admin:generate
+```

package/expressapi/op

@@ -7,6 +7,8 @@ import { generateApiKey } from 'generate-api-key'
 import bcrypt from 'bcryptjs';
 import path from 'path';
 
+import { read } from 'read'
+
 if(process.argv.length == 3 && process.argv[2] == 'key:generate') {
   startGenerateKey();
 } else if(process.argv.length == 3 && process.argv[2] == 'conf:generate') {
@@ -118,6 +120,15 @@ async function loadConfig() {
   }
 }
 
+async function inputPassword() {
+  const password = await read({
+    prompt: 'Password: ',
+    silent: true,
+    replace: '*'
+  })
+  return password
+}
+
 async function startGenerateAdmin() {
   console.log('Generate admin...')
   try {
@@ -134,8 +145,8 @@ async function startGenerateAdmin() {
         console.log('Admin already exists!')
         return;
       }
-
-      const hashedPassword = await bcrypt.hash('admin', 10);
+      const password = await inputPassword()
+      const hashedPassword = await bcrypt.hash(password, 10);
       await User.create({
         name: 'admin',
         email: 'admin',

package/expressapi/package.json

@@ -22,6 +22,7 @@
     "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"

package/expressapi/templates/controllerTemplate.js

@@ -60,19 +60,31 @@ const ThingController = {
     },
     async update(req, res) {
         try {
-            ThingController.tryUpdate(req, res)
+            await ThingController.tryUpdate(req, res)
         }catch(error) {
-            res.status(500)
+            let actualMessage = '';
+            if(error.message == 'Fail! Record not found!') {
+                actualMessage = error.message
+                res.status(404)
+            }else {
+                res.status(500)
+                actualMessage = 'Fail! The query is failed!'
+            }
+            
             res.json({
                 success: false,
-                message: 'Error! The query is failed!'
+                message: actualMessage
             })
         }
     },
     async tryUpdate(req, res) {
-        const thing = await Thing.update(req.body, {
+        const recordNumber = await Thing.update(req.body, {
             where: { id: req.params.id }
         })
+        if(recordNumber == 0) {
+            throw new Error('Fail! Record not found!')
+        }
+        const thing = await Thing.findByPk(req.params.id)
         res.status(200)
         res.json({
             success: true,

package/manager.js

@@ -63,13 +63,16 @@ const genMockApi = (target) => {
 const genExpressApi = (target) => {
   copyDir(`${dir}/expressapi`, target);
   updatePackageName(`${target}/package.json`, target);
-  console.log('ExpressJS REST API sablon created');
+  console.log('ExpressJS REST API skeleton created');
   console.log('Read docs/user_doc.md');
   console.log('Run next commands:');
   console.log(`  cd ${target}`);
   console.log('  npm install');
   console.log('  node op key:generate');
   console.log('  npm run dev');
+  console.log('Usable commands:');
+  console.log('  node op create model thing');
+  console.log('  node op create controller thing');
 }
 
 module.exports = {

package/package.json

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