w-web-sso 1.0.21 → 1.0.23

package/docs/WWebSso.html

@@ -387,7 +387,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Mon Jul 14 2025 15:01:15 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.4</a> on Wed Jul 23 2025 15:26:00 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebSso.mjs.html

@@ -566,13 +566,13 @@ function WWebSso(WOrm, url, db, pathSettings) {
     //         return Promise.reject(`invalid ${key} from inp`)
     //     }
 
-    //     //resave
-    //     inp = {
+    //     //r
+    //     let r = {
     //         from,
     //         [key]: vs,
     //     }
 
-    //     return inp
+    //     return r
     // }
 
 
@@ -621,13 +621,8 @@ function WWebSso(WOrm, url, db, pathSettings) {
     //funCheckAdmin
     let funCheckAdmin = (tk, u) => {
         // console.log('tk', tk, 'u', u)
-        let b1 = s.getIsVerified(u) //須已驗證
-        let b2 = !s.getIsExpired(u) //不能過期
-        let b3 = !s.getIsBlocked(u) //不能封鎖中
-        let b4 = s.getIsAdmin(u) //須為系統管理員
-        let b5 = s.getIsActive(u) //須有效
-        let b = b1 && b2 && b3 && b4 && b5
-        // console.log('fun', 'tk', tk, 'u', u, b)
+        let b = s.checkUserAdmin(u)
+        // console.log('checkUserAdmin', b)
         return b
     }
 
@@ -1177,7 +1172,7 @@ export default WWebSso
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.4</a> on Mon Jul 14 2025 15:01:15 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.4</a> on Wed Jul 23 2025 15:26:00 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.4</a> on Mon Jul 14 2025 15:01:15 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.4</a> on Wed Jul 23 2025 15:26:00 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/g.provideUsers.mjs

@@ -1,38 +1,39 @@
 import map from 'lodash-es/map.js'
 import ds from './src/schema/index.mjs'
-import provideUsers from './server/provideUsers.mjs'
+import provideTabs from './server/provideTabs.mjs'
 
 
 async function provide() {
 
-    let url = `http://localhost:11007/syncAndReplaceUsers?token=sys`
-
-    let from = `pd`
-
-    let rs = [
-        ['pd-viewer', 'pd-普通瀏覽者'],
-        ['pd-basic', 'pd-一般使用者'],
-        ['pd-admin', 'pd-系統管理者'],
-    ]
-    rs = map(rs, ([key, name], k) => {
-        let v = ds.users.funNew({
-            order: 1000 + k,
-            name,
-            email: `${key}@example.com`,
-            userId: 'id-for-admin',
-            from,
-        })
-        v.id = `id-for-${key}`
-        if (key === 'pd-admin') {
-            v.isAdmin = 'y'
-        }
-        return v
-    })
-    console.log('rs', rs)
-
-    let r = await provideUsers(url, from, rs)
-    console.log('r.msg', r.msg)
-
+    // let url = `http://localhost:11007/syncAndReplaceUsers?token=sys`
+
+    // let from = `pd`
+
+    // let rs = [
+    //     ['pd-viewer', 'pd-普通瀏覽者'],
+    //     ['pd-basic', 'pd-一般使用者'],
+    //     ['pd-admin', 'pd-系統管理者'],
+    // ]
+    // rs = map(rs, ([key, name], k) => {
+    //     let v = ds.users.funNew({
+    //         order: 1000 + k,
+    //         name,
+    //         email: `${key}@example.com`,
+    //         userId: 'id-for-admin',
+    //         from,
+    //     })
+    //     v.id = `id-for-${key}`
+    //     if (key === 'pd-admin') {
+    //         v.isAdmin = 'y'
+    //     }
+    //     return v
+    // })
+    // console.log('rs', rs)
+
+    // let r = await provideTabs(url, from, rs)
+    // console.log('r.msg', r.msg)
+
+    return Promise.reject(`incompleted`)
 }
 
 provide()
@@ -41,4 +42,4 @@ provide()
     })
 
 
-//node g.provideUsers.mjs
+//node g.provideTabs.mjs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-sso",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "main": "dist/w-web-sso.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
@@ -12,8 +12,7 @@
     "w-serv-hapi": "^1.0.60",
     "w-serv-orm": "^1.0.29",
     "w-syslog": "^1.0.6",
-    "w-ui-loginout": "^1.0.9",
-    "wsemi": "^1.8.15"
+    "wsemi": "^1.8.16"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^5.0.8",

package/server/WWebSso.mjs

@@ -519,13 +519,13 @@ function WWebSso(WOrm, url, db, pathSettings) {
     //         return Promise.reject(`invalid ${key} from inp`)
     //     }
 
-    //     //resave
-    //     inp = {
+    //     //r
+    //     let r = {
     //         from,
     //         [key]: vs,
     //     }
 
-    //     return inp
+    //     return r
     // }
 
 
@@ -574,13 +574,8 @@ function WWebSso(WOrm, url, db, pathSettings) {
     //funCheckAdmin
     let funCheckAdmin = (tk, u) => {
         // console.log('tk', tk, 'u', u)
-        let b1 = s.getIsVerified(u) //須已驗證
-        let b2 = !s.getIsExpired(u) //不能過期
-        let b3 = !s.getIsBlocked(u) //不能封鎖中
-        let b4 = s.getIsAdmin(u) //須為系統管理員
-        let b5 = s.getIsActive(u) //須有效
-        let b = b1 && b2 && b3 && b4 && b5
-        // console.log('fun', 'tk', tk, 'u', u, b)
+        let b = s.checkUserAdmin(u)
+        // console.log('checkUserAdmin', b)
         return b
     }
 

package/server/provideTabs.mjs

@@ -0,0 +1,71 @@
+import axios from 'axios'
+import ltdtpick from 'wsemi/src/ltdtpick.mjs'
+import genPm from 'wsemi/src/genPm.mjs'
+
+
+async function provideTabs(url, keyTable, group, rows) {
+    //url: 伺服器提供的接入網址, 例如 http://localhost:11007/syncAndReplaceTabs?token={token}&keyTable={keyTable}
+    //keyTable: 資料表名
+    //from: 指陣列數據來源
+    //rows: 陣列數據
+
+    //pm
+    let pm = genPm()
+
+    // //ks
+    // let ks = [
+    //     'id',
+    //     'order',
+    //     'name',
+    //     'email',
+    //     'description',
+    //     'from',
+    //     'isAdmin',
+    //     'userId',
+    //     'timeCreate',
+    //     'userIdUpdate',
+    //     'timeUpdate',
+    //     'isActive',
+    // ]
+
+    // //ltdtpick
+    // users = ltdtpick(users, ks)
+
+    // //rin
+    // let rin = {
+    //     from,
+    //     users,
+    // }
+    // // 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: '成功傳輸Users清單',
+    //             res,
+    //         }
+    //         pm.resolve(r)
+    //     })
+    //     .catch((err) => {
+    //         // console.log(err)
+    //         let r = {
+    //             msg: '無法傳輸Users清單',
+    //             res: err,
+    //         }
+    //         pm.reject(r)
+    //     })
+
+    pm.reject(`incompleted`)
+
+    return pm
+}
+
+
+export default provideTabs

package/server/staLogs/staIp.callWorker.mjs

@@ -1,6 +1,7 @@
 import { Worker } from 'worker_threads'
 import genPm from 'wsemi/src/genPm.mjs'
 
+
 async function staIp(timeLength = 7, timeInterval = 'hr', opt = {}) {
     let pm = genPm()
 

package/server/staLogs/staIp.mjs

@@ -7,10 +7,11 @@ import mapValues from 'lodash-es/mapValues.js'
 import merge from 'lodash-es/merge.js'
 import genPm from 'wsemi/src/genPm.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
-import randomIntRange from 'wsemi/src/randomIntRange.mjs'
+// import randomIntRange from 'wsemi/src/randomIntRange.mjs'
 import fsTreeFolder from 'wsemi/src/fsTreeFolder.mjs'
 import fsBuildReadStreamText from 'wsemi/src/fsBuildReadStreamText.mjs'
 
+
 async function staIp(timeLength = 7, timeInterval = 'hr', opt = {}) {
 
     //fdLog

package/server/staLogs/staIp.shellWorker.mjs

@@ -1,6 +1,7 @@
 import { parentPort } from 'worker_threads'
 import staIp from './staIp.mjs'
 
+
 parentPort.on('message', async (param) => {
     try {
         let r = await staIp(param.timeLength, param.timeInterval, param.opt)

package/server/staLogs/staToken.callWorker.mjs

@@ -1,6 +1,7 @@
 import { Worker } from 'worker_threads'
 import genPm from 'wsemi/src/genPm.mjs'
 
+
 async function staToken(timeLength = 7, timeInterval = 'hr', opt = {}) {
     let pm = genPm()
 

package/server/staLogs/staToken.mjs

@@ -7,10 +7,11 @@ import mapValues from 'lodash-es/mapValues.js'
 import merge from 'lodash-es/merge.js'
 import genPm from 'wsemi/src/genPm.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
-import randomIntRange from 'wsemi/src/randomIntRange.mjs'
+// import randomIntRange from 'wsemi/src/randomIntRange.mjs'
 import fsTreeFolder from 'wsemi/src/fsTreeFolder.mjs'
 import fsBuildReadStreamText from 'wsemi/src/fsBuildReadStreamText.mjs'
 
+
 async function staToken(timeLength = 7, timeInterval = 'hr', opt = {}) {
 
     //fdLog

package/server/staLogs/staToken.shellWorker.mjs

@@ -1,6 +1,7 @@
 import { parentPort } from 'worker_threads'
 import staToken from './staToken.mjs'
 
+
 parentPort.on('message', async (param) => {
     try {
         let r = await staToken(param.timeLength, param.timeInterval, param.opt)

package/server/staLogs/staUserAccountLogin.callWorker.mjs

@@ -1,6 +1,7 @@
 import { Worker } from 'worker_threads'
 import genPm from 'wsemi/src/genPm.mjs'
 
+
 async function staUserAccountLogin(timeLength = 7, timeInterval = 'hr', opt = {}) {
     let pm = genPm()
 

package/server/staLogs/staUserAccountLogin.shellWorker.mjs

@@ -1,6 +1,7 @@
 import { parentPort } from 'worker_threads'
 import staUserAccountLogin from './staUserAccountLogin.mjs'
 
+
 parentPort.on('message', async (param) => {
     try {
         let r = await staUserAccountLogin(param.timeLength, param.timeInterval, param.opt)

package/src/App.vue

@@ -35,7 +35,6 @@ import isestr from 'wsemi/src/isestr.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isDev from 'wsemi/src/isDev.mjs'
 import waitFun from 'wsemi/src/waitFun.mjs'
-import wui from 'w-ui-loginout/src/WUiLoginout.mjs'
 import LoadingWinBar from './components/Common/LoadingWinBar.vue'
 import CheckYesNo from './components/Common/CheckYesNo.vue'
 import CheckYes from './components/Common/CheckYes.vue'

package/src/getUserByToken.mjs

@@ -0,0 +1,98 @@
+import axios from 'axios'
+import get from 'lodash-es/get.js'
+import isestr from 'wsemi/src/isestr.mjs'
+import iseobj from 'wsemi/src/iseobj.mjs'
+import isfun from 'wsemi/src/isfun.mjs'
+import ispm from 'wsemi/src/ispm.mjs'
+
+
+async function getUserByToken(url, tokenSelf, tokenTar, opt = {}) {
+    //url: http://localhost:11007/api/getSsoUserInfor
+    let errTemp = null
+
+    //check
+    if (!isestr(url)) {
+        return Promise.reject('invalid url')
+    }
+    if (!isestr(tokenSelf)) {
+        return Promise.reject('invalid tokenSelf')
+    }
+    if (!isestr(tokenTar)) {
+        return Promise.reject('invalid tokenTar')
+    }
+
+    //funConvertUser
+    let funConvertUser = get(opt, 'funConvertUser')
+
+    //url
+    url = `${url}?token={sysToken}&key=token&value={token}`
+    url = url.replaceAll('{sysToken}', tokenSelf) //系統介接用ssoToken
+    url = url.replaceAll('{token}', tokenTar)
+    // console.log('getUserByToken: url', url)
+
+    //get
+    let res = await axios.get(url)
+        .catch((err) => {
+            errTemp = err.toString()
+        })
+
+    //check
+    if (errTemp !== null) {
+        console.log('res', res)
+        console.log('errTemp', errTemp)
+        console.log(`can not get user by url[${url}]`)
+        return Promise.reject(`can not get user by url[${url}]`) //由SSO取得使用者資訊錯誤
+    }
+
+    //data
+    let data = get(res, 'data')
+
+    //state
+    let state = get(data, 'state', '')
+
+    //msg
+    let msg = get(data, 'msg')
+
+    //check
+    if (state !== 'success') {
+        console.log('res', res)
+        console.log('data', data)
+        console.log('state', state)
+        console.log('errTemp', msg)
+        console.log(`can not get user data by url[${url}]`)
+        return Promise.reject(`can not get user data by url[${url}]`) //取得使用者資訊失敗
+    }
+
+    //u
+    let u = msg
+    // console.log('getUserByToken u(msg)', u)
+
+    //check
+    if (!iseobj(u)) {
+        console.log(`no user data by url[${url}]`)
+        return Promise.reject(`no user data by url[${url}]`)
+    }
+
+    //check
+    if (isfun(funConvertUser)) {
+
+        //funConvertUser
+        u = funConvertUser(u)
+        if (ispm(u)) {
+            u = await u
+        }
+        // console.log('getUserByToken u(funConvertUser)', u)
+
+        //check
+        if (!iseobj(u)) {
+            console.log(`no user data after funConvertUser`)
+            return Promise.reject(`no user data after funConvertUser`)
+        }
+
+    }
+
+    return u
+}
+
+
+export default getUserByToken

package/src/getUsersByToken.mjs

@@ -0,0 +1,99 @@
+import axios from 'axios'
+import get from 'lodash-es/get.js'
+import size from 'lodash-es/size.js'
+import isestr from 'wsemi/src/isestr.mjs'
+import iseobj from 'wsemi/src/iseobj.mjs'
+import isfun from 'wsemi/src/isfun.mjs'
+import ispm from 'wsemi/src/ispm.mjs'
+import pmSeries from 'wsemi/src/pmSeries.mjs'
+
+
+async function getUsersByToken(url, tokenSelf, opt = {}) {
+    //url: http://localhost:11007/api/getSsoUsersList
+    let errTemp = null
+
+    //check
+    if (!isestr(url)) {
+        return Promise.reject('invalid url')
+    }
+    if (!isestr(tokenSelf)) {
+        return Promise.reject('invalid tokenSelf')
+    }
+
+    //funConvertUser
+    let funConvertUser = get(opt, 'funConvertUser')
+
+    //url
+    url = `${url}?token={sysToken}`
+    url = url.replaceAll('{sysToken}', tokenSelf) //系統介接用ssoToken
+    // console.log('getUsersByToken: url', url)
+
+    //get
+    let res = await axios.get(url)
+        .catch((err) => {
+            errTemp = err.toString()
+        })
+
+    //check
+    if (errTemp !== null) {
+        console.log('res', res)
+        console.log('errTemp', errTemp)
+        console.log(`can not get users by url[${url}]`)
+        return Promise.reject(`can not get users by url[${url}]`) //由SSO取得使用者清單資訊錯誤
+    }
+
+    //data
+    let data = get(res, 'data')
+
+    //state
+    let state = get(data, 'state', '')
+
+    //msg
+    let msg = get(data, 'msg')
+
+    //check
+    if (state !== 'success') {
+        console.log('res', res)
+        console.log('data', data)
+        console.log('state', state)
+        console.log('errTemp', msg)
+        console.log(`can not get users data by url[${url}]`)
+        return Promise.reject(`can not get users data by url[${url}]`) //取得使用者清單資訊失敗
+    }
+
+    //us
+    let us = msg
+    // console.log('getUsersByToken us(msg)', us)
+
+    //check
+    if (size(us) === 0) {
+        console.log(`no users data by url[${url}]`)
+        return Promise.reject(`no users data by url[${url}]`)
+    }
+
+    //check
+    if (isfun(funConvertUser)) {
+        us = await pmSeries(us, async(u) => {
+
+            //funConvertUser
+            u = funConvertUser(u)
+            if (ispm(u)) {
+                u = await u
+            }
+
+            //check
+            if (!iseobj(u)) {
+                console.log(`no user data after funConvertUser`)
+                return Promise.reject(`no user data after funConvertUser`)
+            }
+
+            return u
+        })
+        // console.log('getUsersByToken us(funConvertUser)', us)
+    }
+
+    return us
+}
+
+
+export default getUsersByToken

package/src/plugins/mShare.mjs

@@ -13,12 +13,6 @@ import sep from 'wsemi/src/sep.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import istimemsTZ from 'wsemi/src/istimemsTZ.mjs'
-import haskey from 'wsemi/src/haskey.mjs'
-import composeToTree from 'wsemi/src/composeToTree.mjs'
-
-
-// //dlm
-// let dlm = '/'
 
 
 function getNameNew(rows, key = 'name', nameBase = '', nameExt = '') {
@@ -339,6 +333,29 @@ function getIsActive(v) {
 }
 
 
+function checkUserBasic(u) {
+    //須保留, 供內外部調用
+    let b1 = getIsVerified(u) //須已驗證
+    let b2 = !getIsExpired(u) //不能過期
+    let b3 = !getIsBlocked(u) //不能封鎖中
+    let b4 = getIsActive(u) //須有效
+    let b = b1 && b2 && b3 && b4
+    return b
+}
+
+
+function checkUserAdmin(u) {
+    //須保留, 供內外部調用
+    let b1 = getIsVerified(u) //須已驗證
+    let b2 = !getIsExpired(u) //不能過期
+    let b3 = !getIsBlocked(u) //不能封鎖中
+    let b4 = getIsAdmin(u) //須為系統管理員
+    let b5 = getIsActive(u) //須有效
+    let b = b1 && b2 && b3 && b4 && b5
+    return b
+}
+
+
 export {
     getNameNew,
     // getAllBlocks,
@@ -351,5 +368,7 @@ export {
     getIsBlocked,
     getIsEnded,
     getIsAdmin,
-    getIsActive
+    getIsActive,
+    checkUserBasic,
+    checkUserAdmin
 }