w-web-api 1.0.29 → 1.0.31

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'
@@ -34,7 +33,8 @@ import ds from '../src/schema/index.mjs'
  * @param {String} url 輸入資料庫連線字串，例如'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} verifyUser 輸入處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
+ * @param {Function} verifyBrowserUser 輸入驗證瀏覽使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
+ * @param {Function} verifyAppUser 輸入驗證應用程序使用者身份之處理函數，函數會傳入使用者資訊物件，通過此函數識別後回傳布林值，允許使用者回傳true，反之回傳false
  * @param {Object} [opt={}] 輸入設定物件，預設{}
  * @param {Integer} [opt.serverPort=11005] 輸入伺服器通訊port，預設11005
  * @param {Boolean} [opt.bCheckUser=false] 輸入是否檢查使用者資訊布林值，預設false
@@ -44,12 +44,15 @@ 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測試
  * import WWebApi from './server/WWebApi.mjs'
  * import getSettings from './g.getSettings.mjs'
  *
+ *
  * //st
  * let st = getSettings()
  *
@@ -63,6 +66,7 @@ import ds from '../src/schema/index.mjs'
  *
  *     serverPort: 11005,
  *     subfolder: '', //mapi
+ *     urlRedirect: 'https://www.google.com/', //本機測試時得先編譯, 再瀏覽: http://localhost:11005/
  *
  *     webName: {
  *         'eng': 'API Service',
@@ -76,13 +80,13 @@ import ds from '../src/schema/index.mjs'
  *
  * }
  *
- * let getUserByToken = (token) => {
+ * let getUserByToken = async (token) => {
  *     // return {} //測試無法登入
  *     if (token === '{token-for-application}') { //提供外部應用系統作為存取使用者
  *         return {
  *             id: 'id-for-application',
  *             name: 'application',
- *             email: 'admin@example.com',
+ *             email: 'application@example.com',
  *             isAdmin: 'y',
  *         }
  *     }
@@ -99,20 +103,29 @@ import ds from '../src/schema/index.mjs'
  *     return {}
  * }
  *
- * let verifyUser = (user) => {
- *     console.log('於生產環境時得加入驗證user機制')
+ * let verifyBrowserUser = (user, caller) => {
+ *     console.log('verifyBrowserUser/user', user)
+ *     // return false //測試無法登入
+ *     console.log('於生產環境時得加入限制瀏覽器使用者身份機制')
+ *     return user.isAdmin === 'y' //測試僅系統管理者使用
+ * }
+ *
+ * let verifyAppUser = (user, caller) => {
+ *     console.log('verifyAppUser/user', user)
+ *     // return false //測試無法登入
+ *     console.log('於生產環境時得加入限制應用程式使用者身份機制')
  *     return user.isAdmin === 'y' //測試僅系統管理者使用
  * }
  *
  * //WWebApi
- * let instWWebApi = WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt)
+ * let instWWebApi = WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, opt)
  *
  * instWWebApi.on('error', (err) => {
  *     console.log(err)
  * })
  *
  */
-function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
+function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, opt = {}) {
     let instWServHapiServer = null
 
 
@@ -144,10 +157,17 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     }
 
 
-    //check verifyUser
-    if (!isfun(verifyUser)) {
-        console.log('invalid verifyUser', verifyUser)
-        throw new Error('invalid verifyUser')
+    //check verifyBrowserUser
+    if (!isfun(verifyBrowserUser)) {
+        console.log('invalid verifyBrowserUser', verifyBrowserUser)
+        throw new Error('invalid verifyBrowserUser')
+    }
+
+
+    //check verifyAppUser
+    if (!isfun(verifyAppUser)) {
+        console.log('invalid verifyAppUser', verifyAppUser)
+        throw new Error('invalid verifyAppUser')
     }
 
 
@@ -195,6 +215,10 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     }
 
 
+    //urlRedirect
+    let urlRedirect = get(opt, 'urlRedirect', '')
+
+
     //WServOrm
     let optWServOrm = {
         bCheckUser,
@@ -221,8 +245,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     }
 
 
-    //getTokenUserForSelf
-    let getTokenUserForSelf = async (token) => {
+    //getTokenUser
+    let getTokenUser = async (token) => {
 
         //getUserByToken
         let userSelf = getUserByToken(token)
@@ -232,12 +256,46 @@ 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`)
         }
 
-        //verifyUser
-        let b = verifyUser(userSelf)
+        return userSelf
+    }
+
+
+    //getAndVerifyBrowserTokenUser
+    let getAndVerifyBrowserTokenUser = async (token, caller = '') => {
+
+        //getTokenUser
+        let userSelf = await getTokenUser(token)
+
+        //verifyBrowserUser
+        let b = verifyBrowserUser(userSelf, caller)
+        if (ispm(b)) {
+            b = await b
+        }
+
+        //check
+        if (!b) {
+            console.log('userSelf', userSelf)
+            console.log(`user does not have permission`)
+            return Promise.reject(`user does not have permission`)
+        }
+
+        return userSelf
+    }
+
+
+    //getAndVerifyAppTokenUser
+    let getAndVerifyAppTokenUser = async (token, caller = '') => {
+
+        //getTokenUser
+        let userSelf = await getTokenUser(token)
+
+        //verifyAppUser
+        let b = verifyAppUser(userSelf, caller)
         if (ispm(b)) {
             b = await b
         }
@@ -245,6 +303,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 +320,8 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
 
     //parsePayload
     let parsePayload = async (req) => {
+
+        //inp
         let inp = get(req, 'payload')
 
         //to obj
@@ -271,6 +332,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 +343,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 +354,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 +413,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 +425,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 +453,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) {
@@ -429,13 +504,14 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getTokenUserForSelf
-                    let user = await getTokenUserForSelf(token)
+                    //getAndVerifyBrowserTokenUser
+                    let user = await getAndVerifyBrowserTokenUser(token, 'getUserByToken')
 
                     //check
                     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`)
                     }
 
@@ -460,13 +536,14 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getTokenUserForSelf
-                    let user = await getTokenUserForSelf(token)
+                    //getAndVerifyBrowserTokenUser
+                    let user = await getAndVerifyBrowserTokenUser(token, 'getAPIsList')
 
                     //check
                     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`)
                     }
 
@@ -495,13 +572,14 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getTokenUserForSelf
-                    let user = await getTokenUserForSelf(token)
+                    //getAndVerifyBrowserTokenUser
+                    let user = await getAndVerifyBrowserTokenUser(token, 'updateAPIs')
 
                     //check
                     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`)
                     }
 
@@ -533,13 +611,14 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
                     //token
                     let token = get(req, 'query.token', '')
 
-                    //getTokenUserForSelf
-                    let user = await getTokenUserForSelf(token)
+                    //getAndVerifyAppTokenUser
+                    let user = await getAndVerifyAppTokenUser(token, 'syncAndReplaceApis')
 
                     //check
                     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',
@@ -29,13 +30,13 @@ let opt = {
 
 }
 
-let getUserByToken = (token) => {
+let getUserByToken = async (token) => {
     // return {} //測試無法登入
     if (token === '{token-for-application}') { //提供外部應用系統作為存取使用者
         return {
             id: 'id-for-application',
             name: 'application',
-            email: 'admin@example.com',
+            email: 'application@example.com',
             isAdmin: 'y',
         }
     }
@@ -52,13 +53,22 @@ let getUserByToken = (token) => {
     return {}
 }
 
-let verifyUser = (user) => {
-    console.log('於生產環境時得加入驗證user機制')
+let verifyBrowserUser = (user, caller) => {
+    console.log('verifyBrowserUser/user', user)
+    // return false //測試無法登入
+    console.log('於生產環境時得加入限制瀏覽器使用者身份機制')
+    return user.isAdmin === 'y' //測試僅系統管理者使用
+}
+
+let verifyAppUser = (user, caller) => {
+    console.log('verifyAppUser/user', user)
+    // return false //測試無法登入
+    console.log('於生產環境時得加入限制應用程式使用者身份機制')
     return user.isAdmin === 'y' //測試僅系統管理者使用
 }
 
 //WWebApi
-let instWWebApi = WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt)
+let instWWebApi = WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, opt)
 
 instWWebApi.on('error', (err) => {
     console.log(err)

package/tableTags-web-api.json

@@ -1 +1 @@
-{"apis":"fY7kYV"}
+{"apis":"6FtLVT"}