w-web-perm 1.0.2 → 1.0.4

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 Sun Jul 30 2023 21:50:08 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 Mon Oct 02 2023 22:10:57 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -170,6 +170,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
     if (mappingBy !== 'id' && mappingBy !== 'email' && mappingBy !== 'name') {
         mappingBy = 'email'
     }
+    // console.log('mappingBy', mappingBy)
 
 
     //WServOrm
@@ -288,6 +289,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         userFind = get(userFind, 0, null)
         // console.log('userFind', userFind)
 
+        //check
+        if (!iseobj(userFind)) {
+            console.log('invalid userFind')
+            return null
+        }
+
         //複寫isAdmin
         let isAdminSrc = get(userSelf, 'isAdmin', '')
         let isAdminSelf = get(userFind, 'isAdmin', '')
@@ -595,7 +602,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    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.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Oct 02 2023 22:10:57 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 Sun Jul 30 2023 21:50:08 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 Mon Oct 02 2023 22:10:57 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.mInitialData.mjs

@@ -0,0 +1,147 @@
+import map from 'lodash/map'
+import ds from './src/schema/index.mjs'
+import { woItems } from './g.mOrm.mjs'
+
+
+async function initialData() {
+    let rs
+
+
+    //人工建置數據時得要嚴格建立各階分層, 否則會無法查找到自動建立之parentId
+    rs = [
+        '主要資訊',
+        '主要資訊/主選單區',
+        '主要資訊/內容區',
+        '主要資訊/內容區/待處理任務區',
+        '計畫資料管理系統',
+        '計畫資料管理系統/主選單區',
+        '計畫資料管理系統/內容區',
+        '計畫資料管理系統/內容區/另存按鈕',
+        '計畫資料管理系統/內容區/刪除按鈕',
+        '計畫資料管理系統/內容區/查詢',
+        // '計畫資料管理系統/內容區/查詢/關鍵字功能',
+        '計畫資料管理系統/內容區/查詢/分類功能',
+        '計畫資料管理系統/內容區/查詢/計畫功能',
+        '計畫資料管理系統/內容區/查詢/欄位功能',
+        '輔助參考文獻系統',
+        '輔助參考文獻系統/主選單區',
+        '需求管理系統',
+        '需求管理系統/主選單區',
+        '需求管理系統/內容區',
+        '需求管理系統/內容區/編輯按鈕',
+        '知識管理系統',
+        '知識管理系統/主選單區',
+        '知識管理系統/內容區',
+        '知識管理系統/內容區/編輯按鈕',
+        'GIS(2D)',
+        'GIS(2D)/主選單區',
+        '模板下載',
+        '模板下載/主選單區',
+        '批次上傳系統',
+        '批次上傳系統/主選單區',
+        'API管理系統',
+        'API管理系統/主選單區',
+        '後台管理系統',
+        '後台管理系統/主選單區',
+    ]
+    rs = map(rs, (key, k) => {
+        let v = ds.targets.funNew({
+            description: key,
+        })
+        v.id = key
+        return v
+    })
+    await woItems.targets.delAll()
+    await woItems.targets.insert(rs)
+
+
+    rs = [
+        ['L0權限群組', '普通瀏覽者用之權限群組',
+            `{ "___all___": { "show": "n", "active": "n" }, 
+            "主要資訊": { "show": "y", "active": "y" }, 
+            "主要資訊/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/內容區": { "show": "y", "active": "y" }, 
+            "需求管理系統": { "show": "y", "active": "y" }, 
+            "需求管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "知識管理系統": { "show": "y", "active": "y" }, 
+            "知識管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "GIS": { "show": "y", "active": "y" }, 
+            "GIS/主選單區": { "show": "y", "active": "y" }, 
+            "模板下載": { "show": "y", "active": "y" }, 
+            "模板下載/主選單區": { "show": "y", "active": "y" }, 
+        }`],
+        ['L1權限群組', '一般使用者用之權限群組',
+            `{ "___all___": { "show": "n", "active": "n" }, 
+            "主要資訊": { "show": "y", "active": "y" }, 
+            "主要資訊/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/內容區": { "show": "y", "active": "y" }, 
+            "計畫資料管理系統/內容區/編輯按鈕": { "show": "y", "active": "n" }, 
+            "輔助參考文獻系統": { "show": "y", "active": "y" }, 
+            "輔助參考文獻系統/主選單區": { "show": "y", "active": "y" }, 
+            "需求管理系統": { "show": "y", "active": "y" }, 
+            "需求管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "需求管理系統/內容區": { "show": "y", "active": "y" },
+            "需求管理系統/內容區/編輯按鈕": { "show": "y", "active": "n" },
+            "知識管理系統": { "show": "y", "active": "y" }, 
+            "知識管理系統/主選單區": { "show": "y", "active": "y" }, 
+            "知識管理系統/內容區": { "show": "y", "active": "y" },
+            "知識管理系統/內容區/編輯按鈕": { "show": "y", "active": "n" },
+            "GIS": { "show": "y", "active": "y" }, 
+            "GIS/主選單區": { "show": "y", "active": "y" }, 
+            "模板下載": { "show": "y", "active": "y" }, 
+            "模板下載/主選單區": { "show": "y", "active": "y" }, 
+        }`],
+        ['L2權限群組', '系統管理者用之權限群組',
+            `{ "___all___": { "show": "y", "active": "y" } }`],
+    ]
+    rs = map(rs, ([name, description, crules], k) => {
+        let v = ds.ruleGroups.funNew({
+            userId: 'id-for-admin',
+            name,
+            description,
+            crules,
+        })
+        v.id = `id-for-${name}`
+        v.order = k
+        return v
+    })
+    await woItems.ruleGroups.delAll()
+    await woItems.ruleGroups.insert(rs)
+
+
+    rs = [
+        ['viewer', '普通瀏覽者', 'id-for-L0權限群組'],
+        ['basic', '一般使用者', 'id-for-L1權限群組'],
+        ['admin', '系統管理者', 'id-for-L2權限群組'],
+    ]
+    rs = map(rs, ([key, name, ruleGroupsIds], k) => {
+        let v = ds.users.funNew({
+            userId: 'id-for-admin',
+            name,
+            email: `${key}@example.com`,
+            ruleGroupsIds,
+        })
+        v.id = `id-for-${key}`
+        if (key === 'admin') {
+            v.isAdmin = 'y'
+        }
+        return v
+    })
+    await woItems.users.delAll()
+    await woItems.users.insert(rs)
+
+
+}
+
+initialData()
+    .catch((err) => {
+        console.log('initialData catch', err)
+    })
+
+
+//重建資料庫
+//node --experimental-modules --es-module-specifier-resolution=node g.mInitialData.mjs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-perm",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.2.96",
@@ -8,12 +8,12 @@
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "showdown": "^2.1.0",
-    "w-component-vue": "^2.3.18",
+    "w-component-vue": "^2.3.37",
     "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.19"
+    "wsemi": "^1.7.38"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",
@@ -35,7 +35,7 @@
     "vuetify-loader": "^1.9.2",
     "vuex": "^3.6.2",
     "w-orm-mongodb": "^1.1.29",
-    "w-package-tools": "^1.0.69"
+    "w-package-tools": "^1.0.70"
   },
   "scripts": {
     "serve": "vue-cli-service serve",

package/server/WWebPerm.mjs

@@ -123,6 +123,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
     if (mappingBy !== 'id' && mappingBy !== 'email' && mappingBy !== 'name') {
         mappingBy = 'email'
     }
+    // console.log('mappingBy', mappingBy)
 
 
     //WServOrm
@@ -241,6 +242,12 @@ function WWebPerm(WOrm, url, db, getUserByToken, opt = {}) {
         userFind = get(userFind, 0, null)
         // console.log('userFind', userFind)
 
+        //check
+        if (!iseobj(userFind)) {
+            console.log('invalid userFind')
+            return null
+        }
+
         //複寫isAdmin
         let isAdminSrc = get(userSelf, 'isAdmin', '')
         let isAdminSelf = get(userFind, 'isAdmin', '')

package/src/main.js

@@ -1,9 +1,5 @@
-import get from 'lodash/get'
-// import '@babel/polyfill' //需提供Vuetify的Symbol等API
-// import 'core-js/stable' //需提供Vuetify的Symbol等API, 官網說使用transpileDependencies但不夠, 改用之前提到的@babel/polyfill會被提示已廢棄, 改使用給webpack的polyfill方式才行
-// import 'regenerator-runtime/runtime'
-// import 'intersection-observer' //需供Vuetify的Intersection Observer, 專案內有使用v-intersect才需引入, 而w-component-vue沒用v-intersect
 import Vue from 'vue'
+import get from 'lodash/get'
 import WServHapiClient from 'w-serv-hapi/src/WServHapiClient.mjs'
 import WAlert from 'w-component-vue/src/components/WAlert.mjs'
 import domMutation from 'w-component-vue/src/js/domMutation.mjs'
@@ -14,10 +10,9 @@ import store from './store/index.mjs'
 import mVuetify from './plugins/mVuetify.mjs'
 import ui from './plugins/mUI.mjs'
 import mDataSelectorSchema from './plugins/mDataSelectorSchema.mjs'
-import mDataSupport from './plugins/mDataSupport.mjs'
+// import mDataSupport from './plugins/mDataSupport.mjs'
 import * as s from './plugins/mShare.mjs'
 import ds from './schema/index.mjs'
-// console.log('globalState', globalState)
 // console.log('ds', ds)
 
 
@@ -36,15 +31,15 @@ Vue.prototype.$alert = function() {
 //dssm
 let dssm = mDataSelectorSchema(ds)
 
-//dspt
-let dspt = mDataSupport(Vue.prototype)
+// //dspt
+// let dspt = mDataSupport(Vue.prototype)
 
 //prototype
 Vue.prototype.$ui = ui
 Vue.prototype.$t = ui.getKpText
 Vue.prototype.$s = s
 Vue.prototype.$dssm = dssm
-Vue.prototype.$dspt = dspt
+// Vue.prototype.$dspt = dspt
 // Vue.prototype.$ds = ds
 Vue.prototype.$dg = {}
 

package/src/perm.mjs

@@ -8,6 +8,7 @@ import pmInvResolve from 'wsemi/src/pmInvResolve.mjs'
 
 
 function perm() {
+    //供外部系統引用並進行取得權限之操作
 
     //pmd
     let pmd = null
@@ -26,12 +27,6 @@ function perm() {
             throw new Error(`url does not include 'userId='`)
         }
 
-        //thenExtractData
-        let thenExtractData = get(opt, 'thenExtractData')
-        if (!isbol(thenExtractData)) {
-            thenExtractData = false //通過axios取數據時須給予true
-        }
-
         //useAsync
         let useAsync = get(opt, 'useAsync')
         if (!isbol(useAsync)) {
@@ -52,7 +47,7 @@ function perm() {
 
         //get
         let pms = axios.get(url)
-        pms = pmInvResolve(pms, { thenExtractData })
+        pms = pmInvResolve(pms, { thenExtractData: true })
         pms
             .then((res) => {
                 // console.log('perm.getPerm then', res)

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/srv.mjs

@@ -30,15 +30,7 @@ let opt = {
 }
 
 let getUserByToken = async (token) => {
-    // 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作為授權使用者
+    if (token === '{token-for-application}') { //提供外部應用系統作為存取使用者
         return {
             id: 'id-for-application',
             name: 'application',
@@ -46,6 +38,14 @@ let getUserByToken = async (token) => {
             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',
@@ -54,7 +54,7 @@ let getUserByToken = async (token) => {
             isAdmin: 'y',
         }
     }
-    console.log('invalid token', token)
+    console.log('生產時得加入SSO等驗證token機制, invalid token', token)
     return {}
 }