w-web-perm 1.0.18 → 1.0.20

package/docs/WWebPerm.html

@@ -925,7 +925,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 19:01:38 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 Tue Sep 24 2024 20:19:15 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebPerm.mjs.html

@@ -414,6 +414,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //getTokenUser
     let getTokenUser = async(token) => {
+        //基於token查找使用者, 會基於外部getUserByToken以及perm內部users進行查找並比對
 
         //userSelf
         let userSelf = null
@@ -523,9 +524,24 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //getAndVerifyAppTokenUser
     let getAndVerifyAppTokenUser = async (token, caller = '') => {
+        //基於token查找使用者, 會基於外部getUserByToken進行查找, 故只要getUserByToken提供使用者即可, 可支援getUserByToken給予針對應用程式所產生之虛擬使用者
 
-        //getTokenUser
-        let userSelf = await getTokenUser(token)
+        //userSelf
+        let userSelf = null
+        if (isestr(token)) {
+            userSelf = getUserByToken(token)
+            if (ispm(userSelf)) {
+                userSelf = await userSelf
+            }
+        }
+        // console.log('userSelf', userSelf)
+
+        //check
+        if (!iseobj(userSelf)) {
+            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, caller)
@@ -1160,7 +1176,7 @@ export default WWebPerm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 19:01:38 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 Tue Sep 24 2024 20:19:15 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 Tue Sep 24 2024 19:01:38 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 Tue Sep 24 2024 20:19:15 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-perm",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "main": "dist/w-web-perm.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",

package/server/WWebPerm.mjs

@@ -367,6 +367,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //getTokenUser
     let getTokenUser = async(token) => {
+        //基於token查找使用者, 會基於外部getUserByToken以及perm內部users進行查找並比對
 
         //userSelf
         let userSelf = null
@@ -476,9 +477,24 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
 
     //getAndVerifyAppTokenUser
     let getAndVerifyAppTokenUser = async (token, caller = '') => {
+        //基於token查找使用者, 會基於外部getUserByToken進行查找, 故只要getUserByToken提供使用者即可, 可支援getUserByToken給予針對應用程式所產生之虛擬使用者
 
-        //getTokenUser
-        let userSelf = await getTokenUser(token)
+        //userSelf
+        let userSelf = null
+        if (isestr(token)) {
+            userSelf = getUserByToken(token)
+            if (ispm(userSelf)) {
+                userSelf = await userSelf
+            }
+        }
+        // console.log('userSelf', userSelf)
+
+        //check
+        if (!iseobj(userSelf)) {
+            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, caller)

package/src/perm.mjs

@@ -12,6 +12,9 @@ function perm() {
 
     //pmd
     let pmd = null
+    let _user = {}
+    let _rules = []
+    let _kpRule = {}
 
     //conn
     let conn = (url, opt = {}) => {
@@ -43,6 +46,9 @@ function perm() {
             .then((res) => {
                 // console.log('perm.getPerm then', res)
                 pmd = res
+                genUser()
+                genRules()
+                genKpRule()
                 if (isfun(permSuccess)) {
                     permSuccess(pmd)
                 }
@@ -59,48 +65,52 @@ function perm() {
         return pm
     }
 
-    //user
-    let user = get(pmd, `user`, {})
+    let genUser = () => {
+        _user = get(pmd, `user`, {})
+    }
 
-    //rules
-    let rules = get(pmd, `rules`, [])
+    let genRules = () => {
+        _rules = get(pmd, `rules`, [])
+    }
 
-    //kpRule
-    let kpRule = {}
-    each(rules, (v) => {
+    let genKpRule = () => {
+        let kpRule = {}
+        each(_rules, (v) => {
 
-        //name
-        let name = get(v, 'name', '')
-        if (!isestr(name)) {
-            return true //跳出換下一個
-        }
+            //name
+            let name = get(v, 'name', '')
+            if (!isestr(name)) {
+                return true //跳出換下一個
+            }
 
-        //isActive
-        let _isActive = get(v, 'isActive', '')
-        let isActive = _isActive === 'y' ? 'y' : 'n'
+            //isActive
+            let _isActive = get(v, 'isActive', '')
+            let isActive = _isActive === 'y' ? 'y' : 'n'
 
-        //save
-        kpRule[name] = isActive
+            //save
+            kpRule[name] = isActive
 
-    })
+        })
+        _kpRule = kpRule
+    }
 
     //kp
     let kp = {
         conn,
         getUser: () => {
-            return user
+            return _user
         },
         getRules: () => {
-            return rules
+            return _rules
         },
         getKpRule: () => {
-            return kpRule
+            return _kpRule
         },
         // rule: (key) => {
-        //     return get(kpRule, key, '')
+        //     return get(_kpRule, key, '')
         // },
         active: (key) => {
-            let _isActive = get(kpRule, key, '')
+            let _isActive = get(_kpRule, key, '')
             let isActive = _isActive === 'y' ? 'y' : 'n'
             return isActive
         },