w-web-sso 1.0.11 → 1.0.13

package/docs/WWebSso.html

@@ -64,7 +64,7 @@
 
     
 
-    <h4 class="name" id="WWebSso"><span class="type-signature"></span>new WWebSso<span class="signature">(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, pathSettings<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Object}</span></h4>
+    <h4 class="name" id="WWebSso"><span class="type-signature"></span>new WWebSso<span class="signature">(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, pathSettings<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Object}</span></h4>
 
     
 
@@ -305,7 +305,7 @@
 
         <tr>
             
-                <td class="name"><code>verifyBrowserUser</code></td>
+                <td class="name"><code>verifyClientUser</code></td>
             
 
             <td class="type">
@@ -495,7 +495,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Fri Jun 06 2025 11:21:58 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 Sat Jun 07 2025 20:41:04 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebSso.mjs.html

@@ -77,7 +77,7 @@ import procSettings from './procSettings.mjs'
  * @param {String} url 輸入資料庫連線字串，例如w-orm-lmdb為'./db'，或w-orm-mongodb為'mongodb://sername:password@$127.0.0.1:27017'
  * @param {String} db 輸入資料庫名稱字串
  * @param {Function} getUserByToken 輸入處理函數，函數會傳入使用者token，通過此函數處理後並回傳使用者資訊物件，並至少須提供'id'、'email'、'name'、'isAdmin'欄位，且'isAdmin'限輸入'y'或'n'，且輸入'y'時會複寫權限系統該使用者之'isAdmin'欄位值
- * @param {Function} verifyBrowserUser 輸入驗證瀏覽使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
+ * @param {Function} verifyClientUser 輸入驗證瀏覽使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
  * @param {Function} verifyAppUser 輸入驗證應用程序使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
  * @param {String} [pathSettings='./settings'] 輸入設定檔案路徑字串，預設'./settings'
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
@@ -86,7 +86,7 @@ import procSettings from './procSettings.mjs'
  *
  *
  */
-function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, pathSettings) {
+function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, pathSettings) {
     let instWServHapiServer = null
 
 
@@ -118,10 +118,10 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
     }
 
 
-    //check verifyBrowserUser
-    if (!isfun(verifyBrowserUser)) {
-        console.log('invalid verifyBrowserUser', verifyBrowserUser)
-        throw new Error('invalid verifyBrowserUser')
+    //check verifyClientUser
+    if (!isfun(verifyClientUser)) {
+        console.log('invalid verifyClientUser', verifyClientUser)
+        throw new Error('invalid verifyClientUser')
     }
 
 
@@ -418,8 +418,8 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
     //     //getTokenUser
     //     let userSelf = await getTokenUser(token)
 
-    //     //verifyBrowserUser
-    //     let b = verifyBrowserUser(userSelf, caller)
+    //     //verifyClientUser
+    //     let b = verifyClientUser(userSelf, caller)
     //     if (ispm(b)) {
     //         b = await b
     //     }
@@ -599,13 +599,13 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
         //     },
         // },
 
-        {
-            method: 'GET',
-            path: '/getWebInfor',
-            handler: async function (req, res) {
-                return getWebInfor()
-            },
-        },
+        // {
+        //     method: 'GET',
+        //     path: '/getWebInfor',
+        //     handler: async function (req, res) {
+        //         return getWebInfor() //bbb 應該已不用, 前端載入通訊器後由$fapi.getWebInfor呼叫
+        //     },
+        // },
 
         {
             method: 'GET',
@@ -754,9 +754,13 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
         port: opt.serverPort,
         pathStaticFiles,
         apis,
+        verifyConn: () => {
+            return true
+        },
         getUserIdByToken: async (token) => { //可使用async或sync函數
             return ''
         },
+        corsOrigins: ['*'],
         useDbOrm: false,
         // kpOrm: woItems,
         // operOrm: procOrm, //procOrm的輸入為: userId, tableName, methodName, input
@@ -825,7 +829,7 @@ export default WWebSso
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Fri Jun 06 2025 11:21:58 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 Sat Jun 07 2025 20:41:04 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 Fri Jun 06 2025 11:21:58 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 Sat Jun 07 2025 20:41:04 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "w-web-sso",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "main": "dist/w-web-sso.umd.js",
   "dependencies": {
     "@mdi/js": "^7.4.47",
-    "axios": "^1.7.9",
+    "axios": "^1.9.0",
     "json5": "^2.2.3",
     "lodash-es": "^4.17.21",
     "w-component-vue": "^2.4.20",
     "w-data-collector": "^1.0.22",
-    "w-serv-hapi": "^1.0.56",
+    "w-serv-hapi": "^1.0.57",
     "w-serv-orm": "^1.0.26",
     "w-ui-loginout": "^1.0.9",
     "wsemi": "^1.7.92"

package/server/WWebSso.mjs

@@ -30,7 +30,7 @@ import procSettings from './procSettings.mjs'
  * @param {String} url 輸入資料庫連線字串，例如w-orm-lmdb為'./db'，或w-orm-mongodb為'mongodb://sername:password@$127.0.0.1:27017'
  * @param {String} db 輸入資料庫名稱字串
  * @param {Function} getUserByToken 輸入處理函數，函數會傳入使用者token，通過此函數處理後並回傳使用者資訊物件，並至少須提供'id'、'email'、'name'、'isAdmin'欄位，且'isAdmin'限輸入'y'或'n'，且輸入'y'時會複寫權限系統該使用者之'isAdmin'欄位值
- * @param {Function} verifyBrowserUser 輸入驗證瀏覽使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
+ * @param {Function} verifyClientUser 輸入驗證瀏覽使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
  * @param {Function} verifyAppUser 輸入驗證應用程序使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
  * @param {String} [pathSettings='./settings'] 輸入設定檔案路徑字串，預設'./settings'
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
@@ -39,7 +39,7 @@ import procSettings from './procSettings.mjs'
  *
  *
  */
-function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, pathSettings) {
+function WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, pathSettings) {
     let instWServHapiServer = null
 
 
@@ -71,10 +71,10 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
     }
 
 
-    //check verifyBrowserUser
-    if (!isfun(verifyBrowserUser)) {
-        console.log('invalid verifyBrowserUser', verifyBrowserUser)
-        throw new Error('invalid verifyBrowserUser')
+    //check verifyClientUser
+    if (!isfun(verifyClientUser)) {
+        console.log('invalid verifyClientUser', verifyClientUser)
+        throw new Error('invalid verifyClientUser')
     }
 
 
@@ -371,8 +371,8 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
     //     //getTokenUser
     //     let userSelf = await getTokenUser(token)
 
-    //     //verifyBrowserUser
-    //     let b = verifyBrowserUser(userSelf, caller)
+    //     //verifyClientUser
+    //     let b = verifyClientUser(userSelf, caller)
     //     if (ispm(b)) {
     //         b = await b
     //     }
@@ -552,13 +552,13 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
         //     },
         // },
 
-        {
-            method: 'GET',
-            path: '/getWebInfor',
-            handler: async function (req, res) {
-                return getWebInfor()
-            },
-        },
+        // {
+        //     method: 'GET',
+        //     path: '/getWebInfor',
+        //     handler: async function (req, res) {
+        //         return getWebInfor() //bbb 應該已不用, 前端載入通訊器後由$fapi.getWebInfor呼叫
+        //     },
+        // },
 
         {
             method: 'GET',
@@ -707,9 +707,13 @@ function WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
         port: opt.serverPort,
         pathStaticFiles,
         apis,
+        verifyConn: () => {
+            return true
+        },
         getUserIdByToken: async (token) => { //可使用async或sync函數
             return ''
         },
+        corsOrigins: ['*'],
         useDbOrm: false,
         // kpOrm: woItems,
         // operOrm: procOrm, //procOrm的輸入為: userId, tableName, methodName, input

package/src/main.js

@@ -51,10 +51,9 @@ Vue.directive('domdragdrop', domDragDrop())
 // let bFirstSync = false
 WServHapiClient({
     showLog: false,
-    getUrl: () => {
-        return window.location.origin + window.location.pathname
-    },
+    url: window.location.origin + window.location.pathname,
     useWaitToken: false,
+    apiName: 'api',
     getToken: () => {
         let token = get(Vue.prototype, `$store.state.userToken`, '')
         // console.log('getToken', token)

package/srv.mjs

@@ -33,8 +33,8 @@ let getUserByToken = async (token) => {
     return {}
 }
 
-let verifyBrowserUser = (user, caller) => {
-    console.log('verifyBrowserUser/user', user)
+let verifyClientUser = (user, caller) => {
+    console.log('verifyClientUser/user', user)
     // return false //測試無法登入
     console.log('於生產環境時得加入限制瀏覽器使用者身份機制')
     return user.isAdmin === 'y' //測試僅系統管理者使用
@@ -48,13 +48,16 @@ let verifyAppUser = (user, caller) => {
 }
 
 //WWebSso
-let instWWebSso = WWebSso(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, pathSettings)
+let instWWebSso = WWebSso(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, pathSettings)
 
 instWWebSso.on('error', (err) => {
     console.log(err)
 })
 
-
-//http://localhost:8080/?view=backstage
+//測試
+//http://localhost:8080/ => 登入後轉至指定頁
+//http://localhost:8080/?token=sys => 網址給予token但不使用, 登入後轉至指定頁
+//http://localhost:8080/?view=backstage => 登入後轉至後台
+//http://localhost:8080/?view=backstage&token=sys => 網址給予token但不使用, 登入後轉至後台
 
 //node srv.mjs