w-web-perm 1.0.18 → 1.0.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/w-web-perm.umd.js +2 -2
  2. package/dist/w-web-perm.umd.js.map +1 -1
  3. package/docs/WWebPerm.html +1 -1
  4. package/docs/WWebPerm.mjs.html +19 -3
  5. package/docs/index.html +1 -1
  6. package/package.json +1 -1
  7. package/server/WWebPerm.mjs +18 -2
package/docs/WWebPerm.html CHANGED
@@ -925,7 +925,7 @@
925
925
  <br class="clear">
926
926
 
927
927
  <footer>
928
- 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.
928
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 19:39:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
929
929
  </footer>
930
930
 
931
931
  <script>prettyPrint();</script>
package/docs/WWebPerm.mjs.html CHANGED
@@ -414,6 +414,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
414
414
 
415
415
  //getTokenUser
416
416
  let getTokenUser = async(token) => {
417
+ //基於token查找使用者, 會基於外部getUserByToken以及perm內部users進行查找並比對
417
418
 
418
419
  //userSelf
419
420
  let userSelf = null
@@ -523,9 +524,24 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
523
524
 
524
525
  //getAndVerifyAppTokenUser
525
526
  let getAndVerifyAppTokenUser = async (token, caller = '') => {
527
+ //基於token查找使用者, 會基於外部getUserByToken進行查找, 故只要getUserByToken提供使用者即可, 可支援getUserByToken給予針對應用程式所產生之虛擬使用者
526
528
 
527
- //getTokenUser
528
- let userSelf = await getTokenUser(token)
529
+ //userSelf
530
+ let userSelf = null
531
+ if (isestr(token)) {
532
+ userSelf = getUserByToken(token)
533
+ if (ispm(userSelf)) {
534
+ userSelf = await userSelf
535
+ }
536
+ }
537
+ // console.log('userSelf', userSelf)
538
+
539
+ //check
540
+ if (!iseobj(userSelf)) {
541
+ console.log(`token`, token)
542
+ console.log(`can not find the user from token`)
543
+ return Promise.reject(`can not find the user from token`)
544
+ }
529
545
 
530
546
  //verifyAppUser
531
547
  let b = verifyAppUser(userSelf, caller)
@@ -1160,7 +1176,7 @@ export default WWebPerm
1160
1176
  <br class="clear">
1161
1177
 
1162
1178
  <footer>
1163
- 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.
1179
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 19:39:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
1164
1180
  </footer>
1165
1181
 
1166
1182
  <script>prettyPrint();</script>
package/docs/index.html CHANGED
@@ -71,7 +71,7 @@
71
71
  <br class="clear">
72
72
 
73
73
  <footer>
74
- 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.
74
+ Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Sep 24 2024 19:39:53 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
75
75
  </footer>
76
76
 
77
77
  <script>prettyPrint();</script>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "w-web-perm",
3
- "version": "1.0.18",
3
+ "version": "1.0.19",
4
4
  "main": "dist/w-web-perm.umd.js",
5
5
  "dependencies": {
6
6
  "@mdi/js": "^7.4.47",
package/server/WWebPerm.mjs CHANGED
@@ -367,6 +367,7 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
367
367
 
368
368
  //getTokenUser
369
369
  let getTokenUser = async(token) => {
370
+ //基於token查找使用者, 會基於外部getUserByToken以及perm內部users進行查找並比對
370
371
 
371
372
  //userSelf
372
373
  let userSelf = null
@@ -476,9 +477,24 @@ function WWebPerm(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUse
476
477
 
477
478
  //getAndVerifyAppTokenUser
478
479
  let getAndVerifyAppTokenUser = async (token, caller = '') => {
480
+ //基於token查找使用者, 會基於外部getUserByToken進行查找, 故只要getUserByToken提供使用者即可, 可支援getUserByToken給予針對應用程式所產生之虛擬使用者
479
481
 
480
- //getTokenUser
481
- let userSelf = await getTokenUser(token)
482
+ //userSelf
483
+ let userSelf = null
484
+ if (isestr(token)) {
485
+ userSelf = getUserByToken(token)
486
+ if (ispm(userSelf)) {
487
+ userSelf = await userSelf
488
+ }
489
+ }
490
+ // console.log('userSelf', userSelf)
491
+
492
+ //check
493
+ if (!iseobj(userSelf)) {
494
+ console.log(`token`, token)
495
+ console.log(`can not find the user from token`)
496
+ return Promise.reject(`can not find the user from token`)
497
+ }
482
498
 
483
499
  //verifyAppUser
484
500
  let b = verifyAppUser(userSelf, caller)