w-web-api 1.0.29 → 1.0.30

package/docs/WWebApi.html

@@ -721,6 +721,46 @@
         </tr>
 
     
+
+        <tr>
+            
+                <td class="name"><code>urlRedirect</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>''</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入錯誤時自動轉址字串，提供站台例如無法登入或驗證失敗時須自動轉址，預設''</p></td>
+        </tr>
+
+    
     </tbody>
 </table>
 
@@ -809,7 +849,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Nov 02 2023 11:10:20 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 Thu Nov 02 2023 22:58:48 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WWebApi.mjs.html

@@ -48,10 +48,8 @@
             <pre class="prettyprint source linenums"><code>import path from 'path'
 import fs from 'fs'
 import get from 'lodash/get'
-// import map from 'lodash/map'
 import each from 'lodash/each'
 import keys from 'lodash/keys'
-// import cloneDeep from 'lodash/cloneDeep'
 import j2o from 'wsemi/src/j2o.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
@@ -67,6 +65,7 @@ import strdelright from 'wsemi/src/strdelright.mjs'
 import pm2resolve from 'wsemi/src/pm2resolve.mjs'
 import b642str from 'wsemi/src/b642str.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import replace from 'wsemi/src/replace.mjs'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
@@ -91,6 +90,7 @@ import ds from '../src/schema/index.mjs'
  * @param {Object} [opt.webDescription={}] 輸入站台描述物件，至少包含語系eng與cht鍵的名稱，預設{}
  * @param {String} [opt.webLogo=''] 輸入站台logo字串，採base64格式，預設''
  * @param {String} [opt.subfolder=''] 輸入站台所在子目錄字串，提供站台位於內網採反向代理進行服務時，故需支援位於子目錄情形，預設''
+ * @param {String} [opt.urlRedirect=''] 輸入錯誤時自動轉址字串，提供站台例如無法登入或驗證失敗時須自動轉址，預設''
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
  * @example
  * import WOrm from 'w-orm-mongodb/src/WOrmMongodb.mjs' //自行選擇引用ORM, 使用Mongodb測試
@@ -242,6 +242,10 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     }
 
 
+    //urlRedirect
+    let urlRedirect = get(opt, 'urlRedirect', '')
+
+
     //WServOrm
     let optWServOrm = {
         bCheckUser,
@@ -279,7 +283,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
 
         //check
         if (!iseobj(userSelf)) {
-            console.log(`can not find the user from token`, token)
+            console.log(`token`, token)
+            console.log(`can not find the user from token`)
             return Promise.reject(`can not find the user from token`)
         }
 
@@ -292,6 +297,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         //check
         if (!b) {
             console.log('userSelf', userSelf)
+            console.log(`user does not have permission`)
             return Promise.reject(`user does not have permission`)
         }
 
@@ -308,6 +314,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
 
     //parsePayload
     let parsePayload = async (req) => {
+
+        //inp
         let inp = get(req, 'payload')
 
         //to obj
@@ -318,6 +326,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         //check
         if (!iseobj(inp)) {
             console.log('inp', inp)
+            console.log(`invalid inp from req`)
             return Promise.reject(`invalid inp from req`)
         }
 
@@ -328,6 +337,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isestr(group)) {
             console.log('inp', inp)
             console.log('group', group)
+            console.log(`invalid group from inp`)
             return Promise.reject(`invalid group from inp`)
         }
 
@@ -338,6 +348,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isearr(apis)) {
             console.log('inp', inp)
             console.log('apis', apis)
+            console.log(`invalid apis from inp`)
             return Promise.reject(`invalid apis from inp`)
         }
 
@@ -396,6 +407,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isestr(group)) {
             console.log('params', params)
             console.log('group', group)
+            console.log(`invalid group`)
             return Promise.reject(`invalid group`)
         }
 
@@ -407,6 +419,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isearr(apis)) {
             console.log('params', params)
             console.log('apis', apis)
+            console.log(`invalid apis`)
             return Promise.reject(`invalid apis`)
         }
 
@@ -434,9 +447,18 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     let fnEntryOut = 'index.html'
     try {
         let fpEntryIn = path.resolve(pathStaticFiles, fnEntryIn)
+        if (!fsIsFile(fpEntryIn)) {
+            fpEntryIn = path.resolve(pathStaticFiles, fnEntryOut) //本機開發另使用html替代tmp
+        }
+        if (!fsIsFile(fpEntryIn)) {
+            console.log('fpEntryIn', fpEntryIn)
+            throw new Error(`invalid fpEntryIn`)
+        }
         let fpEntryOut = path.resolve(pathStaticFiles, fnEntryOut)
         let c = fs.readFileSync(fpEntryIn, 'utf8')
+        c = replace(c, '/mapi/', '{sfd}/') //方法同genEntry
         c = replace(c, '{sfd}', subfolder)
+        c = replace(c, '{urlRedirect}', urlRedirect)
         fs.writeFileSync(fpEntryOut, c, 'utf8')
     }
     catch (err) {
@@ -483,6 +505,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]getUserByToken/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
@@ -514,6 +537,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]getAPIsList/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
@@ -549,6 +573,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]updateAPIs/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
@@ -587,6 +612,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]syncAndReplaceApis/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
@@ -663,7 +689,7 @@ export default WWebApi
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Nov 02 2023 11:10:20 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 Thu Nov 02 2023 22:58:48 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 Thu Nov 02 2023 11:10:20 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 Thu Nov 02 2023 22:58:48 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.29",
+  "version": "1.0.30",
   "main": "dist/w-web-api.umd.js",
   "dependencies": {
     "@mdi/js": "^7.2.96",

package/public/index.html

@@ -12,6 +12,13 @@
         <!-- fontawesome -->
         <link href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.4.2/css/all.min.css" rel="stylesheet">
 
+        <!-- ___pmwapi___ -->
+        <script>
+            window.___pmwapi___={
+                urlRedirect: '{urlRedirect}',
+            }
+        </script>
+
     </head>
     <body style="font-family:'Microsoft JhengHei','Avenir','Helvetica', 'Arial', 'sans-serif'; padding:0px; margin:0px;">
         <noscript>

package/server/WWebApi.mjs

@@ -1,10 +1,8 @@
 import path from 'path'
 import fs from 'fs'
 import get from 'lodash/get'
-// import map from 'lodash/map'
 import each from 'lodash/each'
 import keys from 'lodash/keys'
-// import cloneDeep from 'lodash/cloneDeep'
 import j2o from 'wsemi/src/j2o.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
@@ -20,6 +18,7 @@ import strdelright from 'wsemi/src/strdelright.mjs'
 import pm2resolve from 'wsemi/src/pm2resolve.mjs'
 import b642str from 'wsemi/src/b642str.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
+import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import replace from 'wsemi/src/replace.mjs'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
@@ -44,6 +43,7 @@ import ds from '../src/schema/index.mjs'
  * @param {Object} [opt.webDescription={}] 輸入站台描述物件，至少包含語系eng與cht鍵的名稱，預設{}
  * @param {String} [opt.webLogo=''] 輸入站台logo字串，採base64格式，預設''
  * @param {String} [opt.subfolder=''] 輸入站台所在子目錄字串，提供站台位於內網採反向代理進行服務時，故需支援位於子目錄情形，預設''
+ * @param {String} [opt.urlRedirect=''] 輸入錯誤時自動轉址字串，提供站台例如無法登入或驗證失敗時須自動轉址，預設''
  * @returns {Object} 回傳物件，其內server為hapi伺服器實體，wsrv為w-converhp的伺服器事件物件，wsds為w-serv-webdata的伺服器事件物件，可監聽error事件
  * @example
  * import WOrm from 'w-orm-mongodb/src/WOrmMongodb.mjs' //自行選擇引用ORM, 使用Mongodb測試
@@ -195,6 +195,10 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     }
 
 
+    //urlRedirect
+    let urlRedirect = get(opt, 'urlRedirect', '')
+
+
     //WServOrm
     let optWServOrm = {
         bCheckUser,
@@ -232,7 +236,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
 
         //check
         if (!iseobj(userSelf)) {
-            console.log(`can not find the user from token`, token)
+            console.log(`token`, token)
+            console.log(`can not find the user from token`)
             return Promise.reject(`can not find the user from token`)
         }
 
@@ -245,6 +250,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         //check
         if (!b) {
             console.log('userSelf', userSelf)
+            console.log(`user does not have permission`)
             return Promise.reject(`user does not have permission`)
         }
 
@@ -261,6 +267,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
 
     //parsePayload
     let parsePayload = async (req) => {
+
+        //inp
         let inp = get(req, 'payload')
 
         //to obj
@@ -271,6 +279,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         //check
         if (!iseobj(inp)) {
             console.log('inp', inp)
+            console.log(`invalid inp from req`)
             return Promise.reject(`invalid inp from req`)
         }
 
@@ -281,6 +290,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isestr(group)) {
             console.log('inp', inp)
             console.log('group', group)
+            console.log(`invalid group from inp`)
             return Promise.reject(`invalid group from inp`)
         }
 
@@ -291,6 +301,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isearr(apis)) {
             console.log('inp', inp)
             console.log('apis', apis)
+            console.log(`invalid apis from inp`)
             return Promise.reject(`invalid apis from inp`)
         }
 
@@ -349,6 +360,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isestr(group)) {
             console.log('params', params)
             console.log('group', group)
+            console.log(`invalid group`)
             return Promise.reject(`invalid group`)
         }
 
@@ -360,6 +372,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
         if (!isearr(apis)) {
             console.log('params', params)
             console.log('apis', apis)
+            console.log(`invalid apis`)
             return Promise.reject(`invalid apis`)
         }
 
@@ -387,9 +400,18 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     let fnEntryOut = 'index.html'
     try {
         let fpEntryIn = path.resolve(pathStaticFiles, fnEntryIn)
+        if (!fsIsFile(fpEntryIn)) {
+            fpEntryIn = path.resolve(pathStaticFiles, fnEntryOut) //本機開發另使用html替代tmp
+        }
+        if (!fsIsFile(fpEntryIn)) {
+            console.log('fpEntryIn', fpEntryIn)
+            throw new Error(`invalid fpEntryIn`)
+        }
         let fpEntryOut = path.resolve(pathStaticFiles, fnEntryOut)
         let c = fs.readFileSync(fpEntryIn, 'utf8')
+        c = replace(c, '/mapi/', '{sfd}/') //方法同genEntry
         c = replace(c, '{sfd}', subfolder)
+        c = replace(c, '{urlRedirect}', urlRedirect)
         fs.writeFileSync(fpEntryOut, c, 'utf8')
     }
     catch (err) {
@@ -436,6 +458,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]getUserByToken/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
@@ -467,6 +490,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]getAPIsList/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
@@ -502,6 +526,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]updateAPIs/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 
@@ -540,6 +565,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     if (!iseobj(user)) {
                         console.log('token', token)
                         console.log('[API]syncAndReplaceApis/check user: invalid user')
+                        console.log(`token does not have permission`)
                         return Promise.reject(`token does not have permission`)
                     }
 

package/src/App.vue

@@ -16,6 +16,8 @@
 <script>
 import get from 'lodash/get'
 import cloneDeep from 'lodash/cloneDeep'
+import isestr from 'wsemi/src/isestr.mjs'
+import isDev from 'wsemi/src/isDev.mjs'
 import wui from 'w-ui-loginout/src/WUiLoginout.mjs'
 import Layout from './components/Layout.vue'
 import LayoutState from './components/LayoutState.vue'
@@ -50,12 +52,25 @@ export default {
             console.log('login error', cloneDeep(data))
             vo.$ui.updateConnState(data.text)
             vo.$ui.updateUserToken('')
-            vo.$ui.updateUserSelf(get(vo, `$store.state.userDef`))
+            let urlRedirect = get(window, '___pmwapi___.urlRedirect', '')
+            if (!isestr(urlRedirect)) {
+                console.log('urlRedirect', urlRedirect)
+                throw new Error(`invalid urlRedirect`)
+            }
+            if (isDev()) {
+                console.log('60s redirect to:', urlRedirect)
+                setTimeout(() => {
+                    window.location.href = urlRedirect
+                }, 60 * 1000)
+            }
+            else {
+                window.location.href = urlRedirect
+            }
         }
 
         //login
         console.log('login...')
-        let ll = wui('wperm', {
+        let ll = wui('wapi', {
             timeWaitAnimation: 2000,
             params: {},
         })

package/src/store/mutations.mjs

@@ -1,20 +1,9 @@
 import each from 'lodash/each'
 import set from 'lodash/set'
-import cloneDeep from 'lodash/cloneDeep'
 import * as types from './types.mjs'
 import ds from '../schema/index.mjs'
 
 
-//userDef
-let userDef = {
-    id: '', //id-for-admin
-    name: '', //測試者
-    email: '', //id-for-admin@gmail.com
-    // isVirtual: 'n',
-    isAdmin: 'n',
-    // isActive: 'n',
-}
-
 //state, 全域狀態
 let state = {
 
@@ -35,8 +24,12 @@ let state = {
     menu: {}, //初始值需為物件, 否則LayoutContent會取menu.key出錯
 
     userToken: '',
-    userDef: cloneDeep(userDef),
-    userSelf: cloneDeep(userDef),
+    user: {
+        id: '', //id-for-admin
+        name: '', //測試者
+        email: '', //admin@example.com
+        isAdmin: 'n',
+    },
 
     lang: 'cht',
     keyLangs: {

package/srv.mjs

@@ -16,6 +16,7 @@ let opt = {
 
     serverPort: 11005,
     subfolder: '', //mapi
+    urlRedirect: 'https://www.google.com/', //本機測試時得先編譯, 再瀏覽: http://localhost:11005/
 
     webName: {
         'eng': 'API Service',
@@ -35,7 +36,7 @@ let getUserByToken = (token) => {
         return {
             id: 'id-for-application',
             name: 'application',
-            email: 'admin@example.com',
+            email: 'application@example.com',
             isAdmin: 'y',
         }
     }
@@ -53,6 +54,7 @@ let getUserByToken = (token) => {
 }
 
 let verifyUser = (user) => {
+    // return false //測試無法登入
     console.log('於生產環境時得加入驗證user機制')
     return user.isAdmin === 'y' //測試僅系統管理者使用
 }

package/tableTags-web-api.json

@@ -1 +1 @@
-{"apis":"fY7kYV"}
+{"apis":"4rDZ5D"}