w-web-sso 1.0.23 → 1.0.25

package/dist/w-web-sso.umd.js

@@ -1,5 +1,5 @@
 /*!
- * w-web-sso v1.0.23
+ * w-web-sso v1.0.25
  * (c) 2018-2021 yuda-lyu(semisphere)
  * Released under the MIT License.
  */

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 Wed Jul 23 2025 15:26:00 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 16:44:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebSso.mjs.html

@@ -1172,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 Wed Jul 23 2025 15:26:00 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 16:44:43 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 Wed Jul 23 2025 15:26:00 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 16:44:43 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-web-sso",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "main": "dist/w-web-sso.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",

package/src/getUserByToken.mjs

@@ -7,7 +7,7 @@ import ispm from 'wsemi/src/ispm.mjs'
 
 
 async function getUserByToken(url, tokenSelf, tokenTar, opt = {}) {
-    //url: http://localhost:11007/api/getSsoUserInfor
+    //url: http://localhost:11007/api/getSsoUserInfor?token={sysToken}&key=token&value={token}
     let errTemp = null
 
     //check
@@ -25,7 +25,9 @@ async function getUserByToken(url, tokenSelf, tokenTar, opt = {}) {
     let funConvertUser = get(opt, 'funConvertUser')
 
     //url
-    url = `${url}?token={sysToken}&key=token&value={token}`
+    if (url.indexOf('token={sysToken}') < 0 && url.indexOf('key=token') < 0 && url.indexOf('value={token}') < 0) {
+        return Promise.reject(`no 'token={sysToken}', 'key=token', 'value={token}' in url`)
+    }
     url = url.replaceAll('{sysToken}', tokenSelf) //系統介接用ssoToken
     url = url.replaceAll('{token}', tokenTar)
     // console.log('getUserByToken: url', url)

package/src/getUserByUserId.mjs

@@ -0,0 +1,100 @@
+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 getUserByUserId(url, tokenSelf, userIdTar, opt = {}) {
+    //url: http://localhost:11007/api/getSsoUserInfor?token={sysToken}&key=userId&value={userId}
+    let errTemp = null
+
+    //check
+    if (!isestr(url)) {
+        return Promise.reject('invalid url')
+    }
+    if (!isestr(tokenSelf)) {
+        return Promise.reject('invalid tokenSelf')
+    }
+    if (!isestr(userIdTar)) {
+        return Promise.reject('invalid userIdTar')
+    }
+
+    //funConvertUser
+    let funConvertUser = get(opt, 'funConvertUser')
+
+    //url
+    if (url.indexOf('token={sysToken}') < 0 && url.indexOf('key=userId') < 0 && url.indexOf('value={userId}') < 0) {
+        return Promise.reject(`no 'token={sysToken}', 'key=userId', 'value={userId}' in url`)
+    }
+    url = url.replaceAll('{sysToken}', tokenSelf) //系統介接用ssoToken
+    url = url.replaceAll('{userId}', userIdTar)
+    // console.log('getUserByUserId: 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('getUserByUserId 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('getUserByUserId 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 getUserByUserId

package/src/getUsersByToken.mjs

@@ -9,7 +9,7 @@ import pmSeries from 'wsemi/src/pmSeries.mjs'
 
 
 async function getUsersByToken(url, tokenSelf, opt = {}) {
-    //url: http://localhost:11007/api/getSsoUsersList
+    //url: http://localhost:11007/api/getSsoUsersList?token={sysToken}
     let errTemp = null
 
     //check
@@ -24,7 +24,9 @@ async function getUsersByToken(url, tokenSelf, opt = {}) {
     let funConvertUser = get(opt, 'funConvertUser')
 
     //url
-    url = `${url}?token={sysToken}`
+    if (url.indexOf('token={sysToken}') < 0) {
+        return Promise.reject(`no 'token={sysToken}' in url`)
+    }
     url = url.replaceAll('{sysToken}', tokenSelf) //系統介接用ssoToken
     // console.log('getUsersByToken: url', url)