w-web-perm 1.0.0 → 1.0.2

package/docs/WWebPerm.html

@@ -813,7 +813,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Jul 19 2023 12:50:03 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Jul 30 2023 21:50:08 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -286,7 +286,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         //userFind
         let userFind = await woItems.users.select({ [mappingBy]: vSelf, isActive: 'y' })
         userFind = get(userFind, 0, null)
-        console.log('userFind', userFind)
+        // console.log('userFind', userFind)
 
         //複寫isAdmin
         let isAdminSrc = get(userSelf, 'isAdmin', '')
@@ -294,7 +294,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         if (isAdminSrc !== isAdminSelf) {
             userFind.isAdmin = isAdminSelf
         }
-        console.log('userFind(isAdmin)', userFind)
+        // console.log('userFind(isAdmin)', userFind)
 
         return userFind
     }
@@ -339,7 +339,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         // console.log('userFind', userFind)
 
         //ruleGroups
-        let ruleGroups = await woItems.ruleGroups.select({})
+        let ruleGroups = await woItems.ruleGroups.select()
         // console.log('ruleGroups', ruleGroups)
 
         //targets
@@ -357,8 +357,11 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         }
 
         return {
-            user: userFind,
-            roles: urs,
+            user: {
+                ...userFind,
+                ruleGroupsNames: urs.ruleGroupsNames, //ruleGroupsNames併入user內顯示
+            },
+            rules: urs.rules,
         }
     }
 
@@ -410,11 +413,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getUserByToken', //未登入界面需先檢測token是否為系統管理員, 確認後回傳為系統管理員資訊物件, getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
+            path: '/api/getUserByToken', //名稱getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
             handler: async function (req, res) {
-                // console.log('verifyIdentity', req)
+                // console.log('getUserByToken', req)
 
                 async function core() {
+                    //提供對象為browser使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 確認後回傳該使用者(系統管理員)資訊物件
 
                     //token
                     let token = get(req, 'query.token', '')
@@ -425,7 +429,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                     // console.log('userSelf', userSelf)
 
                     //check
-                    if (get(userSelf, 'isAdmin') !== 'y') { //界面須系統管理員才能使用
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
                         return Promise.reject(`user does not have permission`)
                     }
 
@@ -433,7 +437,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 }
 
                 //pm2resolve core
-                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 會提取state進行判斷
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
                 // console.log('getUserByToken', r)
 
                 return r
@@ -441,11 +445,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getPerm', //外部系統呼叫會須先檢測token是否有效, 再依照token所代表的使用者userId提供權限資訊物件
+            path: '/api/getPerm',
             handler: async function (req, res) {
                 // console.log('getPerm', req)
 
                 async function core() {
+                    //提供對象為node與browser使用者, 須先檢測token是否有效, 再依照token取得使用者資訊物件, 再由其userId查詢回傳該使用者權限資訊物件
 
                     //parseToken
                     let token = parseToken(req)
@@ -485,6 +490,51 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 let r = await pm2resolve(core)()
                 // console.log('getPerm r', r)
 
+                return r
+            },
+        },
+        {
+            method: 'GET',
+            path: '/api/getPermById',
+            handler: async function (req, res) {
+                // console.log('getPermById', req)
+
+                async function core() {
+                    //提供對象為node使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 再由query取得欲查詢的使用者userId, 再由其userId查詢回傳該使用者權限資訊物件
+
+                    //token
+                    let token = get(req, 'query.token', '')
+                    // console.log('token', token)
+
+                    //getGenUserByUserId
+                    let userSelf = await getTokenUserForSelf(token)
+                    // console.log('userSelf', userSelf)
+
+                    //check
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
+                        return Promise.reject(`user does not have permission`)
+                    }
+
+                    //userId
+                    let userId = get(req, 'query.userId', '')
+                    // console.log('userId', userId)
+
+                    //getGenUserAndRulesByUserId
+                    let r = await getGenUserAndRulesByUserId(userId)
+                    // console.log('getGenUserAndRulesByUserId', r)
+
+                    //check
+                    if (!iseobj(r)) {
+                        return Promise.reject(`user does not have permrules`)
+                    }
+
+                    return r
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
+                // console.log('getUserByToken', r)
+
                 return r
             },
         },
@@ -545,7 +595,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Jul 19 2023 12:50:03 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Jul 30 2023 21:50:08 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Jul 19 2023 12:50:03 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Jul 30 2023 21:50:08 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.2.96",
     "axios": "^1.3.4",
+    "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "showdown": "^2.1.0",
-    "w-component-vue": "^2.3.6",
+    "w-component-vue": "^2.3.18",
     "w-data-collector": "^1.0.19",
     "w-serv-hapi": "^1.0.11",
     "w-serv-orm": "^1.0.7",
     "w-ui-loginout": "^1.0.4",
-    "wsemi": "^1.7.17"
+    "wsemi": "^1.7.19"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -72,4 +73,4 @@
   ],
   "author": "yuda-lyu(semisphere)",
   "license": "MIT"
-}
+}

package/server/WWebPerm.mjs

@@ -239,7 +239,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         //userFind
         let userFind = await woItems.users.select({ [mappingBy]: vSelf, isActive: 'y' })
         userFind = get(userFind, 0, null)
-        console.log('userFind', userFind)
+        // console.log('userFind', userFind)
 
         //複寫isAdmin
         let isAdminSrc = get(userSelf, 'isAdmin', '')
@@ -247,7 +247,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         if (isAdminSrc !== isAdminSelf) {
             userFind.isAdmin = isAdminSelf
         }
-        console.log('userFind(isAdmin)', userFind)
+        // console.log('userFind(isAdmin)', userFind)
 
         return userFind
     }
@@ -292,7 +292,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         // console.log('userFind', userFind)
 
         //ruleGroups
-        let ruleGroups = await woItems.ruleGroups.select({})
+        let ruleGroups = await woItems.ruleGroups.select()
         // console.log('ruleGroups', ruleGroups)
 
         //targets
@@ -310,8 +310,11 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         }
 
         return {
-            user: userFind,
-            roles: urs,
+            user: {
+                ...userFind,
+                ruleGroupsNames: urs.ruleGroupsNames, //ruleGroupsNames併入user內顯示
+            },
+            rules: urs.rules,
         }
     }
 
@@ -363,11 +366,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getUserByToken', //未登入界面需先檢測token是否為系統管理員, 確認後回傳為系統管理員資訊物件, getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
+            path: '/api/getUserByToken', //名稱getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
             handler: async function (req, res) {
-                // console.log('verifyIdentity', req)
+                // console.log('getUserByToken', req)
 
                 async function core() {
+                    //提供對象為browser使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 確認後回傳該使用者(系統管理員)資訊物件
 
                     //token
                     let token = get(req, 'query.token', '')
@@ -378,7 +382,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                     // console.log('userSelf', userSelf)
 
                     //check
-                    if (get(userSelf, 'isAdmin') !== 'y') { //界面須系統管理員才能使用
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
                         return Promise.reject(`user does not have permission`)
                     }
 
@@ -386,7 +390,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 }
 
                 //pm2resolve core
-                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 會提取state進行判斷
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
                 // console.log('getUserByToken', r)
 
                 return r
@@ -394,11 +398,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         },
         {
             method: 'GET',
-            path: '/api/getPerm', //外部系統呼叫會須先檢測token是否有效, 再依照token所代表的使用者userId提供權限資訊物件
+            path: '/api/getPerm',
             handler: async function (req, res) {
                 // console.log('getPerm', req)
 
                 async function core() {
+                    //提供對象為node與browser使用者, 須先檢測token是否有效, 再依照token取得使用者資訊物件, 再由其userId查詢回傳該使用者權限資訊物件
 
                     //parseToken
                     let token = parseToken(req)
@@ -438,6 +443,51 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
                 let r = await pm2resolve(core)()
                 // console.log('getPerm r', r)
 
+                return r
+            },
+        },
+        {
+            method: 'GET',
+            path: '/api/getPermById',
+            handler: async function (req, res) {
+                // console.log('getPermById', req)
+
+                async function core() {
+                    //提供對象為node使用者, 且認定權限系統須系統管理員才能使用, 須先檢測token是否為系統管理員, 再由query取得欲查詢的使用者userId, 再由其userId查詢回傳該使用者權限資訊物件
+
+                    //token
+                    let token = get(req, 'query.token', '')
+                    // console.log('token', token)
+
+                    //getGenUserByUserId
+                    let userSelf = await getTokenUserForSelf(token)
+                    // console.log('userSelf', userSelf)
+
+                    //check
+                    if (get(userSelf, 'isAdmin') !== 'y') { //權限系統須系統管理員才能使用
+                        return Promise.reject(`user does not have permission`)
+                    }
+
+                    //userId
+                    let userId = get(req, 'query.userId', '')
+                    // console.log('userId', userId)
+
+                    //getGenUserAndRulesByUserId
+                    let r = await getGenUserAndRulesByUserId(userId)
+                    // console.log('getGenUserAndRulesByUserId', r)
+
+                    //check
+                    if (!iseobj(r)) {
+                        return Promise.reject(`user does not have permrules`)
+                    }
+
+                    return r
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 須另提取state進行判斷
+                // console.log('getUserByToken', r)
+
                 return r
             },
         },

package/src/components/LayoutContentGroups.vue

@@ -148,6 +148,7 @@
 
 <script>
 import { mdiStackOverflow, mdiVectorPolylinePlus, mdiCheckboxMarkedCircle, mdiCloudUploadOutline } from '@mdi/js/mdi.js'
+// import JSON5 from 'json5'
 import get from 'lodash/get'
 import each from 'lodash/each'
 import map from 'lodash/map'
@@ -211,9 +212,9 @@ export default {
 
             let vo = this
 
-            //rs, 此區程式碼等同於ruleGroups, 若確認後續無需求再移除
+            //rs
             let rs = map(vo.ruleGroups, (v) => {
-                // let rules = JSON.parse(v.crules)
+                // let rules = JSON5.parse(v.crules)
                 return {
                     ...v,
                     // rules,

package/src/components/LayoutContentTargets.vue

@@ -123,6 +123,7 @@
 
 <script>
 import { mdiGamepadCircle, mdiStackOverflow, mdiAccountGroupOutline, mdiBallotRecountOutline, mdiCloudUploadOutline } from '@mdi/js/mdi.js'
+import JSON5 from 'json5'
 import get from 'lodash/get'
 import set from 'lodash/set'
 import each from 'lodash/each'
@@ -141,6 +142,10 @@ import WTree from 'w-component-vue/src/components/WTree.vue'
 import { getTreeBlocks } from '../plugins/mShare.mjs'
 
 
+//dlm
+let dlm = '.'
+
+
 export default {
     components: {
         WIcon,
@@ -202,6 +207,8 @@ export default {
 
             //getTreeBlocks
             let treeBlocks = getTreeBlocks(vo.targets)
+            // console.log('targets', vo.targets)
+            // console.log('treeBlocks', treeBlocks)
 
             //save
             vo.treeBlocks = treeBlocks
@@ -379,7 +386,7 @@ export default {
                     let nkParent = dropRight(v.nk, 2)
                     let p = get(treeBlocksTemp, nkParent)
                     v.parentId = p.id
-                    v.id = `${v.parentId}.${v.text}`
+                    v.id = `${v.parentId}${dlm}${v.text}` //[tag:dlm]
                 }
                 v.order = k //需重新給予order
                 set(treeBlocksTemp, v.nk, v)
@@ -448,7 +455,7 @@ export default {
                 //gs
                 let gs = []
                 each(vo.ruleGroups, (v) => {
-                    let rules = JSON.parse(v.crules)
+                    let rules = JSON5.parse(v.crules)
                     let r = replaceObjKeys(rules, kpDiffs)
                     if (r.isChanged) {
                         gs.push({

package/src/components/VeUser.vue

@@ -153,6 +153,7 @@
 <script>
 import { mdiAccountEdit, mdiFileTree } from '@mdi/js/mdi.js'
 import Vue from 'vue'
+// import JSON5 from 'json5'
 import get from 'lodash/get'
 import each from 'lodash/each'
 import map from 'lodash/map'
@@ -227,9 +228,9 @@ export default {
 
             let vo = this
 
-            //rs, 此區程式碼等同於ruleGroups, 若確認後續無需求再移除
+            //rs
             let rs = map(vo.ruleGroups, (v) => {
-                // let rules = JSON.parse(v.crules)
+                // let rules = JSON5.parse(v.crules)
                 return {
                     ...v,
                     // rules,
@@ -311,8 +312,8 @@ export default {
             //mergedGroup
             let mergedGroup = {
                 id: 'merged-group',
-                name: 'merged-group',
-                crules: JSON.stringify(urs),
+                name: urs.ruleGroupsNames,
+                crules: JSON.stringify(urs.rules),
             }
 
             //mergedGroup

package/src/components/ruleGroup.vue

@@ -92,9 +92,10 @@
 
         <WTree
             :viewHeightMax="treeHeight"
-            :icon-toggle-color="'#666'"
-            :icon-toggle-background-color="'transparent'"
-            :icon-toggle-background-color-hover="'transparent'"
+            :indent="0.5"
+            :iconToggleColor="'#666'"
+            :iconToggleBackgroundColor="'transparent'"
+            :iconToggleBackgroundColorHover="'transparent'"
             :data="treeBlocks"
         >
             <template v-slot:item="props">
@@ -207,6 +208,7 @@
 
 <script>
 import { mdiEyeCheck, mdiEyeOff, mdiEyedropper, mdiEyedropperOff } from '@mdi/js/mdi.js'
+import JSON5 from 'json5'
 import get from 'lodash/get'
 import set from 'lodash/set'
 import each from 'lodash/each'
@@ -275,7 +277,7 @@ export default {
             let group = cloneDeep(vo.group)
 
             //save rules
-            let rules = JSON.parse(group.crules)
+            let rules = JSON5.parse(group.crules)
             group.rules = rules
             // console.log('rules', rules)
 
@@ -303,30 +305,6 @@ export default {
             return get(this, `$store.state.targets`)
         },
 
-        // blocks: function() {
-        //     // console.log('computed blocks')
-
-        //     let vo = this
-
-        //     //rs
-        //     let rs = map(vo.targets, (v) => {
-
-        //         //text, parentId
-        //         let s = sep(v.id, '.')
-        //         let text = get(takeRight(s), 0) //取最後節點
-        //         s = dropRight(s, 1)
-        //         let parentId = join(s, '.') //取父節點
-
-        //         return {
-        //             ...v,
-        //             parentId,
-        //             text,
-        //         }
-        //     })
-
-        //     return rs
-        // },
-
         treeBlocks: function() {
             // console.log('computed treeBlocks')
 

package/src/perm.mjs

@@ -1,60 +1,108 @@
 import axios from 'axios'
+import get from 'lodash/get'
 import isestr from 'wsemi/src/isestr.mjs'
+import isbol from 'wsemi/src/isbol.mjs'
+import isfun from 'wsemi/src/isfun.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
+import pmInvResolve from 'wsemi/src/pmInvResolve.mjs'
 
 
-let _url = ''
+function perm() {
 
+    //pmd
+    let pmd = null
 
-function iniPerm(url) {
-    _url = url
-}
+    //conn
+    let conn = (url, opt = {}) => {
 
+        //check
+        if (!isestr(url)) {
+            throw new Error(`invalid url`)
+        }
+        if (url.indexOf('token=') === 0) {
+            throw new Error(`url does not include 'token='`)
+        }
+        if (url.indexOf('userId=') === 0) {
+            throw new Error(`url does not include 'userId='`)
+        }
 
-async function getPerm(token) {
+        //thenExtractData
+        let thenExtractData = get(opt, 'thenExtractData')
+        if (!isbol(thenExtractData)) {
+            thenExtractData = false //通過axios取數據時須給予true
+        }
 
-    //check
-    if (!isestr(_url)) {
-        throw new Error(`invalid url, need to use iniPerm to set url`)
-    }
+        //useAsync
+        let useAsync = get(opt, 'useAsync')
+        if (!isbol(useAsync)) {
+            useAsync = false
+        }
 
-    //pm
-    let pm = genPm()
-
-    //url
-    let url = `${_url}?token=${token}`
-
-    //axios
-    await axios({
-        method: 'get',
-        url,
-        // headers: { 'Content-Type': 'application/json; charset=utf-8' },
-        // data: rin,
-    })
-        .then((res) => {
-            // console.log(res)
-            let r = {
-                msg: '成功取得使用者權限',
-                res,
-            }
-            pm.resolve(r)
-        })
-        .catch((err) => {
-            // console.log(err)
-            let r = {
-                msg: '取得使用者權限發生錯誤',
-                res: err,
-            }
-            pm.reject(r)
-        })
-
-    return pm
-}
+        //permSuccess
+        let permSuccess = get(opt, 'permSuccess')
+
+        //permError
+        let permError = get(opt, 'permError')
+
+        //pm
+        let pm = null
+        if (useAsync) {
+            pm = genPm()
+        }
 
+        //get
+        let pms = axios.get(url)
+        pms = pmInvResolve(pms, { thenExtractData })
+        pms
+            .then((res) => {
+                // console.log('perm.getPerm then', res)
+                pmd = res
+                if (isfun(permSuccess)) {
+                    permSuccess(pmd)
+                }
+                if (useAsync) {
+                    pm.resolve(kp)
+                }
+            })
+            .catch((err) => {
+                // console.log('perm.getPerm catch', err)
+                if (isfun(permError)) {
+                    permError(err)
+                }
+                if (useAsync) {
+                    pm.reject()
+                }
+            })
+
+        if (useAsync) {
+            return pm
+        }
+        return kp
+    }
+
+    //kp
+    let kp = {
+        conn,
+        getUser: () => {
+            let u = get(pmd, `user`, {})
+            // console.log('u', u)
+            return u
+        },
+        getRules: () => {
+            return get(pmd, `rules`, {})
+        },
+        rule: (key) => {
+            return get(pmd, `rules.${key}`, {})
+        },
+        show: (key) => {
+            return get(pmd, `rules.${key}.show`, 'n')
+        },
+        active: (key) => {
+            return get(pmd, `rules.${key}.active`, 'n')
+        },
+    }
 
-let perm = {
-    iniPerm,
-    getPerm,
+    return kp
 }