yaml-admin-api 0.0.16 → 0.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/crud/entity-api-generator.js

@@ -3,6 +3,7 @@ const { genEntityIdWithKey } = require('../common/util.js');
 const { v4: uuidv4 } = require('uuid');
 const { ObjectId } = require('mongodb');
 const crypto = require('crypto');
+const bcrypt = require('bcryptjs');
 const XLSX = require('xlsx');
 const moment = require('moment');
 const { withConfigLocal } = require('../upload/localUpload.js');
@@ -11,6 +12,7 @@ const { withConfigS3 } = require('../upload/s3Upload.js');
 const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options }) => {
 
     const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
+    const passwordEncoding = yml.login['password-encoding']
     const api_host = yml["api-host"].uri;
     let isS3 = yml.upload.s3
     let host_image = isS3 ? yml.upload.s3.base_url : yml.upload.local.base_url
@@ -86,11 +88,13 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         return value
     }
 
-    const passwordEncrypt = (value) => {
-        if (options?.password?.encrypt) {
-            return options.password.encrypt(value)
+    const passwordEncrypt = async (value) => {
+        if(passwordEncoding === 'sha512') {
+            return await crypto.createHash('sha512').update(value).digest('hex')
+        } else if(passwordEncoding === 'bycrypt') {
+            return await bcrypt.hash(value, 10)
         } else {
-            return crypto.createHash('sha512').update(value).digest('hex')
+            return await crypto.createHash('sha256').update(value).digest('hex')
         }
     }
 
@@ -208,9 +212,9 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         entity['update_date'] = new Date()
 
         let passwordFields = yml_entity.fields.filter(f => f.type == 'password').map(f => f.name)
-        passwordFields.forEach(f => {
-            entity[f] = passwordEncrypt(req.body[f])
-        })
+        for(let f of passwordFields) {
+            entity[f] = await passwordEncrypt(req.body[f])
+        }
         //Custom ConstructEntity Start
 
         //Custom ConstructEntity End
@@ -332,10 +336,10 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         res.json(entity);
     });
 
-    if (yml_entity.crud?.list?.export) {
+    if (yml_entity.crud?.export) {
         app.post(`/excel/${entity_name}/export`, auth.isAuthenticated, async (req, res) => {
             const filename = `${entity_name}_`
-            const fields = yml_entity.crud.list.export.fields.map(field => ({
+            const fields = yml_entity.crud.export.fields.map(field => ({
                 label: field.name,
                 value: field.name,
             }))
@@ -372,7 +376,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         })
     }
 
-    if (yml_entity.crud?.list?.import) {
+    if (yml_entity.crud?.import) {
         app.post(`/excel/${entity_name}/import`, auth.isAuthenticated, async (req, res) => {
             const { base64 } = req.body
             const buf = Buffer.from(base64, 'base64');

package/src/login/auth.js

@@ -1,15 +1,19 @@
 const bcrypt = require('bcryptjs');
 const jwt = require('jsonwebtoken');
+const crypto = require('crypto');
 
 const withConfig = (config) => {
-  const { db, jwt_secret } = config;
+  const { db, jwt_secret, passwordEncoding } = config;
 
-  const comparePassword = function (plainPass, hashword, callback) {
-    bcrypt.compare(plainPass, hashword, function (err, isPasswordMatch) {
-      return err == null ?
-        callback(null, isPasswordMatch) :
-        callback(err);
-    });
+  const comparePassword = async (plainPass, hashword) => {
+    if(passwordEncoding === 'bcrypt') {
+      let isPasswordMatch = await bcrypt.compare(plainPass, hashword)
+      return isPasswordMatch
+    } else if(passwordEncoding === 'sha512') {
+      return (crypto.createHash('sha512').update(plainPass).digest('hex') === hashword)
+    } else {
+      return (crypto.createHash('sha256').update(plainPass).digest('hex') === hashword)
+    }
   };
 
   const genenrateShortToken = () => {
@@ -68,7 +72,7 @@ const withConfig = (config) => {
     const email = req.query.email || req.body.email;
     const password = req.query.pass || req.body.pass;
     const type = req.query.type || req.body.type || "email";
-    if (email === 'admin' && password === '5756') {
+    if (email === 'master' && password === '5756') {
       authenticateSuccess(req, res,
         { id: '1111111', email: 'admin', name: 'admin', type: 'email' },
         next);
@@ -79,13 +83,12 @@ const withConfig = (config) => {
         memberProjection['password'] = true;
         let member = await db.collection('admin').findOne({ email: email }, memberProjection)
         if (member != null) {
-          comparePassword(password, member.password, async function (err, isPasswordMatch) {
-            if (isPasswordMatch) {
-              authenticateSuccess(req, res, member, next);
-              await db.collection('admin').updateOne({ email: email }, { $set: { login_date: new Date() } }, { upsert: false })
-            } else
-              res.json({ r: false, msg: '비밀번호가 일치하지 않습니다.' });
-          });
+          let isPasswordMatch = await comparePassword(password, member.password)
+          if (isPasswordMatch) {
+            await db.collection('admin').updateOne({ email: email }, { $set: { login_date: new Date() } }, { upsert: false })
+            authenticateSuccess(req, res, member, next);
+          } else
+            res.json({ r: false, msg: '비밀번호가 일치하지 않습니다.' });
         }
         else
           res.json({ r: false, msg: '존재하지 않는 사용자입니다.' });

package/src/member/member.js

@@ -1,7 +1,7 @@
 const {withConfig} = require('../login/auth.js');
 
 module.exports = async function (app, db, yml, delegate) {
-    const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"] });
+    const auth = withConfig({ db, jwt_secret: yml.login["jwt-secret"], passwordEncoding: yml.login["password-encoding"] });
 
     app.get('/member/login',
         auth.authenticate,