w-web-api 1.0.22 → 1.0.24

package/docs/scripts/collapse.js

@@ -1,15 +1,34 @@
 function hideAllButCurrent(){
     //by default all submenut items are hidden
     //but we need to rehide them for search
+    document.querySelectorAll("nav > ul").forEach(function(parent) {
+        if (parent.className.indexOf("collapse_top") !== -1) {
+            parent.style.display = "none";
+        }
+    });
     document.querySelectorAll("nav > ul > li > ul li").forEach(function(parent) {
         parent.style.display = "none";
     });
+    document.querySelectorAll("nav > h3").forEach(function(section) {
+        if (section.className.indexOf("collapsed_header") !== -1) {
+            section.addEventListener("click", function(){
+                if (section.nextSibling.style.display === "none") {
+                    section.nextSibling.style.display = "block";
+                } else {
+                    section.nextSibling.style.display = "none";
+                }
+            });
+        }
+    });
     
     //only current page (if it exists) should be opened
     var file = window.location.pathname.split("/").pop().replace(/\.html/, '');
     document.querySelectorAll("nav > ul > li > a").forEach(function(parent) {
         var href = parent.attributes.href.value.replace(/\.html/, '');
         if (file === href) {
+            if (parent.parentNode.parentNode.className.indexOf("collapse_top") !== -1) {
+                parent.parentNode.parentNode.style.display = "block";
+            }
             parent.parentNode.querySelectorAll("ul li").forEach(function(elem) {
                 elem.style.display = "block";
             });

package/docs/scripts/commonNav.js

@@ -0,0 +1,28 @@
+if (typeof fetch === 'function') {
+  const init = () => {
+    if (typeof scrollToNavItem !== 'function') return false
+    scrollToNavItem()
+    // hideAllButCurrent not always loaded
+    if (typeof hideAllButCurrent === 'function') hideAllButCurrent()
+    return true
+  }
+  fetch('./nav.inc.html')
+    .then(response => response.ok ? response.text() : `${response.url} => ${response.status} ${response.statusText}`)
+    .then(body => {
+      document.querySelector('nav').innerHTML += body
+      // nav.js should be quicker to load than nav.inc.html, a fallback just in case
+      return init()
+    })
+    .then(done => {
+      if (done) return
+      let i = 0
+      ;(function waitUntilNavJs () {
+        if (init()) return
+        if (i++ < 100) return setTimeout(waitUntilNavJs, 300)
+        console.error(Error('nav.js not loaded after 30s waiting for it'))
+      })()
+    })
+    .catch(error => console.error(error))
+} else {
+  console.error(Error('Browser too old to display commonNav (remove commonNav docdash option)'))
+}

package/docs/scripts/search.js

@@ -33,6 +33,9 @@ document.getElementById("nav-search").addEventListener("keyup", function(event)
         document.querySelectorAll("nav > ul > li").forEach(function(elem) {
             elem.style.display = "block";
         });
+        document.querySelectorAll("nav > ul").forEach(function(elem) {
+            elem.style.display = "block";
+        });
         //hide all results
         document.querySelectorAll("nav > ul > li > ul li").forEach(function(elem) {
             elem.style.display = "none";
@@ -79,5 +82,18 @@ document.getElementById("nav-search").addEventListener("keyup", function(event)
                 parent.style.display = "none";
             }
         });
+        document.querySelectorAll("nav > ul.collapse_top").forEach(function(parent) {
+            var countVisible = 0;
+            parent.querySelectorAll("li").forEach(function(elem) {
+                if (elem.style.display !== "none") {
+                    countVisible++;
+                }
+            });
+          
+            if (countVisible == 0) {
+                //has no child at all and does not contain text
+                parent.style.display = "none";
+            }
+        });
     }
 });

package/docs/styles/jsdoc.css

@@ -162,12 +162,19 @@ h6 {
 }
 
 
-tt, code, kbd, samp {
+tt, code, kbd, samp, pre {
   font-family: Consolas, Monaco, 'Andale Mono', monospace;
   background: #f4f4f4;
+}
+
+tt, code, kbd, samp{
   padding: 1px 5px;
 }
 
+pre {
+  padding-bottom: 1em;
+}  
+
 .class-description {
   font-size: 130%;
   line-height: 140%;
@@ -242,6 +249,10 @@ nav h3 {
   color: #000;
 }
 
+nav h3.collapsed_header {
+  cursor: pointer;
+}
+
 nav ul {
   font-family: 'Lucida Grande', 'Lucida Sans Unicode', arial, sans-serif;
   font-size: 100%;
@@ -762,4 +773,4 @@ html[data-search-mode] .level-hide {
     font-weight: 300;
     font-style: normal;
 
-}
+}

package/docs/styles/prettify.css

@@ -76,4 +76,5 @@
 ol.linenums {
   margin-top: 0;
   margin-bottom: 0;
+  padding-bottom: 2px;
 }

package/g.getSettings.mjs

@@ -8,7 +8,7 @@ function getSettings() {
         'dbUsername': 'username',
         'dbPassword': 'password',
         'dbName': 'wapis',
-        'dbIP': 'localhost',
+        'dbIP': '127.0.0.1',
         'dbPort': 27017,
     }
 }

package/package.json

@@ -1,40 +1,40 @@
 {
   "name": "w-web-api",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "main": "dist/w-web-api.umd.js",
   "dependencies": {
-    "@mdi/js": "^7.1.96",
-    "axios": "^1.2.3",
+    "@mdi/js": "^7.2.96",
+    "axios": "^1.3.4",
     "lodash": "^4.17.21",
     "showdown": "^2.1.0",
-    "w-component-vue": "^2.2.64",
-    "w-data-collector": "^1.0.15",
-    "w-serv-hapi": "^1.0.10",
-    "w-serv-orm": "^1.0.4",
-    "wsemi": "^1.6.89"
+    "w-component-vue": "^2.3.0",
+    "w-data-collector": "^1.0.19",
+    "w-serv-hapi": "^1.0.11",
+    "w-serv-orm": "^1.0.7",
+    "w-ui-loginout": "^1.0.1",
+    "wsemi": "^1.7.12"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.13",
-    "@vue/cli-plugin-eslint": "^4.5.13",
-    "@vue/cli-service": "^4.5.13",
-    "eslint": "^7.26.0",
-    "eslint-config-standard": "^16.0.2",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "eslint": "^8.37.0",
+    "eslint-config-standard": "^17.0.0",
     "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-vue": "^7.9.0",
-    "sass": "^1.34.0",
-    "sass-loader": "^10.1.1",
+    "eslint-plugin-vue": "^9.10.0",
+    "sass": "^1.60.0",
+    "sass-loader": "^13.2.2",
     "vue": "^2.6.14",
-    "vue-cli-plugin-vuetify": "^2.4.8",
-    "vuetify": "^2.6.4",
-    "vuetify-loader": "^1.7.3",
+    "vue-cli-plugin-vuetify": "^2.5.8",
+    "vuetify": "^2.6.14",
+    "vuetify-loader": "^1.9.2",
     "vuex": "^3.6.2",
-    "w-orm-mongodb": "^1.1.27",
-    "w-package-tools": "^1.0.66"
+    "w-orm-mongodb": "^1.1.29",
+    "w-package-tools": "^1.0.69"
   },
   "scripts": {
     "serve": "vue-cli-service serve",

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是否為系統管理員, 確認後回傳為系統管理員資訊物件
+            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)()
+                // console.log('verifyIdentity', 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,86 @@
 </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,
+            // ready: true,
+            msg: '',
+
+            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 afterGetUser(u) {
+            // console.log('afterGetUser', u)
+
+            //isAdmin
+            let isAdmin = get(u, 'isAdmin', 'n')
+
+            //check
+            if (isAdmin !== 'y') {
+                let errTemp = {
+                    text: '非系統管理員',
+                    msg: 'user is not an administrator',
+                }
+                return Promise.reject(errTemp)
+            }
+
+        }
+
+        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,
+            afterLogin: null,
+            loginSuccess,
+            loginError,
+        })
+        vo.ll = ll
+
+    },
+    computed: {
+
+        ready: function() {
+            let connState = get(this, `$store.state.connState`)
+            return connState === '已連線'
+        },
+
     },
     methods: {
 

package/src/components/Layout.vue

@@ -31,6 +31,7 @@
 
             <div style="padding-right:10px; white-space:nowrap">
                 <WTextSelect
+                    style="width:100px;"
                     :items="tgLangs"
                     v-model="tgLangSelect"
                     @input="changeLang"