w-web-api 1.0.38 → 1.0.40

package/server/WWebApi.mjs

@@ -8,6 +8,7 @@ import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
+import isErr from 'wsemi/src/isErr.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
 import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
@@ -30,10 +31,10 @@ import ds from '../src/schema/index.mjs'
  *
  * @class
  * @param {Function} WOrm 輸入資料庫ORM函數
- * @param {String} url 輸入資料庫連線字串，例如'mongodb://sername:password@$127.0.0.1:27017'
+ * @param {String} url 輸入資料庫連線字串，例如w-orm-lmdb為'./db'，或w-orm-mongodb為'mongodb://username: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 {Object} [opt={}] 輸入設定物件，預設{}
  * @param {Integer} [opt.serverPort=11005] 輸入伺服器通訊port，預設11005
@@ -48,7 +49,7 @@ import ds from '../src/schema/index.mjs'
  * @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 WOrm from 'w-orm-lmdb/src/WOrmLmdb.mjs'
  * import WWebApi from './server/WWebApi.mjs'
  * import getSettings from './g.getSettings.mjs'
  *
@@ -56,7 +57,7 @@ import ds from '../src/schema/index.mjs'
  * //st
  * let st = getSettings()
  *
- * let url = `mongodb://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}` //使用Mongodb測試
+ * let url = st.dbUrl
  * let db = st.dbName
  * let opt = {
  *
@@ -103,14 +104,14 @@ import ds from '../src/schema/index.mjs'
  *     return {}
  * }
  *
- * let verifyBrowserUser = (user, caller) => {
- *     console.log('verifyBrowserUser/user', user)
+ * let verifyClientUser = (user, from) => {
+ *     console.log('verifyClientUser/user', user)
  *     // return false //測試無法登入
  *     console.log('於生產環境時得加入限制瀏覽器使用者身份機制')
  *     return user.isAdmin === 'y' //測試僅系統管理者使用
  * }
  *
- * let verifyAppUser = (user, caller) => {
+ * let verifyAppUser = (user, from) => {
  *     console.log('verifyAppUser/user', user)
  *     // return false //測試無法登入
  *     console.log('於生產環境時得加入限制應用程式使用者身份機制')
@@ -118,14 +119,14 @@ import ds from '../src/schema/index.mjs'
  * }
  *
  * //WWebApi
- * let instWWebApi = WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, opt)
+ * let instWWebApi = WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, opt)
  *
  * instWWebApi.on('error', (err) => {
  *     console.log(err)
  * })
  *
  */
-function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser, opt = {}) {
+function WWebApi(WOrm, url, db, getUserByToken, verifyClientUser, verifyAppUser, opt = {}) {
     let instWServHapiServer = null
 
 
@@ -157,10 +158,10 @@ function WWebApi(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')
     }
 
 
@@ -245,6 +246,37 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
     }
 
 
+    //checkUser
+    let checkUser = async(user) => {
+        let id = get(user, 'id', '')
+        if (!isestr(id)) {
+            console.log('user', user)
+            console.log('can not get the userId')
+            return Promise.reject(`can not get the userId`)
+        }
+        let email = get(user, 'email', '')
+        if (!isestr(email)) {
+            console.log('user', user)
+            console.log('can not get the email of user')
+            return Promise.reject(`can not get the email of user`)
+        }
+        let name = get(user, 'name', '')
+        if (!isestr(name)) {
+            console.log('user', user)
+            console.log('can not get userName')
+            return Promise.reject(`can not get userName`)
+        }
+        let isAdmin = get(user, 'isAdmin', '')
+        if (isAdmin !== 'y' && isAdmin !== 'n') {
+            console.log('user', user)
+            console.log('user.isAdmin is not y or n', user.isAdmin)
+            console.log('can not get the role of user')
+            return Promise.reject(`can not get the role of user`)
+        }
+        return true
+    }
+
+
     //getTokenUser
     let getTokenUser = async (token) => {
 
@@ -255,24 +287,43 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
         }
 
         //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`)
+        if (true) {
+            // 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`)
+            // }
+            await checkUser(userSelf)
         }
 
         return userSelf
     }
 
 
+    //p
+    let p = {
+        checkToken: async(token) => {
+
+            //getUserByToken
+            let u = await getUserByToken(token)
+            // console.log('u', u)
+
+            //checkUser
+            await checkUser(u)
+
+            return true
+        },
+    }
+
+
     //getAndVerifyBrowserTokenUser
-    let getAndVerifyBrowserTokenUser = async (token, caller = '') => {
+    let getAndVerifyBrowserTokenUser = async (token, from = '') => {
 
         //getTokenUser
         let userSelf = await getTokenUser(token)
 
-        //verifyBrowserUser
-        let b = verifyBrowserUser(userSelf, caller)
+        //verifyClientUser
+        let b = verifyClientUser(userSelf, from)
         if (ispm(b)) {
             b = await b
         }
@@ -289,13 +340,13 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
 
 
     //getAndVerifyAppTokenUser
-    let getAndVerifyAppTokenUser = async (token, caller = '') => {
+    let getAndVerifyAppTokenUser = async (token, from = '') => {
 
         //getTokenUser
         let userSelf = await getTokenUser(token)
 
         //verifyAppUser
-        let b = verifyAppUser(userSelf, caller)
+        let b = verifyAppUser(userSelf, from)
         if (ispm(b)) {
             b = await b
         }
@@ -486,13 +537,7 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
         //         return 'someAPI'
         //     },
         // },
-        {
-            method: 'GET',
-            path: '/getWebInfor',
-            handler: async function (req, res) {
-                return getWebInfor()
-            },
-        },
+
         {
             method: 'GET',
             path: '/api/getUserByToken', //未登入界面需先檢測token是否為系統管理員, 確認後回傳為系統管理員資訊物件, getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
@@ -520,6 +565,9 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
 
                 //pm2resolve core
                 let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 會提取state進行判斷
+                if (isErr(r.msg)) {
+                    r.msg = r.msg.message
+                }
                 // console.log('getUserByToken', r)
 
                 return r
@@ -555,7 +603,10 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
 
                 //pm2resolve core
                 let r = await pm2resolve(core)()
-                // console.log('verifyIdentity', r)
+                if (isErr(r.msg)) {
+                    r.msg = r.msg.message
+                }
+                // console.log('getAPIsList', r)
 
                 return r
             },
@@ -594,7 +645,10 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
 
                 //pm2resolve core
                 let r = await pm2resolve(core)()
-                // console.log('verifyIdentity', r)
+                if (isErr(r.msg)) {
+                    r.msg = r.msg.message
+                }
+                // console.log('updateAPIs', r)
 
                 return r
             },
@@ -633,7 +687,10 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
 
                 //pm2resolve core
                 let r = await pm2resolve(core)()
-                // console.log('verifyIdentity', r)
+                if (isErr(r.msg)) {
+                    r.msg = r.msg.message
+                }
+                // console.log('syncAndReplaceApis', r)
 
                 return r
             },
@@ -653,7 +710,30 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
     instWServHapiServer = new WServHapiServer({
         port: opt.serverPort,
         pathStaticFiles,
+        apiName: 'api',
         apis,
+        tokenType: 'Bearer',
+        verifyConn: async ({ apiType, authorization, query, headers, req }) => {
+            // console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
+
+            //token
+            let token = strdelleft(authorization, 7) //刪除Bearer
+            // console.log('token', token)
+
+            //check
+            if (!isestr(token)) {
+                console.log('apiType', apiType)
+                console.log('authorization', authorization)
+                console.log('invalid token')
+                return false
+            }
+
+            //checkToken
+            let b = await p.checkToken(token)
+            // console.log('b', b)
+
+            return b
+        },
         getUserIdByToken: async (token) => { //可使用async或sync函數
             // console.log('getUserIdByToken', token)
             return ''
@@ -673,11 +753,17 @@ function WWebApi(WOrm, url, db, getUserByToken, verifyBrowserUser, verifyAppUser
         methodsExec: ['select', 'insert', 'save', 'del'], //mix需於procOrm內註冊以提供
         tableNamesSync,
         kpFunExt: { //接收參數第1個為userId, 之後才是前端給予參數
+
             getWebInfor,
+
             getAPIsList: (userId, query = {}) => {
                 return getAPIsList(query)
             },
-            //...
+
+            // updateApis: (userId, rows) => {
+            //     return updateApis(rows)
+            // },
+
         },
         fnTableTags: 'tableTags-web-api.json',
     })

package/src/App.vue

@@ -10,6 +10,11 @@
             <Layout v-if="ready"></Layout>
         </transition>
 
+<!--
+        <LoadingWinBar></LoadingWinBar>
+        <CheckYesNo></CheckYesNo>
+        <CheckYes></CheckYes> -->
+
     </div>
 </template>
 
@@ -17,6 +22,7 @@
 import get from 'lodash-es/get.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
 import isestr from 'wsemi/src/isestr.mjs'
+import iseobj from 'wsemi/src/iseobj.mjs'
 import isDev from 'wsemi/src/isDev.mjs'
 import wui from 'w-ui-loginout/src/WUiLoginout.mjs'
 import Layout from './components/Layout.vue'
@@ -41,16 +47,21 @@ export default {
         //setVo, 更換ui內vo, 才能使用廣播技術, 更換語系才能用廣播通知全部組件forceUpdate
         vo.$ui.setVo(vo)
 
+        //setLang
+        let lang = get(window, '___pmwperm___.language', '')
+        vo.$ui.setLang(lang, 'app init') //初始化先讀取html內語系設定進行變更
+        // console.log('lang', lang)
+
         function loginSuccess(data) {
             console.log('login success', cloneDeep(data.user))
-            vo.$ui.updateConnState('已連線')
+            vo.$ui.updateConnState('csLogin')
             vo.$ui.updateUserToken(data.token)
             vo.$ui.updateUserSelf(data.user)
         }
 
         function loginError(data) {
             console.log('login error', cloneDeep(data))
-            vo.$ui.updateConnState(data.text)
+            vo.$ui.updateConnState('csErrLogin')
             vo.$ui.updateUserToken('')
             let urlRedirect = get(window, '___pmwapi___.urlRedirect', '')
             if (!isestr(urlRedirect)) {
@@ -86,8 +97,18 @@ export default {
     computed: {
 
         ready: function() {
-            let connState = get(this, `$store.state.connState`)
-            return connState === '已連線'
+            //console.log('computed ready')
+
+            let vo = this
+
+            let connState = get(vo, `$store.state.connState`)
+            let webInfor = get(vo, `$store.state.webInfor`)
+
+            let b1 = connState === 'csLogin'
+            let b2 = iseobj(webInfor)
+            let b = b1 && b2
+
+            return b
         },
 
     },

package/src/components/Layout.vue

@@ -16,7 +16,7 @@
                 <div style="display:flex; align-items:center;">
 
                     <div style="padding-right:10px; display:flex; align-items:center;" v-if="webLogo">
-                        <img style="width:36px; height:36px;" :src="webLogo" />
+                        <img style="width:36px; _min-width:36px; height:36px;" :src="webLogo" />
                     </div>
 
                     <div>
@@ -29,13 +29,23 @@
 
             <div style="width:100%;"></div>
 
-            <div style="padding-right:10px; white-space:nowrap">
+            <div
+                style="padding-right:10px; white-space:nowrap;"
+                v-if="showLangSelect"
+            >
                 <WTextSelect
                     style="width:100px;"
-                    :items="tgLangs"
-                    v-model="tgLangSelect"
-                    @input="changeLang"
-                ></WTextSelect>
+                    :items="keysLang"
+                    :value="lang"
+                    @input="toggleLang"
+                >
+                    <template v-slot:select="props">
+                        {{getLangText(props.item)}}
+                    </template>
+                    <template v-slot:item="props">
+                        {{getLangText(props.item)}}
+                    </template>
+                </WTextSelect>
             </div>
 
         </div>
@@ -70,30 +80,37 @@ export default {
 
             drawer: false, //null,
 
-            tgLangs: [
-                {
-                    id: 'cht',
-                    text: '中文',
-                },
-                {
-                    id: 'eng',
-                    text: 'English',
-                },
+            firstSetting: true,
+
+            showLangSelect: false,
+
+            keysLang: [
+                'eng',
+                'cht',
             ],
-            tgLangSelect: {
-                id: 'cht',
-                text: '中文',
+            kpLangSelect: {
+                'eng': 'English',
+                'cht': '中文',
             },
 
         }
     },
-    beforeMount: function() {
-        // console.log('beforeMount')
+    mounted: function() {
+        // console.log('mounted')
 
         let vo = this
 
-        //setLang
-        vo.$ui.setLang(vo.tgLangSelect.id)
+        //firstSetting
+        if (vo.firstSetting) {
+            // console.log('webInfor', vo.webInfor)
+            let showLanguage = get(vo, 'webInfor.showLanguage', '')
+            // console.log('showLanguage', showLanguage)
+            vo.showLangSelect = showLanguage === 'y'
+            let language = get(vo, 'webInfor.language', '')
+            // console.log('language', language)
+            vo.$ui.setLang(language, 'layout mounted')
+            vo.firstSetting = false
+        }
 
     },
     computed: {
@@ -138,11 +155,24 @@ export default {
     },
     methods: {
 
-        changeLang: function(msg) {
-            // console.log('methods changeLang', msg)
+        getLangText: function(lang) {
+            // console.log('methods getLangText', lang)
+
+            let vo = this
+
+            let t = get(vo, `kpLangSelect.${lang}`, '')
+
+            return t
+        },
+
+        toggleLang: function(lang) {
+            // console.log('methods toggleLang', lang)
+
             let vo = this
-            let lang = msg.id
-            vo.$ui.setLang(lang)
+
+            //setLang
+            vo.$ui.setLang(lang, 'toggle')
+
         },
 
     }

package/src/components/LayoutContent.vue

@@ -1,9 +1,9 @@
 <template>
     <div
         style="height:100%; width:100%;"
-        :changeApis="changeApis"
         v-domresize
         @domresize="resize"
+        :changeApis="changeApis"
     >
 
         <template v-if="syncState">
@@ -25,47 +25,55 @@
                 <template v-slot:drawer="props">
                     <div :style="`height:${props.height}px; background:#fff; position:relative;`">
 
-                        <WTree
-                            :style="`height:${props.height}px;`"
-                            :viewHeightMax="props.height"
-                            :data="apisTree"
-                            :iconHeight="lineHeightTree"
-                            :defItemHeight="lineHeightTree"
-                            :activable="true"
-                            :itemActive="apiActive"
-                            :funActive="funActive"
-                            :itemTextColorActive="'#000'"
-                            :itemBackgroundColorActive ="'rgba(100,100,100,0.15)'"
-                        >
-                            <template v-slot:item="props">
+                        <template v-if="apisTree.length>0">
+                            <WTree
+                                :style="`height:${props.height}px;`"
+                                :viewHeightMax="props.height"
+                                :data="apisTree"
+                                :iconHeight="lineHeightTree"
+                                :defItemHeight="lineHeightTree"
+                                :activable="true"
+                                :itemActive="apiActive"
+                                :funActive="funActive"
+                                :itemTextColorActive="'#000'"
+                                :itemBackgroundColorActive ="'rgba(100,100,100,0.15)'"
+                            >
+                                <template v-slot:item="props">
 
-                                <div
-                                    :style="`display:flex; align-items:center; min-height:${lineHeightTree}px;`"
-                                    v-if="props.data.type!=='node'"
-                                >
-                                    {{props.data.key}}
-                                </div>
+                                    <div
+                                        :style="`display:flex; align-items:center; min-height:${lineHeightTree}px;`"
+                                        v-if="props.data.type!=='node'"
+                                    >
+                                        {{props.data.key}}
+                                    </div>
 
-                                <div
-                                    :style="`display:flex; align-items:center; min-height:${lineHeightTree}px; cursor:pointer;`"
-                                    @click="ckItem(getItemByKey(props.data.text))"
-                                    v-else
-                                >
+                                    <div
+                                        :style="`display:flex; align-items:center; min-height:${lineHeightTree}px; cursor:pointer;`"
+                                        @click="ckItem(getItemByKey(props.data.text))"
+                                        v-else
+                                    >
 
-                                    <div style="padding-right:5px;">
-                                        <div :style="`padding:0px 6px; font-size:0.7rem; border-radius:10px; border:1px solid #ddd; color:#fff; background:${getMethodColorByKey(props.data.text)};`">
-                                            {{getMethodByKey(props.data.text)}}
+                                        <div style="padding-right:5px;">
+                                            <div :style="`padding:0px 6px; font-size:0.7rem; border-radius:10px; border:1px solid #ddd; color:#fff; background:${getMethodColorByKey(props.data.text)};`">
+                                                {{getMethodByKey(props.data.text)}}
+                                            </div>
                                         </div>
-                                    </div>
 
-                                    <div>
-                                        {{$ui.gv(getItemByKey(props.data.text),'name')}}
-                                    </div>
+                                        <div>
+                                            {{$ui.gv(getItemByKey(props.data.text),'name')}}
+                                        </div>
 
-                                </div>
+                                    </div>
 
-                            </template>
-                        </WTree>
+                                </template>
+                            </WTree>
+                        </template>
+                        <div
+                            style="padding:20px; font-size:0.9rem;"
+                            v-else
+                        >
+                            {{$t('waitingData')}}
+                        </div>
 
                         <div
                             :style="`position:absolute; top:1px; right:12px;`"
@@ -405,6 +413,7 @@
 import get from 'lodash-es/get.js'
 import set from 'lodash-es/set.js'
 import each from 'lodash-es/each.js'
+import size from 'lodash-es/size.js'
 import trim from 'lodash-es/trim.js'
 import find from 'lodash-es/find.js'
 import cloneDeep from 'lodash-es/cloneDeep.js'
@@ -522,9 +531,16 @@ export default {
             let vo = this
 
             //default
+            vo.apiActive = null
+            vo.apiSelect = null
             vo.apisTree = []
             vo.kpApisTree = {}
 
+            //check
+            if (size(vo.apis) === 0) {
+                return
+            }
+
             //cloneDeep
             let apis = cloneDeep(vo.apis)
             // console.log('apis', cloneDeep(apis))
@@ -554,8 +570,6 @@ export default {
             let tree = convertToTree(tr, { bindRoot: '全部' })
             // console.log('tree', cloneDeep(tree))
 
-            //filepathToTree
-
             //apiSelect, 預先選定api項目, 非tree選單active物件, 因id由convertToTree轉換提供, 故不能直接算得active選單物件id
             let apiSelect = get(apis, 0, null)
             // console.log('apiSelect', cloneDeep(apiSelect))