w-web-perm 1.0.12 → 1.0.13

package/script.txt

@@ -1,14 +1,14 @@
-#node --experimental-modules --es-module-specifier-resolution=node toolg/addVersion.mjs
-node --experimental-modules --es-module-specifier-resolution=node toolg/modifyReadme.mjs
+#node --experimental-modules toolg/addVersion.mjs
+node --experimental-modules toolg/modifyReadme.mjs
 
-node --experimental-modules --es-module-specifier-resolution=node toolg/cleanFolder.mjs
+node --experimental-modules toolg/cleanFolder.mjs
 ./node_modules/.bin/jsdoc -c .jsdoc
 
 npm run build
 
-node --experimental-modules --es-module-specifier-resolution=node toolg/genEntry.mjs
+node --experimental-modules toolg/genEntry.mjs
 
-node --experimental-modules --es-module-specifier-resolution=node toolg/gDistRollup.mjs
+node --experimental-modules toolg/gDistRollup.mjs
 
 git add .  -A
 git commit -m 'modify: '

package/server/WWebPerm.mjs

@@ -1,8 +1,9 @@
 import path from 'path'
 import fs from 'fs'
-import get from 'lodash-es/get.js'
-import each from 'lodash-es/each.js'
-import keys from 'lodash-es/keys.js'
+import get from 'lodash-es/get.js'
+import map from 'lodash-es/map.js'
+import keys from 'lodash-es/keys.js'
+import size from 'lodash-es/size.js'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
@@ -18,6 +19,8 @@ import pm2resolve from 'wsemi/src/pm2resolve.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import replace from 'wsemi/src/replace.mjs'
+import ltdtDiffByKey from 'wsemi/src/ltdtDiffByKey.mjs'
+import ltdtmapping from 'wsemi/src/ltdtmapping.mjs'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
 import ds from '../src/schema/index.mjs'
@@ -254,26 +257,102 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
 
     //getUsersList
-    let getUsersList = async (userId, token) => {
+    let getUsersList = async (userId) => {
         let rs = await woItems.users.select() //isActive為y或n都需要提供, 給前端編輯
         return rs
     }
 
 
     //getRuleGroupsList
-    let getRuleGroupsList = async (userId, token) => {
-        let rs = await woItems.ruleGroups.select()
+    let getRuleGroupsList = async (userId) => {
+        let rs = await woItems.pemis.select()
         return rs
     }
 
 
     //getTargetsList
-    let getTargetsList = async (userId, token) => {
+    let getTargetsList = async (userId) => {
         let rs = await woItems.targets.select()
         return rs
     }
 
 
+    //updateTabItems
+    let updateTabItems = async (woName, userId, rows, keyDetect) => {
+        // console.log('updateTabItems', woName, userId, rows.length, keyDetect)
+
+        //ltdtmapping
+        rows = ltdtmapping(rows, ds[woName].keys)
+        // console.log('ltdtmapping rows', rows)
+
+        //重給order
+        rows = map(rows, (r, k) => {
+            r.order = k + 1
+            return r
+        })
+
+        //ltdtDiffByKey
+        let ltdtOld = await woItems[woName].select()
+        let ltdtNew = rows
+        let r = ltdtDiffByKey(ltdtOld, ltdtNew, keyDetect)
+        // console.log('ltdtDiffByKey r', r)
+
+        //del
+        if (size(r.del) > 0) {
+            await procOrm(userId, woName, 'del', r.del) //須使用procOrm才有辦法自動給予相關欄位
+            // .catch((err) => {
+            //     console.log('woItems[woName].del err', err)
+            // })
+        }
+
+        //add
+        if (size(r.add) > 0) {
+            await procOrm(userId, woName, 'insert', r.add) //須使用procOrm才有辦法自動給予相關欄位
+            // .catch((err) => {
+            //     console.log('woItems[woName].insert err', err)
+            // })
+        }
+
+        //diff
+        if (size(r.diff) > 0) {
+            await procOrm(userId, woName, 'save', r.diff) //須使用procOrm才有辦法自動給予相關欄位
+            // .catch((err) => {
+            //     console.log('woItems[woName].save err', err)
+            // })
+        }
+
+        return ltdtNew
+    }
+
+
+    //updateTargets
+    let updateTargets = async (userId, rows) => {
+        rows = await updateTabItems('targets', userId, rows, 'id')
+        return rows
+    }
+
+
+    //updatePemis
+    let updatePemis = async (userId, rows) => {
+        rows = await updateTabItems('pemis', userId, rows, 'name')
+        return rows
+    }
+
+
+    //updateGrups
+    let updateGrups = async (userId, rows) => {
+        rows = await updateTabItems('grups', userId, rows, 'name')
+        return rows
+    }
+
+
+    //updateUsers
+    let updateUsers = async (userId, rows) => {
+        rows = await updateTabItems('users', userId, rows, 'id')
+        return rows
+    }
+
+
     //parseToken
     let parseToken = (req) => {
 
@@ -446,12 +525,8 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
             return Promise.reject(`invalid from from inp`)
         }
 
-
         //vs
         let vs = get(inp, key, [])
-        //users
-        //targets
-        //ruleGroups
 
         //check
         if (!isearr(vs)) {
@@ -472,7 +547,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
 
     //syncAndReplaceRows
-    let syncAndReplaceRows = async (params, key) => {
+    let syncAndReplaceRows = async (userId, params, woName) => {
 
         //from
         let from = get(params, 'from', '')
@@ -486,28 +561,34 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
             return Promise.reject(`invalid from`)
         }
 
-        //vs
-        let vs = get(params, key, [])
-        // console.log(key, vs)
+        //rows
+        let rows = get(params, woName, [])
+        // console.log(woName, rows)
 
         //check
-        if (!isearr(vs)) {
+        if (!isearr(rows)) {
             console.log('params', params)
-            console.log(key, vs)
-            console.log(`invalid ${key}`)
-            return Promise.reject(`invalid ${key}`)
+            console.log('woName', woName)
+            return Promise.reject(`invalid ${woName}`)
         }
 
         //save from
-        each(vs, (v, k) => {
-            vs[k].from = from
+        rows = map(rows, (v, k) => {
+            // v.order = k + 1 //order大部分由外部給予, 不能複寫
+            v.from = from
+            return v
         })
 
+        //ltdtmapping
+        rows = ltdtmapping(rows, ds[woName].keys)
+        // console.log('ltdtmapping rows', rows)
+
         //delAll from
-        await woItems[key].delAll({ from })
+        await woItems[woName].delAll({ from })
 
         //insert
-        let r = await woItems[key].insert(vs)
+        // let r = await woItems[woName].insert(rows)
+        let r = await procOrm(userId, woName, 'insert', rows) //須使用procOrm才有辦法自動給予相關欄位
 
         return r
     }
@@ -544,38 +625,39 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
     }
 
 
-    //getGenUserAndRulesByUserId
+    //getGenUserAndRulesByUserId bbb
     let getGenUserAndRulesByUserId = async (userId) => {
 
         //userFind
         let userFind = await getGenUserByUserId(userId)
         // console.log('userFind', userFind)
 
-        //ruleGroups
-        let ruleGroups = await woItems.ruleGroups.select()
-        // console.log('ruleGroups', ruleGroups)
+        //grups
+        let grups = await woItems.grups.select()
+        // console.log('grups', grups)
+
+        //pemis
+        let pemis = await woItems.pemis.select()
+        // console.log('pemis', pemis)
 
         //targets
         let targets = await woItems.targets.select()
         // console.log('targets', targets)
 
         //getUserRules
-        let urs = getUserRules(userFind, ruleGroups, targets)
-        // console.log('getUserRules', urs)
+        let kur = getUserRules(userFind, grups, pemis, targets)
+        // console.log('getUserRules', kur)
 
         //check
-        if (!iseobj(urs)) {
+        if (!iseobj(kur)) {
             console.log('userId', userId)
-            console.log(`can not get permrules`)
-            return Promise.reject(`can not get permrules`)
+            console.log(`can not get rules of user`)
+            return Promise.reject(`can not get rules of user`)
         }
 
         return {
-            user: {
-                ...userFind,
-                ruleGroupsNames: urs.ruleGroupsNames, //ruleGroupsNames併入user內顯示
-            },
-            rules: urs.rules,
+            user: userFind,
+            kur,
         }
     }
 
@@ -676,7 +758,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
                 // console.log('getPerm', req)
 
                 async function core() {
-                    //提供對象為node與browser使用者, node實際也為轉發之browser使用者, 須先檢測token是否有效, 再依照token取得使用者資訊物件, 再由其userId查詢回傳該使用者之權限資訊物件
+                    //提供對象為node與browser使用者, node通常也為其他系統之browser使用者因須驗證而由node轉發, 皆須先檢測token是否有效, 再依照token取得使用者資訊物件, 再由其userId查詢回傳該使用者之權限資訊物件
 
                     //parseToken
                     let token = parseToken(req)
@@ -781,10 +863,10 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
         },
         {
             method: 'POST',
-            path: '/syncAndReplaceUsers',
+            path: '/syncAndReplaceTargets',
             handler: async function (req, res) {
-                // console.log('syncAndReplaceUsers', req)
-                // console.log('payload', req.payload)
+                // console.log('syncAndReplaceTargets', req)
+                // console.log('syncAndReplaceTargets payload', req.payload)
 
                 async function core() {
                     //提供對象為node使用者, 須為系統管理者, 須先檢測token是否有效, 再進行數據變更
@@ -793,21 +875,24 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
                     let token = get(req, 'query.token', '')
 
                     //getAndVerifyAppTokenUser
-                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceUsers')
+                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceTargets')
 
                     //check
                     if (!iseobj(user)) {
                         console.log('token', token)
-                        console.log('[API]syncAndReplaceUsers/check user: invalid user')
+                        console.log('[API]syncAndReplaceTargets/check user: invalid user')
                         console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
+                    //userId
+                    let userId = get(user, 'id', '')
+
                     //parsePayload
-                    let inp = await parsePayload(req, 'users')
+                    let inp = await parsePayload(req, 'targets')
 
                     //syncAndReplaceRows
-                    let r = await syncAndReplaceRows(inp, 'users')
+                    let r = await syncAndReplaceRows(userId, inp, 'targets')
 
                     return r
                 }
@@ -821,10 +906,10 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
         },
         {
             method: 'POST',
-            path: '/syncAndReplaceTargets',
+            path: '/syncAndReplacePemis',
             handler: async function (req, res) {
-                // console.log('syncAndReplaceTargets', req)
-                // console.log('payload', req.payload)
+                // console.log('syncAndReplacePemis', req)
+                // console.log('syncAndReplacePemis payload', req.payload)
 
                 async function core() {
                     //提供對象為node使用者, 須為系統管理者, 須先檢測token是否有效, 再進行數據變更
@@ -833,21 +918,24 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
                     let token = get(req, 'query.token', '')
 
                     //getAndVerifyAppTokenUser
-                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceTargets')
+                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplacePemis')
 
                     //check
                     if (!iseobj(user)) {
                         console.log('token', token)
-                        console.log('[API]syncAndReplaceTargets/check user: invalid user')
+                        console.log('[API]syncAndReplacePemis/check user: invalid user')
                         console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
                     //parsePayload
-                    let inp = await parsePayload(req, 'targets')
+                    let inp = await parsePayload(req, 'pemis')
+
+                    //userId
+                    let userId = get(user, 'id', '')
 
                     //syncAndReplaceRows
-                    let r = await syncAndReplaceRows(inp, 'targets')
+                    let r = await syncAndReplaceRows(userId, inp, 'pemis')
 
                     return r
                 }
@@ -861,10 +949,10 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
         },
         {
             method: 'POST',
-            path: '/syncAndReplaceRuleGroups',
+            path: '/syncAndReplaceGrups',
             handler: async function (req, res) {
-                // console.log('syncAndReplaceRuleGroups', req)
-                // console.log('payload', req.payload)
+                // console.log('syncAndReplaceGrups', req)
+                // console.log('syncAndReplaceGrups payload', req.payload)
 
                 async function core() {
                     //提供對象為node使用者, 須為系統管理者, 須先檢測token是否有效, 再進行數據變更
@@ -873,21 +961,67 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
                     let token = get(req, 'query.token', '')
 
                     //getAndVerifyAppTokenUser
-                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceRuleGroups')
+                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceGrups')
 
                     //check
                     if (!iseobj(user)) {
                         console.log('token', token)
-                        console.log('[API]syncAndReplaceRuleGroups/check user: invalid user')
+                        console.log('[API]syncAndReplaceGrups/check user: invalid user')
                         console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
                     //parsePayload
-                    let inp = await parsePayload(req, 'ruleGroups')
+                    let inp = await parsePayload(req, 'grups')
+
+                    //userId
+                    let userId = get(user, 'id', '')
 
                     //syncAndReplaceRows
-                    let r = await syncAndReplaceRows(inp, 'ruleGroups')
+                    let r = await syncAndReplaceRows(userId, inp, 'grups')
+
+                    return r
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)()
+                // console.log('verifyIdentity', r)
+
+                return r
+            },
+        },
+        {
+            method: 'POST',
+            path: '/syncAndReplaceUsers',
+            handler: async function (req, res) {
+                // console.log('syncAndReplaceUsers', req)
+                // console.log('syncAndReplaceUsers payload', req.payload)
+
+                async function core() {
+                    //提供對象為node使用者, 須為系統管理者, 須先檢測token是否有效, 再進行數據變更
+
+                    //token
+                    let token = get(req, 'query.token', '')
+
+                    //getAndVerifyAppTokenUser
+                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceUsers')
+
+                    //check
+                    if (!iseobj(user)) {
+                        console.log('token', token)
+                        console.log('[API]syncAndReplaceUsers/check user: invalid user')
+                        console.log(`token does not have permission`)
+                        return Promise.reject(`token does not have permission`)
+                    }
+
+                    //parsePayload
+                    let inp = await parsePayload(req, 'users')
+
+                    //userId
+                    let userId = get(user, 'id', '')
+
+                    //syncAndReplaceRows
+                    let r = await syncAndReplaceRows(userId, inp, 'users')
 
                     return r
                 }
@@ -916,7 +1050,15 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
         pathStaticFiles,
         apis,
         getUserIDFromToken: async (token) => { //可使用async或sync函數
-            return ''
+            // console.log('getUserIDFromToken', token)
+            let user = await getUserByToken(token)
+            let userId = get(user, 'id', '')
+            if (!isestr(userId)) {
+                console.log('token', token)
+                console.log('userId', userId)
+                return Promise.reject(`can not find user.id`)
+            }
+            return userId
         },
         useDbORM: true,
         dbORMs: woItems,
@@ -926,10 +1068,16 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
         tableNamesSync,
         extFuncs: { //接收參數第1個為userId, 之後才是前端給予參數
             getWebInfor,
-            getUsersList,
-            getRuleGroupsList,
+
             getTargetsList,
-            //...
+            getRuleGroupsList,
+            getUsersList,
+
+            updateTargets,
+            updatePemis,
+            updateGrups,
+            updateUsers,
+
         },
         hookBefores: null,
         hookAfters: null,

package/server/provideGrups.mjs

@@ -0,0 +1,64 @@
+import axios from 'axios'
+import ltdtpick from 'wsemi/src/ltdtpick.mjs'
+import genPm from 'wsemi/src/genPm.mjs'
+
+
+async function provideGrups(url, from, grups) {
+    //url: 指權限伺服器提供的調整grups網址, 例如 http://localhost:11006/syncAndReplaceGrups
+    //from: 指grups來源
+
+    //pm
+    let pm = genPm()
+
+    //ks
+    let ks = [
+        // 'id',
+        'order', //order大部分由外部給予, 得要開啟
+        'name',
+        'description',
+        'cpemis',
+        // 'userId',
+        // 'timeCreate',
+        // 'userIdUpdate',
+        // 'timeUpdate',
+    ]
+
+    //ltdtpick
+    grups = ltdtpick(grups, ks)
+
+    //rin
+    let rin = {
+        from,
+        grups,
+    }
+    // rin = JSON.stringify(rin)
+
+    //axios
+    await axios({
+        method: 'post',
+        url,
+        headers: { 'Content-Type': 'application/json; charset=utf-8' },
+        data: rin,
+    })
+        .then((res) => {
+            // console.log(res)
+            let r = {
+                msg: '成功傳輸grups清單',
+                res,
+            }
+            pm.resolve(r)
+        })
+        .catch((err) => {
+            // console.log(err)
+            let r = {
+                msg: '無法傳輸grups清單',
+                res: err,
+            }
+            pm.reject(r)
+        })
+
+    return pm
+}
+
+
+export default provideGrups

package/server/{provideRuleGroups.mjs → providePemis.mjs}

@@ -3,34 +3,33 @@ import ltdtpick from 'wsemi/src/ltdtpick.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
 
 
-async function provideRuleGroups(url, from, ruleGroups) {
-    //url: 指權限伺服器提供的調整ruleGroups網址, 例如 http://localhost:11006/syncAndReplaceRuleGroups
-    //from: 指ruleGroup來源
+async function providePemis(url, from, pemis) {
+    //url: 指權限伺服器提供的調整pemis網址, 例如 http://localhost:11006/syncAndReplacePemis
+    //from: 指pemis來源
 
     //pm
     let pm = genPm()
 
     //ks
     let ks = [
-        'id',
-        'order',
+        // 'id',
+        'order', //order大部分由外部給予, 得要開啟
         'name',
         'description',
-        'from',
         'crules',
-        'userId',
-        'timeCreate',
-        'userIdUpdate',
-        'timeUpdate',
+        // 'userId',
+        // 'timeCreate',
+        // 'userIdUpdate',
+        // 'timeUpdate',
     ]
 
     //ltdtpick
-    ruleGroups = ltdtpick(ruleGroups, ks)
+    pemis = ltdtpick(pemis, ks)
 
     //rin
     let rin = {
         from,
-        ruleGroups,
+        pemis,
     }
     // rin = JSON.stringify(rin)
 
@@ -44,7 +43,7 @@ async function provideRuleGroups(url, from, ruleGroups) {
         .then((res) => {
             // console.log(res)
             let r = {
-                msg: '成功傳輸RuleGroups清單',
+                msg: '成功傳輸pemis清單',
                 res,
             }
             pm.resolve(r)
@@ -52,7 +51,7 @@ async function provideRuleGroups(url, from, ruleGroups) {
         .catch((err) => {
             // console.log(err)
             let r = {
-                msg: '無法傳輸RuleGroups清單',
+                msg: '無法傳輸pemis清單',
                 res: err,
             }
             pm.reject(r)
@@ -62,4 +61,4 @@ async function provideRuleGroups(url, from, ruleGroups) {
 }
 
 
-export default provideRuleGroups
+export default providePemis

package/server/provideTargets.mjs

@@ -5,7 +5,7 @@ import genPm from 'wsemi/src/genPm.mjs'
 
 async function provideTargets(url, from, targets) {
     //url: 指權限伺服器提供的調整targets網址, 例如 http://localhost:11006/syncAndReplaceTargets
-    //from: 指target來源
+    //from: 指targets來源
 
     //pm
     let pm = genPm()
@@ -13,9 +13,12 @@ async function provideTargets(url, from, targets) {
     //ks
     let ks = [
         'id',
-        'order',
+        'order', //order大部分由外部給予, 得要開啟
         'description',
-        'from',
+        // 'userId',
+        // 'timeCreate',
+        // 'userIdUpdate',
+        // 'timeUpdate',
     ]
 
     //ltdtpick
@@ -38,7 +41,7 @@ async function provideTargets(url, from, targets) {
         .then((res) => {
             // console.log(res)
             let r = {
-                msg: '成功傳輸Targets清單',
+                msg: '成功傳輸targets清單',
                 res,
             }
             pm.resolve(r)
@@ -46,7 +49,7 @@ async function provideTargets(url, from, targets) {
         .catch((err) => {
             // console.log(err)
             let r = {
-                msg: '無法傳輸Targets清單',
+                msg: '無法傳輸targets清單',
                 res: err,
             }
             pm.reject(r)