w-web-perm 1.0.1 → 1.0.3

package/src/perm.mjs

@@ -1,65 +1,103 @@
 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='`)
+        }
 
-function getPerm(token = '') {
+        //useAsync
+        let useAsync = get(opt, 'useAsync')
+        if (!isbol(useAsync)) {
+            useAsync = false
+        }
 
-    //check
-    if (!isestr(_url)) {
-        throw new Error(`invalid url, need to use iniPerm to set url`)
-    }
+        //permSuccess
+        let permSuccess = get(opt, 'permSuccess')
 
-    // //pm
-    // let pm = genPm()
+        //permError
+        let permError = get(opt, 'permError')
 
-    //url
-    let url = ''
-    if (isestr(token)) {
-        url = `${_url}?token=${token}`
-    }
-    else {
-        url = _url
-    }
+        //pm
+        let pm = null
+        if (useAsync) {
+            pm = genPm()
+        }
 
-    //axios
-    let pm = 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)
-    // })
+        //get
+        let pms = axios.get(url)
+        pms = pmInvResolve(pms, { thenExtractData: true })
+        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()
+                }
+            })
 
-    return pm
-}
+        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
 }
 
 

package/src/plugins/mDataSupport.mjs

@@ -1,63 +1,20 @@
-// import min from 'lodash/min'
-// import size from 'lodash/size'
-// import take from 'lodash/take'
-// import isEqual from 'lodash/isEqual'
-// import uniq from 'lodash/uniq'
-// import set from 'lodash/set'
 // import get from 'lodash/get'
 // import each from 'lodash/each'
 // import map from 'lodash/map'
-// import filter from 'lodash/filter'
-// import last from 'lodash/last'
-// import split from 'lodash/split'
-// import join from 'lodash/join'
-// import drop from 'lodash/drop'
-// import dropRight from 'lodash/dropRight'
-// import groupBy from 'lodash/groupBy'
-// import sortBy from 'lodash/sortBy'
 // import cloneDeep from 'lodash/cloneDeep'
-// import cint from 'wsemi/src/cint.mjs'
-// import delay from 'wsemi/src/delay.mjs'
-// import isarr from 'wsemi/src/isarr.mjs'
 // import isestr from 'wsemi/src/isestr.mjs'
 // import isfun from 'wsemi/src/isfun.mjs'
 // import iseobj from 'wsemi/src/iseobj.mjs'
 // import isearr from 'wsemi/src/isearr.mjs'
-// import isEle from 'wsemi/src/isEle.mjs'
-// import strleft from 'wsemi/src/strleft.mjs'
-// import strdelleft from 'wsemi/src/strdelleft.mjs'
-// import sep from 'wsemi/src/sep.mjs'
-// import aes2str from 'wsemi/src/aes2str.mjs'
-// import str2aes from 'wsemi/src/str2aes.mjs'
-// import haskey from 'wsemi/src/haskey.mjs'
-// import genPm from 'wsemi/src/genPm.mjs'
-// import pmSeries from 'wsemi/src/pmSeries.mjs'
-// import waitFun from 'wsemi/src/waitFun.mjs'
-// import browserView from 'wsemi/src/browserView.mjs'
-// import arrHas from 'wsemi/src/arrHas.mjs'
-// import arrSort from 'wsemi/src/arrSort.mjs'
-// import arrInsert from 'wsemi/src/arrInsert.mjs'
-// import replace from 'wsemi/src/replace.mjs'
-// import timemsTZ2past from 'wsemi/src/timemsTZ2past.mjs'
-// import convertToTree from 'wsemi/src/convertToTree.mjs'
-// import html2picDyn from 'wsemi/src/html2picDyn.mjs'
-// import urlParse from 'wsemi/src/urlParse.mjs'
-// import domConvertToPicDyn from 'wsemi/src/domConvertToPicDyn.mjs'
-// import ltdtkeysheads2mat from 'wsemi/src/ltdtkeysheads2mat.mjs'
-// import downloadFileFromB64 from 'wsemi/src/downloadFileFromB64.mjs'
-// import downloadExcelFileFromDataDyn from 'wsemi/src/downloadExcelFileFromDataDyn.mjs'
-// import getFileAccept from 'wsemi/src/getFileAccept.mjs'
-// import downloadFileFromU8Arr from 'wsemi/src/downloadFileFromU8Arr.mjs'
+// import cint from 'wsemi/src/cint.mjs'
 
 
-function mDataSupport(vo, opt = {}) {
+function mDataSupport(vo) {
 
 
     return {
 
-        // mdCheckKeyInd,
-        // mdGetTextByKey,
-        // mdGetTextByKeyIndAndKey,
+        // fun,
 
     }
 }

package/src/plugins/mShare.mjs

@@ -1,4 +1,5 @@
 //前後端共用函數區
+import JSON5 from 'json5'
 import get from 'lodash/get'
 import each from 'lodash/each'
 import map from 'lodash/map'
@@ -14,16 +15,20 @@ import haskey from 'wsemi/src/haskey.mjs'
 import composeToTree from 'wsemi/src/composeToTree.mjs'
 
 
+//dlm
+let dlm = '/'
+
+
 function getAllBlocks(targets) {
 
     //rs
     let rs = map(targets, (v) => {
 
         //text, parentId
-        let s = sep(v.id, '.')
+        let s = sep(v.id, dlm) //[tag:dlm]
         let text = get(takeRight(s), 0) //取最後節點
         s = dropRight(s, 1)
-        let parentId = join(s, '.') //取父節點
+        let parentId = join(s, dlm) //[tag:dlm] 取父節點
 
         return {
             ...v,
@@ -32,9 +37,11 @@ function getAllBlocks(targets) {
             text,
         }
     })
+    // console.log('rs', rs)
 
     //sortBy
     rs = sortBy(rs, 'order')
+    // console.log('rs sortBy', rs)
 
     return rs
 }
@@ -44,6 +51,7 @@ function getTreeBlocks(targets) {
 
     //getAllBlocks
     let blocks = getAllBlocks(targets)
+    // console.log('blocks', blocks)
 
     //opt
     let opt = {
@@ -86,7 +94,7 @@ function getUserGroups(user, ruleGroups) {
 
     //add rules
     gs = map(gs, (g) => {
-        let rules = JSON.parse(g.crules)
+        let rules = JSON5.parse(g.crules)
         g.rules = rules
         return g
     })
@@ -107,7 +115,7 @@ function getTargetsByGroup(targets, group) {
     group = cloneDeep(group)
 
     //rules
-    let rules = JSON.parse(group.crules)
+    let rules = JSON5.parse(group.crules)
 
     //rulesDisplay
     let rulesDisplay = {}
@@ -157,11 +165,19 @@ function getTargetsByGroup(targets, group) {
 
 
 function getUserRules(user, ruleGroups, targets) {
+    //依照使用者所允許之ruleGroups轉出對全部targets權限
+
+    //ruleGroupsIds
+    let ruleGroupsIds = get(user, 'ruleGroupsIds', '')
 
     //getUserGroups
     let gs = getUserGroups(user, ruleGroups)
     // console.log('gs', gs)
 
+    //ruleGroupsNames
+    let ruleGroupsNames = map(gs, 'name')
+    ruleGroupsNames = join(ruleGroupsNames, ';')
+
     //getTargetsByGroup
     let rulesDisplay = {}
     each(gs, (g) => {
@@ -196,7 +212,11 @@ function getUserRules(user, ruleGroups, targets) {
     })
     // console.log('rulesDisplay', rulesDisplay)
 
-    return rulesDisplay
+    return {
+        ruleGroupsIds,
+        ruleGroupsNames,
+        rules: rulesDisplay,
+    }
 }
 
 

package/src/schema/tables/ruleGroups.mjs

@@ -11,6 +11,7 @@ let keyTable = 'ruleGroups'
 let tableNameCht = '權限群組'
 let tableNameEng = 'Rule groups'
 
+
 let settings = {
     id: {
         pk: true,
@@ -70,8 +71,6 @@ let funTest = () => {
         ['權限群組1', `{ "___all___": { "show": "y", "active": "n" }, "專案A.頁A": { "show": "y", "active": "y" }, "專案A.頁B": { "show": "n", "active": "n" } }`],
         ['權限群組2', `{ "___all___": { "show": "y", "active": "n" } }`],
         ['權限群組3', `{ "___all___": { "show": "y", "active": "y" } }`],
-        // ['L0權限群組', `{ "___all___": { "show": "n", "active": "n" }, "主題列表": { "show": "y", "active": "n" } }`],
-        // ['L1權限群組', `{ "___all___": { "show": "y", "active": "y" } }`],
     ]
     rs = map(rs, ([g, crules], k) => {
         let v = funNew({ userId: 'id-for-admin', crules })

package/src/schema/tables/targets.mjs

@@ -11,6 +11,7 @@ let keyTable = 'targets'
 let tableNameCht = '管控對象'
 let tableNameEng = 'Targets'
 
+
 let settings = {
     id: {
         pk: true,
@@ -47,37 +48,29 @@ let funNew = (ndata = {}) => {
 let funTest = () => {
     let rs = [
         '專案A',
-        '專案A.頁A',
-        '專案A.頁A.區塊A',
-        '專案A.頁A.區塊A.執行按鈕',
-        '專案A.頁A.區塊A.分析按鈕',
-        '專案A.頁B',
-        '專案A.頁B.區塊A',
-        '專案A.頁B.區塊A.執行按鈕',
-        '專案A.頁B.區塊A.分析按鈕',
-        '專案A.頁B.區塊B',
-        '專案A.頁B.區塊B.展開按鈕',
-        '專案A.頁B.區塊B.下載按鈕',
+        '專案A/頁A',
+        '專案A/頁A/區塊A',
+        '專案A/頁A/區塊A/執行按鈕',
+        '專案A/頁A/區塊A/分析按鈕',
+        '專案A/頁B',
+        '專案A/頁B/區塊A',
+        '專案A/頁B/區塊A/執行按鈕',
+        '專案A/頁B/區塊A/分析按鈕',
+        '專案A/頁B/區塊B',
+        '專案A/頁B/區塊B/展開按鈕',
+        '專案A/頁B/區塊B/下載按鈕',
         '專案B',
-        '專案B.頁A',
-        '專案B.頁A.區塊A',
-        '專案B.頁A.區塊A.下載報表按鈕',
-        '專案B.頁A.區塊A.下載數據按鈕',
-        '專案B.頁B.區塊A',
-        '專案B.頁B.區塊B',
-        '專案B.頁B.區塊B.顯示後台按鈕',
-        '專案B.頁B.區塊B.轉跳主站按鈕',
-        // '主題列表',
-        // '主題列表.隱藏已刪除',
-        // '主題列表.新增主題',
-        // '主題列表.主題排序',
-        // '主題列表.編輯主題',
-        // '主題列表.刪除主題',
-        // '後台管理',
-        // '權限管理',
+        '專案B/頁A',
+        '專案B/頁A/區塊A',
+        '專案B/頁A/區塊A/下載報表按鈕',
+        '專案B/頁A/區塊A/下載數據按鈕',
+        '專案B/頁B/區塊A',
+        '專案B/頁B/區塊B',
+        '專案B/頁B/區塊B/顯示後台按鈕',
+        '專案B/頁B/區塊B/轉跳主站按鈕',
     ]
     rs = map(rs, (key, k) => {
-        let v = funNew({ userId: 'id-for-admin', description: key })
+        let v = funNew({ description: key })
         v.id = `id-for-${key}`
         v = dtpick(v, keys(settings))
         return v

package/src/store/mutations.mjs

@@ -9,7 +9,7 @@ import ds from '../schema/index.mjs'
 let userDef = {
     id: '', //id-for-admin
     name: '', //測試者
-    email: '', //id-for-admin@example.com
+    email: '', //admin@example.com
     // isVirtual: 'n',
     isAdmin: 'n',
     // isActive: 'n',

package/srv.mjs

@@ -30,15 +30,32 @@ let opt = {
 }
 
 let getUserByToken = async (token) => {
-    if (token !== 'sys') { //僅允許localhost給予token=sys瀏覽
-        return {}
+    if (token === '{token-for-application}') { //提供外部應用系統作為存取使用者
+        return {
+            id: 'id-for-application',
+            name: 'application',
+            email: 'admin@example.com',
+            isAdmin: 'y',
+        }
     }
-    return {
-        id: 'id-for-admin',
-        name: '測試者',
-        email: 'admin@example.com',
-        isAdmin: 'y',
+    // if (token === 'token-for-sys-application') { //將主系統視為外部應用系統, 依據指定token作為授權使用者
+    //     return {
+    //         id: 'id-for-application',
+    //         name: 'application',
+    //         email: 'admin@example.com',
+    //         isAdmin: 'y',
+    //     }
+    // }
+    if (token === 'sys') { //開發階段w-ui-loginout自動給予browser使用者(且位於localhost)的token為sys
+        return {
+            id: 'id-for-admin',
+            name: 'tester',
+            email: 'admin@example.com',
+            isAdmin: 'y',
+        }
     }
+    console.log('invalid token', token)
+    return {}
 }
 
 //WWebPerm

package/tableTags-web-perm.json

@@ -1 +1 @@
-{"ruleGroups":"rXJNLB","targets":"4GLDb2","users":"AG7IvW"}
+{"ruleGroups":"lawH1q","targets":"ajtpXf","users":"t4rBhb"}