w-web-api 1.0.23 → 1.0.25

package/server/WWebApi.mjs

@@ -10,17 +10,19 @@ import iseobj from 'wsemi/src/iseobj.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
+import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
 import strleft from 'wsemi/src/strleft.mjs'
 import strdelleft from 'wsemi/src/strdelleft.mjs'
 import strright from 'wsemi/src/strright.mjs'
 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 replace from 'wsemi/src/replace.mjs'
 import WServHapiServer from 'w-serv-hapi/src/WServHapiServer.mjs'
-import ds from '../src/schema/index.mjs'
 import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
+import ds from '../src/schema/index.mjs'
 
 
 /**
@@ -30,11 +32,13 @@ import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
  * @param {Function} WOrm 輸入資料庫ORM函數
  * @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 {Object} [opt={}] 輸入設定物件，預設{}
  * @param {Integer} [opt.serverPort=11005] 輸入伺服器通訊port，預設11005
+ * @param {Boolean} [opt.bCheckUser=false] 輸入是否檢查使用者資訊布林值，預設false
  * @param {Function} [opt.getUserById=null] 輸入當bCheckUser=true時依照使用者ID取得使用者資訊物件函數，預設null
- * @param {Boolean} [opt.bCheckUser=true] 輸入是否檢查使用者資訊布林值，預設true
- * @param {Boolean} [opt.bExcludeWhenNotAdmin=true] 輸入使用ORM的select方法時是否自動刪除數據內isActive欄位之布林值，預設true
+ * @param {Boolean} [opt.bExcludeWhenNotAdmin=false] 輸入使用ORM的select方法時是否自動刪除數據內isActive欄位之布林值，預設false
  * @param {Object} [opt.webName={}] 輸入站台名稱物件，至少包含語系eng與cht鍵的名稱，預設{}
  * @param {Object} [opt.webDescription={}] 輸入站台描述物件，至少包含語系eng與cht鍵的名稱，預設{}
  * @param {String} [opt.webLogo=''] 輸入站台logo字串，採base64格式，預設''
@@ -75,7 +79,7 @@ import WServOrm from 'w-serv-orm/src/WServOrm.mjs'
  * })
  *
  */
-function WWebApi(WOrm, url, db, opt = {}) {
+function WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt = {}) {
     let instWServHapiServer = null
 
 
@@ -100,6 +104,20 @@ function WWebApi(WOrm, url, db, opt = {}) {
     }
 
 
+    //check getUserByToken
+    if (!isfun(getUserByToken)) {
+        console.log('invalid getUserByToken', getUserByToken)
+        throw new Error('invalid getUserByToken')
+    }
+
+
+    //check verifyUser
+    if (!isfun(verifyUser)) {
+        console.log('invalid verifyUser', verifyUser)
+        throw new Error('invalid verifyUser')
+    }
+
+
     //serverPort
     let serverPort = get(opt, 'serverPort')
     if (!ispint(serverPort)) {
@@ -170,9 +188,35 @@ function WWebApi(WOrm, url, db, opt = {}) {
     }
 
 
+    //verifyUserByToken
+    let verifyUserByToken = async (token) => {
+
+        //getUserByToken
+        let user = getUserByToken(token)
+        if (ispm(user)) {
+            user = await user
+        }
+        if (!iseobj(user)) {
+            return Promise.reject(`token does not have permission`)
+        }
+
+        //verifyUser
+        let b = verifyUser(user)
+        if (ispm(b)) {
+            b = await b
+        }
+
+        //check
+        if (!b) {
+            return Promise.reject(`user does not have permission`)
+        }
+
+        return user
+    }
+
     //getAPIsList
-    let getAPIsList = async (userId, token) => {
-        let rs = await woItems.apis.select()
+    let getAPIsList = async (query = {}) => {
+        let rs = await woItems.apis.select(query)
         return rs
     }
 
@@ -222,7 +266,7 @@ function WWebApi(WOrm, url, db, opt = {}) {
 
 
     //updateAPIs
-    let updateAPIs = async (userId, params = {}) => {
+    let updateAPIs = async (params = {}) => {
 
         //spread params
         let { apis: rsApis } = params
@@ -237,7 +281,7 @@ function WWebApi(WOrm, url, db, opt = {}) {
 
 
     //replaceAPIsByLevels
-    let replaceAPIsByLevels = async (userId, params = {}) => {
+    let replaceAPIsByLevels = async (params = {}) => {
 
         //spread params
         let { group, apis: rsApis } = params
@@ -266,11 +310,17 @@ function WWebApi(WOrm, url, db, opt = {}) {
     //subfolder
     let fnEntryIn = 'index.tmp'
     let fnEntryOut = 'index.html'
-    let fpEntryIn = path.resolve(pathStaticFiles, fnEntryIn)
-    let fpEntryOut = path.resolve(pathStaticFiles, fnEntryOut)
-    let c = fs.readFileSync(fpEntryIn, 'utf8')
-    c = replace(c, '{sfd}', subfolder)
-    fs.writeFileSync(fpEntryOut, c, 'utf8')
+    try {
+        let fpEntryIn = path.resolve(pathStaticFiles, fnEntryIn)
+        let fpEntryOut = path.resolve(pathStaticFiles, fnEntryOut)
+        let c = fs.readFileSync(fpEntryIn, 'utf8')
+        c = replace(c, '{sfd}', subfolder)
+        fs.writeFileSync(fpEntryOut, c, 'utf8')
+    }
+    catch (err) {
+        console.log(err)
+        console.log(`can not generate ${fnEntryOut}`)
+    }
 
 
     //apis
@@ -293,16 +343,53 @@ function WWebApi(WOrm, url, db, opt = {}) {
                 return getWebInfor()
             },
         },
+        {
+            method: 'GET',
+            path: '/api/getUserByToken', //未登入界面需先檢測token是否為系統管理員, 確認後回傳為系統管理員資訊物件, getUserByToken為w-ui-loginout預設值, 若要更改兩邊須同時修改
+            handler: async function (req, res) {
+                // console.log('getUserByToken', req)
+
+                async function core() {
+
+                    //token
+                    let token = get(req, 'query.token', '')
+
+                    //verifyUserByToken
+                    let user = await verifyUserByToken(token)
+
+                    return user
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)() //w-ui-loginout接收已預設格式用pm2resolve轉過, 會提取state進行判斷
+                // console.log('getUserByToken', r)
+
+                return r
+            },
+        },
         {
             method: 'GET',
             path: '/getAPIsList',
             handler: async function (req, res) {
+                // console.log('getAPIsList', req)
+
+                async function core() {
+
+                    //token
+                    let token = get(req, 'query.token', '')
+
+                    //verifyUserByToken
+                    await verifyUserByToken(token)
 
-                //token
-                let token = get(req, 'query.token', '')
+                    //getAPIsList
+                    let r = await getAPIsList({ isActive: 'y' })
 
-                //getAPIsList
-                let r = await getAPIsList('', token)
+                    return r
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)()
+                // console.log('verifyIdentity', r)
 
                 return r
             },
@@ -311,14 +398,29 @@ function WWebApi(WOrm, url, db, opt = {}) {
             method: 'POST',
             path: '/updateAPIs',
             handler: async function (req, res) {
-                // console.log(req, res)
+                // console.log('updateAPIs', req)
                 // console.log('payload', req.payload)
 
-                //parsePayload
-                let inp = parsePayload(req)
+                async function core() {
+
+                    //token
+                    let token = get(req, 'query.token', '')
+
+                    //verifyUserByToken
+                    await verifyUserByToken(token)
+
+                    //parsePayload
+                    let inp = parsePayload(req)
+
+                    //updateAPIs
+                    let r = await updateAPIs(inp)
+
+                    return r
+                }
 
-                //updateAPIs
-                let r = await updateAPIs('', inp)
+                //pm2resolve core
+                let r = await pm2resolve(core)()
+                // console.log('verifyIdentity', r)
 
                 return r
             },
@@ -327,14 +429,29 @@ function WWebApi(WOrm, url, db, opt = {}) {
             method: 'POST',
             path: '/replaceAPIsByLevels',
             handler: async function (req, res) {
-                // console.log(req, res)
+                // console.log('replaceAPIsByLevels', req)
                 // console.log('payload', req.payload)
 
-                //parsePayload
-                let inp = parsePayload(req)
+                async function core() {
 
-                //replaceAPIsByLevels
-                let r = await replaceAPIsByLevels('', inp)
+                    //token
+                    let token = get(req, 'query.token', '')
+
+                    //verifyUserByToken
+                    await verifyUserByToken(token)
+
+                    //parsePayload
+                    let inp = parsePayload(req)
+
+                    //replaceAPIsByLevels
+                    let r = await replaceAPIsByLevels(inp)
+
+                    return r
+                }
+
+                //pm2resolve core
+                let r = await pm2resolve(core)()
+                // console.log('verifyIdentity', r)
 
                 return r
             },
@@ -356,7 +473,7 @@ function WWebApi(WOrm, url, db, opt = {}) {
         pathStaticFiles,
         apis,
         getUserIDFromToken: async (token) => { //可使用async或sync函數
-            return 'id-for-admin'
+            return ''
         },
         useDbORM: true,
         dbORMs: woItems,
@@ -366,7 +483,9 @@ function WWebApi(WOrm, url, db, opt = {}) {
         tableNamesSync,
         extFuncs: { //接收參數第1個為userId, 之後才是前端給予參數
             getWebInfor,
-            getAPIsList,
+            getAPIsList: (userId, query = {}) => {
+                return getAPIsList(query)
+            },
             //...
         },
         hookBefores: null,

package/src/App.vue

@@ -4,6 +4,8 @@
         @domresize="resize"
     >
 
+        <LayoutState :style="`opacity:${ready?0:1};`" v-if="!ready"></LayoutState>
+
         <transition enter-active-class="fade-enter-active" leave-active-class="fade-leave-active">
             <Layout v-if="ready"></Layout>
         </transition>
@@ -12,30 +14,64 @@
 </template>
 
 <script>
-// import get from 'lodash/get'
-// import find from 'lodash/find'
+import get from 'lodash/get'
+import cloneDeep from 'lodash/cloneDeep'
+import wui from 'w-ui-loginout/src/WUiLoginout.mjs'
 import Layout from './components/Layout.vue'
+import LayoutState from './components/LayoutState.vue'
 
 
 export default {
     components: {
         Layout,
+        LayoutState,
     },
     data: function() {
         return {
-
-            ready: true,
-
+            ll: null,
         }
     },
-    mounted: function() {
-        // console.log('mounted')
+    beforeMount: function() {
+        // console.log('methods beforeMount')
 
         let vo = this
 
         //setVo, 更換ui內vo, 才能使用廣播技術, 更換語系才能用廣播通知全部組件forceUpdate
         vo.$ui.setVo(vo)
 
+        function loginSuccess(data) {
+            console.log('login success', cloneDeep(data.user))
+            vo.$ui.updateConnState('已連線')
+            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.updateUserToken('')
+            vo.$ui.updateUserSelf(get(vo, `$store.state.userDef`))
+        }
+
+        //login
+        console.log('login...')
+        let ll = wui('wperm')
+        ll.login({
+            afterGetUser: null,
+            afterLogin: null,
+            loginSuccess,
+            loginError,
+        })
+        vo.ll = ll
+
+    },
+    computed: {
+
+        ready: function() {
+            let connState = get(this, `$store.state.connState`)
+            return connState === '已連線'
+        },
+
     },
     methods: {
 

package/src/components/LayoutState.vue

@@ -0,0 +1,87 @@
+<template>
+    <div
+        :style="`position:absolute; top:0px; left:0px; width:100%; height:100%; transition:all 0.5s linear; display:flex; align-items:center; justify-content:center;`"
+    >
+
+        <template v-if="connState==='已連線' || connState==='連線中...'">
+
+            <img src="../../public/connecting.svg">
+
+            <div style="margin-left:10px;">
+                <div style="color:#aaa;">
+                    {{connState}}
+                </div>
+            </div>
+
+        </template>
+
+        <template v-else-if="connState==='已登出'">
+
+            <img style="width:75px; height:75px;" src="../../public/logout.png">
+
+            <div style="margin-left:10px;">
+                <div style="color:#aaa;">
+                    {{connState}}
+                </div>
+            </div>
+
+        </template>
+
+        <template v-else-if="connState==='無法連線'">
+
+            <img style="width:75px; height:75px;" src="../../public/disconnect.png">
+
+            <div style="margin-left:10px;">
+                <div style="color:#aaa;">
+                    {{connState}}
+                </div>
+            </div>
+
+        </template>
+
+        <template v-else>
+
+            <img style="width:75px; height:75px;" src="../../public/deny.png">
+
+            <div style="margin-left:10px;">
+                <div style="color:#aaa;">
+                    {{connState}}
+                </div>
+            </div>
+
+        </template>
+
+    </div>
+</template>
+
+<script>
+import get from 'lodash/get'
+
+
+export default {
+    components: {
+    },
+    props: {
+    },
+    data: function() {
+        return {
+        }
+    },
+    computed: {
+
+        connState: function() {
+            //console.log('computed loading')
+
+            let vo = this
+
+            return get(vo, `$store.state.connState`)
+        },
+
+    },
+    methods: {
+    }
+}
+</script>
+
+<style scoped>
+</style>

package/src/main.js

@@ -56,12 +56,15 @@ Vue.directive('domdragdrop', domDragDrop())
 //WServHapiClient
 let bFirstSync = false
 WServHapiClient({
+    showLog: false,
     getUrl: () => {
         return window.location.origin + window.location.pathname
     },
-    useWaitToken: false,
+    useWaitToken: true,
     getToken: () => {
-        return get(Vue.prototype, `$store.state.userToken`, '')
+        let token = get(Vue.prototype, `$store.state.userToken`, '')
+        // console.log('getToken', token)
+        return token
     },
     getServerMethods: (_fapi) => {
         console.log('$fapi', _fapi)

package/src/plugins/mUI.mjs

@@ -67,6 +67,16 @@ function updateViewState(viewState) {
 }
 
 
+function updateUserToken(userToken) {
+    vo.$store.commit(vo.$store.types.UpdateUserToken, userToken)
+}
+
+
+function updateUserSelf(userSelf) {
+    vo.$store.commit(vo.$store.types.UpdateUserSelf, userSelf)
+}
+
+
 function forceUpdate() {
     // console.log('call forceUpdate')
 
@@ -200,6 +210,8 @@ let mUI = {
     updateConnState,
     updateLoading,
     updateViewState,
+    updateUserToken,
+    updateUserSelf,
     forceUpdate,
 
     setLang,

package/src/store/mutations.mjs

@@ -1,9 +1,20 @@
 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 = {
 
@@ -24,12 +35,8 @@ let state = {
     menu: {}, //初始值需為物件, 否則LayoutContent會取menu.key出錯
 
     userToken: '',
-    userSelf: {
-        id: 'id-for-admin',
-        name: '系統管理員',
-        email: 'admin@email.com',
-        isAdmin: true,
-    },
+    userDef: cloneDeep(userDef),
+    userSelf: cloneDeep(userDef),
 
     lang: 'cht',
     keyLangs: {

package/srv.mjs

@@ -10,8 +10,8 @@ let url = `mongodb://${st.dbUsername}:${st.dbPassword}@${st.dbIP}:${st.dbPort}`
 let db = st.dbName
 let opt = {
 
-    getUserById: null,
     bCheckUser: false,
+    getUserById: null,
     bExcludeWhenNotAdmin: false,
 
     serverPort: 11005,
@@ -29,8 +29,27 @@ let opt = {
 
 }
 
+let getUserByToken = (token) => {
+    console.log('getUserByToken token', token)
+    // return {} //測試無法登入條件
+    if (token !== 'sys') {
+        return {}
+    }
+    return {
+        id: 'id-for-admin',
+        name: '測試者',
+        email: 'admin@example.com',
+        isAdmin: 'y',
+    }
+}
+
+let verifyUser = (user) => {
+    return user.isAdmin === 'y'
+}
+
+
 //WWebApi
-let instWWebApi = WWebApi(WOrm, url, db, opt)
+let instWWebApi = WWebApi(WOrm, url, db, getUserByToken, verifyUser, opt)
 
 instWWebApi.on('error', (err) => {
     console.log(err)

package/tableTags-web-api.json

@@ -1 +1 @@
-{"apis":"zv3kI4"}
+{"apis":"mUjGag"}