w-web-perm 1.0.0 → 1.0.2

package/src/plugins/mShare.mjs

@@ -1,169 +1,22 @@
 //前後端共用函數區
-// 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 JSON5 from 'json5'
 import get from 'lodash/get'
 import each from 'lodash/each'
 import map from 'lodash/map'
 import find from 'lodash/find'
-import filter from 'lodash/filter'
-// import last from 'lodash/last'
-// import size from 'lodash/size'
-import split from 'lodash/split'
 import join from 'lodash/join'
 import cloneDeep from 'lodash/cloneDeep'
 import takeRight from 'lodash/takeRight'
 import dropRight from 'lodash/dropRight'
 import sortBy from 'lodash/sortBy'
 import sep from 'wsemi/src/sep.mjs'
-import isarr from 'wsemi/src/isarr.mjs'
-import isstr from 'wsemi/src/isstr.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import composeToTree from 'wsemi/src/composeToTree.mjs'
-// import getFileAccept from 'wsemi/src/getFileAccept.mjs'
 
 
-// function atSep(attachmentsIds) {
-
-//     //ts
-//     let ts = sep(attachmentsIds, ';')
-
-//     return ts
-// }
-
-
-// function atJoin(ts) {
-
-//     //uniq
-//     ts = uniq(ts)
-
-//     //str
-//     let str = join(ts, ';')
-
-//     return str
-// }
-
-
-// function atParse(attachmentsIds) {
-
-//     //ts
-//     let ts = atSep(attachmentsIds)
-
-//     //ids
-//     let ids = map(ts, (v) => {
-//         let s = sep(v, '@')
-//         let table = get(s, 0, '')
-//         let id = get(s, 1, '')
-//         if (table === '') {
-//             console.log('atParse: invalid table in attachmentsIds', attachmentsIds)
-//         }
-//         if (id === '') {
-//             console.log('atParse: invalid id in attachmentsIds', attachmentsIds)
-//         }
-//         return {
-//             table,
-//             id,
-//         }
-//     })
-
-//     return ids
-// }
-
-
-// function atRemove(inp, removeId, opt = {}) {
-
-//     //removeId
-//     if (!isstr(removeId)) {
-//         removeId = ''
-//     }
-//     if (removeId.indexOf('@') >= 0) {
-//         removeId = split(removeId, '@')[1] //取後面id
-//     }
-
-//     //ids
-//     let ids = []
-//     let returnTypeTemp = ''
-//     if (isarr(inp)) {
-//         ids = inp
-//         returnTypeTemp = 'array'
-//     }
-//     else if (isstr(inp)) {
-//         ids = atParse(inp)
-//         returnTypeTemp = 'string'
-//     }
-
-//     //returnType
-//     let returnType = get(opt, 'returnType', null)
-//     if (returnType !== 'array' && returnType !== 'string') {
-//         returnType = returnTypeTemp
-//     }
-
-
-//     //filter
-//     ids = filter(ids, (v) => {
-//         return v.id !== removeId
-//     })
-
-//     if (returnType === 'array') {
-//         return ids
-//     }
-//     return atMerge(ids)
-// }
-
-
-// function atMerge(ids) {
-
-//     //ts
-//     let ts = map(ids, (v) => {
-//         let table = get(v, 'table', '')
-//         let id = get(v, 'id', '')
-//         if (table === '') {
-//             console.log('atMerge: invalid table in ids', ids)
-//         }
-//         if (id === '') {
-//             console.log('atMerge: invalid id in ids', ids)
-//         }
-//         return `${table}@${id}`
-//     })
-
-//     return atJoin(ts)
-// }
-
-
-// function isNumOrEng(str) {
-//     let regExp = /^[\d|a-zA-Z]+$/
-//     if (regExp.test(str)) {
-//         return true
-//     }
-//     else {
-//         return false
-//     }
-// }
-
-
-// function extractFileType(fileName, fileType) {
-//     let r = ''
-
-//     //find
-//     let ar = getFileAccept()
-//     for (let i = 0; i < ar.length; i++) {
-//         if (ar[i].acp === fileType) {
-//             return ar[i].name
-//         }
-//     }
-
-//     //from name ext
-//     let s = split(fileName, '.')
-//     if (size(s) > 1) {
-//         return last(s)
-//     }
-
-//     return r
-// }
+//dlm
+let dlm = '/'
 
 
 function getAllBlocks(targets) {
@@ -172,10 +25,10 @@ function getAllBlocks(targets) {
     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,
@@ -184,9 +37,11 @@ function getAllBlocks(targets) {
             text,
         }
     })
+    // console.log('rs', rs)
 
     //sortBy
     rs = sortBy(rs, 'order')
+    // console.log('rs sortBy', rs)
 
     return rs
 }
@@ -196,6 +51,7 @@ function getTreeBlocks(targets) {
 
     //getAllBlocks
     let blocks = getAllBlocks(targets)
+    // console.log('blocks', blocks)
 
     //opt
     let opt = {
@@ -238,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
     })
@@ -259,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 = {}
@@ -309,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) => {
@@ -348,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,
@@ -61,7 +62,7 @@ let funNew = (ndata = {}) => {
     o.userIdUpdate = o.userId
     o.timeCreate = nowms2str()
     o.timeUpdate = o.timeCreate
-    o.isActive = 'y'
+    // o.isActive = 'y'
     return o
 }
 
@@ -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

@@ -3,7 +3,7 @@ import keys from 'lodash/keys'
 import genID from 'wsemi/src/genID.mjs'
 import dtmapping from 'wsemi/src/dtmapping.mjs'
 import dtpick from 'wsemi/src/dtpick.mjs'
-import nowms2str from 'wsemi/src/nowms2str.mjs'
+// import nowms2str from 'wsemi/src/nowms2str.mjs'
 import now2strp from 'wsemi/src/now2strp.mjs'
 
 
@@ -11,6 +11,7 @@ let keyTable = 'targets'
 let tableNameCht = '管控對象'
 let tableNameEng = 'Targets'
 
+
 let settings = {
     id: {
         pk: true,
@@ -38,46 +39,38 @@ let settings = {
 let funNew = (ndata = {}) => {
     let o = dtmapping(ndata, keys(settings))
     o.id = `${now2strp()}-${genID()}`
-    o.timeCreate = nowms2str()
-    o.timeUpdate = o.timeCreate
-    o.isActive = 'y'
+    // o.timeCreate = nowms2str()
+    // o.timeUpdate = o.timeCreate
+    // o.isActive = 'y'
     return o
 }
 
 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/schema/tables/users.mjs

@@ -104,7 +104,7 @@ let funTest = () => {
     rs[3].from = 'teamB'
     rs[4].from = 'teamB'
     rs[4].isActive = 'n'
-    rs[5].ruleGroupsIds = `id-for-L1權限群組`
+    rs[5].ruleGroupsIds = `id-for-權限群組1`
     rs[5].description = '測試系統管理員描述說明'
     rs[5].isAdmin = 'y' //admin
     console.log(`已產生: ${keyTable} 測試資料`, rs)

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',
+    //     }
+    // }
+    if (token === 'token-for-sys-application') { //將主系統視為外部應用系統, 依據指定token作為授權使用者
+        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 === '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":"t5bra2","targets":"OxwFDJ","users":"t7oXtY"}
+{"ruleGroups":"lawH1q","targets":"ajtpXf","users":"t4rBhb"}