w-web-api 1.0.40 → 1.0.42

package/docs/WWebApi.html

@@ -885,7 +885,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Jul 14 2025 18:00:09 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 Jul 14 2025 20:34:11 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebApi.mjs.html

@@ -363,49 +363,65 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
     }
 
 
-    //getAndVerifyBrowserTokenUser
-    let getAndVerifyBrowserTokenUser = async (token, from = '') => {
+    //getAndVerifyClientUser
+    let getAndVerifyClientUser = async (token, from = '') => {
+        //基於token查找client使用者, 會基於外部getUserByToken以及perm內部users進行查找並比對
 
         //getTokenUser
-        let userSelf = await getTokenUser(token)
+        let user = await getTokenUser(token)
 
         //verifyClientUser
-        let b = verifyClientUser(userSelf, from)
+        let b = verifyClientUser(user, from)
         if (ispm(b)) {
             b = await b
         }
 
         //check
         if (!b) {
-            console.log('userSelf', userSelf)
+            console.log('user', user)
             console.log(`user does not have permission`)
             return Promise.reject(`user does not have permission`)
         }
 
-        return userSelf
+        return user
     }
 
 
-    //getAndVerifyAppTokenUser
-    let getAndVerifyAppTokenUser = async (token, from = '') => {
+    //getAndVerifyAppUser
+    let getAndVerifyAppUser = async (token, from = '') => {
+        //基於token查找app使用者, 會基於外部getUserByToken進行查找, 故只要getUserByToken提供使用者即可, 可支援getUserByToken給予針對應用程式所產生之虛擬使用者
 
-        //getTokenUser
-        let userSelf = await getTokenUser(token)
+        //user
+        let user = null
+        if (isestr(token)) {
+            user = getUserByToken(token)
+            if (ispm(user)) {
+                user = await user
+            }
+        }
+        // console.log('user', user)
+
+        //check
+        if (!iseobj(user)) {
+            console.log(`token`, token)
+            console.log(`can not find the user from token`)
+            return Promise.reject(`can not find the user from token`)
+        }
 
         //verifyAppUser
-        let b = verifyAppUser(userSelf, from)
+        let b = verifyAppUser(user, from)
         if (ispm(b)) {
             b = await b
         }
 
         //check
         if (!b) {
-            console.log('userSelf', userSelf)
+            console.log('user', user)
             console.log(`user does not have permission`)
             return Promise.reject(`user does not have permission`)
         }
 
-        return userSelf
+        return user
     }
 
 
@@ -596,8 +612,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyBrowserTokenUser
-                    let user = await getAndVerifyBrowserTokenUser(token, 'getUserByToken')
+                    //getAndVerifyClientUser
+                    let user = await getAndVerifyClientUser(token, 'getUserByToken')
 
                     //check
                     if (!iseobj(user)) {
@@ -631,8 +647,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyBrowserTokenUser
-                    let user = await getAndVerifyBrowserTokenUser(token, 'getAPIsList')
+                    //getAndVerifyClientUser
+                    let user = await getAndVerifyClientUser(token, 'getAPIsList')
 
                     //check
                     if (!iseobj(user)) {
@@ -670,8 +686,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyBrowserTokenUser
-                    let user = await getAndVerifyBrowserTokenUser(token, 'updateAPIs')
+                    //getAndVerifyClientUser
+                    let user = await getAndVerifyClientUser(token, 'updateAPIs')
 
                     //check
                     if (!iseobj(user)) {
@@ -712,8 +728,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyAppTokenUser
-                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceApis')
+                    //getAndVerifyAppUser
+                    let user = await getAndVerifyAppUser(token, 'syncAndReplaceApis')
 
                     //check
                     if (!iseobj(user)) {
@@ -835,7 +851,7 @@ export default WWebApi
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Mon Jul 14 2025 18:00:09 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 Jul 14 2025 20:34:11 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 Mon Jul 14 2025 18:00:09 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 Jul 14 2025 20:34:11 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-api",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "main": "dist/w-web-api.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",

package/server/WWebApi.mjs

@@ -316,49 +316,65 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
     }
 
 
-    //getAndVerifyBrowserTokenUser
-    let getAndVerifyBrowserTokenUser = async (token, from = '') => {
+    //getAndVerifyClientUser
+    let getAndVerifyClientUser = async (token, from = '') => {
+        //基於token查找client使用者, 會基於外部getUserByToken以及perm內部users進行查找並比對
 
         //getTokenUser
-        let userSelf = await getTokenUser(token)
+        let user = await getTokenUser(token)
 
         //verifyClientUser
-        let b = verifyClientUser(userSelf, from)
+        let b = verifyClientUser(user, from)
         if (ispm(b)) {
             b = await b
         }
 
         //check
         if (!b) {
-            console.log('userSelf', userSelf)
+            console.log('user', user)
             console.log(`user does not have permission`)
             return Promise.reject(`user does not have permission`)
         }
 
-        return userSelf
+        return user
     }
 
 
-    //getAndVerifyAppTokenUser
-    let getAndVerifyAppTokenUser = async (token, from = '') => {
+    //getAndVerifyAppUser
+    let getAndVerifyAppUser = async (token, from = '') => {
+        //基於token查找app使用者, 會基於外部getUserByToken進行查找, 故只要getUserByToken提供使用者即可, 可支援getUserByToken給予針對應用程式所產生之虛擬使用者
 
-        //getTokenUser
-        let userSelf = await getTokenUser(token)
+        //user
+        let user = null
+        if (isestr(token)) {
+            user = getUserByToken(token)
+            if (ispm(user)) {
+                user = await user
+            }
+        }
+        // console.log('user', user)
+
+        //check
+        if (!iseobj(user)) {
+            console.log(`token`, token)
+            console.log(`can not find the user from token`)
+            return Promise.reject(`can not find the user from token`)
+        }
 
         //verifyAppUser
-        let b = verifyAppUser(userSelf, from)
+        let b = verifyAppUser(user, from)
         if (ispm(b)) {
             b = await b
         }
 
         //check
         if (!b) {
-            console.log('userSelf', userSelf)
+            console.log('user', user)
             console.log(`user does not have permission`)
             return Promise.reject(`user does not have permission`)
         }
 
-        return userSelf
+        return user
     }
 
 
@@ -549,8 +565,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyBrowserTokenUser
-                    let user = await getAndVerifyBrowserTokenUser(token, 'getUserByToken')
+                    //getAndVerifyClientUser
+                    let user = await getAndVerifyClientUser(token, 'getUserByToken')
 
                     //check
                     if (!iseobj(user)) {
@@ -584,8 +600,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyBrowserTokenUser
-                    let user = await getAndVerifyBrowserTokenUser(token, 'getAPIsList')
+                    //getAndVerifyClientUser
+                    let user = await getAndVerifyClientUser(token, 'getAPIsList')
 
                     //check
                     if (!iseobj(user)) {
@@ -623,8 +639,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyBrowserTokenUser
-                    let user = await getAndVerifyBrowserTokenUser(token, 'updateAPIs')
+                    //getAndVerifyClientUser
+                    let user = await getAndVerifyClientUser(token, 'updateAPIs')
 
                     //check
                     if (!iseobj(user)) {
@@ -665,8 +681,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser,
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getAndVerifyAppTokenUser
-                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceApis')
+                    //getAndVerifyAppUser
+                    let user = await getAndVerifyAppUser(token, 'syncAndReplaceApis')
 
                     //check
                     if (!iseobj(user)) {

package/server/provideApis.mjs

@@ -1,4 +1,5 @@
 import axios from 'axios'
+import get from 'lodash-es/get.js'
 import ltdtpick from 'wsemi/src/ltdtpick.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
 
@@ -32,13 +33,14 @@ async function provideApis(url, group, apis) {
 
     //ltdtpick
     apis = ltdtpick(apis, ks)
+    // console.log('apis', apis)
 
     //rin
     let rin = {
         group,
         apis,
     }
-    // rin = JSON.stringify(rin)
+    // console.log('rin', rin)
 
     //axios
     await axios({
@@ -48,20 +50,21 @@ async function provideApis(url, group, apis) {
         data: rin,
     })
         .then((res) => {
-            // console.log(res)
-            let r = {
-                msg: '成功傳輸API清單',
-                res,
+            // console.log('then', res)
+            let data = get(res, 'data')
+            let state = get(data, 'state')
+            let msg = get(data, 'msg', '')
+            if (state === 'success') {
+                pm.resolve(msg)
             }
-            pm.resolve(r)
+            else {
+                pm.reject(msg)
+            }
+
         })
         .catch((err) => {
-            // console.log(err)
-            let r = {
-                msg: '無法傳輸API清單',
-                res: err,
-            }
-            pm.reject(r)
+            // console.log('catch', err)
+            pm.reject(err)
         })
 
     return pm