yaml-admin-api 0.0.114 → 0.0.116

package/package.json

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

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

@@ -16,6 +16,13 @@ const asyncErrorHandler = (fn) => (req, res, next) => {
     });
 }
 
+const checkAuthority = (action) => (req, res, next) => {
+    const authority = req.user?.authority;
+    if (authority && authority[action] === false)
+        return res.status(403).json({ r: false, msg: '권한이 없습니다.' });
+    next();
+}
+
 const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options }) => {
 
     // entity 속성이 있으면 해당 값을 실제 collection 이름으로 사용
@@ -402,7 +409,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
     };
 
     //create
-    app.post(`${api_prefix}/${entity_name}`, auth.isAuthenticated, asyncErrorHandler(async (req, res) => {
+    app.post(`${api_prefix}/${entity_name}`, auth.isAuthenticated, checkAuthority('create'), asyncErrorHandler(async (req, res) => {
         
         await recalcurateAutoGenerateIndex(db, entity_name)
         
@@ -455,7 +462,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
 
 
     //edit
-    app.put(`${api_prefix}/${entity_name}/:id`, auth.isAuthenticated, asyncErrorHandler(async (req, res) => {
+    app.put(`${api_prefix}/${entity_name}/:id`, auth.isAuthenticated, checkAuthority('edit'), asyncErrorHandler(async (req, res) => {
         let entityId = parseKey(req.params.id)
 
         const entity = await constructEntity(req, entityId);
@@ -509,7 +516,7 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
     }));
 
     //delete
-    app.delete(`${api_prefix}/${entity_name}/:id`, auth.isAuthenticated, asyncErrorHandler(async (req, res) =>{
+    app.delete(`${api_prefix}/${entity_name}/:id`, auth.isAuthenticated, checkAuthority('delete'), asyncErrorHandler(async (req, res) =>{
 
         let f = {}
         f[key_field.name] = parseKey(req.params.id)

package/src/login/auth.js

@@ -2,8 +2,27 @@ const bcrypt = require('bcryptjs');
 const jwt = require('jsonwebtoken');
 const crypto = require('crypto');
 
+const evaluateCondition = (condition, data) => {
+  if (!condition) return true;
+  const eqMatch = condition.match(/^(\w+)==['"]?([^'"]+)['"]?$/);
+  const neqMatch = condition.match(/^(\w+)!=\s*['"]?([^'"]+)['"]?$/);
+  if (eqMatch) return String(data[eqMatch[1]]) === eqMatch[2];
+  if (neqMatch) return String(data[neqMatch[1]]) !== neqMatch[2];
+  return false;
+};
+
+const resolveAuthority = (member, authorityConfig) => {
+  if (!authorityConfig) return null;
+  for (const rule of Object.values(authorityConfig)) {
+    if (evaluateCondition(rule.if, member)) {
+      return rule.default || null;
+    }
+  }
+  return null;
+};
+
 const withConfig = (config) => {
-  const { db, jwt_secret, passwordEncoding, master_email, master_password, expires } = config;
+  const { db, jwt_secret, passwordEncoding, master_email, master_password, expires, authority } = config;
   const comparePassword = async (plainPass, hashword) => {
     if(passwordEncoding === 'bcrypt') {
       let isPasswordMatch = await bcrypt.compare(plainPass, hashword)
@@ -68,26 +87,32 @@ const withConfig = (config) => {
       })
   };
 
+  const idPasswordConfig = config['id-password'] || {};
+  const idField = idPasswordConfig['id-field'];
+  const passwordField = idPasswordConfig['password-field'];
+  const loginEntity = idPasswordConfig['entity'];
+
   const authenticate = async (req, res, next) => {
-    const email = req.query.email || req.body.email;
+    const idValue = req.query.email || req.body.email;
     const password = req.query.pass || req.body.pass;
     const type = req.query.type || req.body.type || "email";
-    if (master_email && master_password && email === master_email && password === master_password) {
+    if (master_email && master_password && idValue === master_email && password === master_password) {
       authenticateSuccess(req, res,
         { id: '1111111', email: 'master', name: 'master', type: 'email' },
         next);
     }
     else {
-      const memberProjection = { projection: { _id: false } };
       if (type === 'email') {
-        memberProjection['password'] = true;
-        let entity = 'admin';
-        let member = await db.collection(entity).findOne({ email: email }, memberProjection)
+        let member = await db.collection(loginEntity).findOne({ [idField]: idValue }, { projection: { _id: false } });
         if (member != null) {
-          let isPasswordMatch = await comparePassword(password, member.password)
+          let isPasswordMatch = await comparePassword(password, member[passwordField])
           if (isPasswordMatch) {
-            await db.collection(entity).updateOne({ email: email }, { $set: { login_date: new Date() } }, { upsert: false })
-            delete member.password;
+            await db.collection(loginEntity).updateOne({ [idField]: idValue }, { $set: { login_date: new Date() } }, { upsert: false })
+            delete member[passwordField];
+            delete member._id;
+            const resolvedAuthority = resolveAuthority(member, authority);
+            if (resolvedAuthority) member.authority = resolvedAuthority;
+            console.log('member', member)
             authenticateSuccess(req, res, member, next);
           } else
             res.json({ r: false, msg: '비밀번호가 일치하지 않습니다.' });

package/src/member/member.js

@@ -5,13 +5,16 @@ module.exports = async function (app, db, yml, api_prefix) {
         passwordEncoding: yml.login["password-encoding"],
         master_email: yml.login["master-email"],
         master_password: yml.login["master-password"],
-        expires: yml.login["expires"]
+        expires: yml.login["expires"],
+        authority: yml.login["authority"],
+        'id-password': yml.login["id-password"]
      });
 
     app.get(api_prefix + '/member/login',
         auth.authenticate,
         function (req, res) {
-            res.json({ r: true, token: req.token, expires: req.expires, member: req.user });
+            const { authority, ...member } = req.user;
+            res.json({ r: true, token: req.token, expires: req.expires, authority, member });
         }
     );
 
@@ -25,7 +28,8 @@ module.exports = async function (app, db, yml, api_prefix) {
     app.post(api_prefix + '/member/login',
         auth.authenticate,
         function (req, res) {
-            res.json({ r: true, token: req.token, expires: req.expires, member: req.user });
+            const { authority, ...member } = req.user;
+            res.json({ r: true, token: req.token, expires: req.expires, authority, member });
         }
     );