sumba 1.1.7 → 1.1.8

package/bajo/hook/dobo.sumba-contact-form@before-record-create.js

@@ -1,7 +1,7 @@
 const doboBeforeRecordCreate = {
   level: 1000,
   handler: async function (body, options = {}) {
-    const { get, isEmpty } = this.app.bajo.lib._
+    const { get, isEmpty } = this.lib._
     const user = get(options, 'req.user')
     if (user) {
       if (isEmpty(body.firstName)) body.firstName = user.firstName

package/bajo/hook/dobo.sumba-user@after-record-validation.js

@@ -1,6 +1,6 @@
 async function doboSumbaUserAfterRecordValidation (body, options) {
   const { isBcrypt, hash } = this.app.bajoExtra
-  const { has } = this.app.bajo.lib._
+  const { has } = this.lib._
 
   if (has(body, 'password') && !isBcrypt(body.password)) body.password = await hash(body.password, 'bcrypt')
   // if (has(body, 'token') && !isMd5(body.token)) body.token = await hash(body.token)

package/bajo/hook/dobo.sumba-user@before-record-validation.js

@@ -1,7 +1,7 @@
 import passwordRule from '../../lib/password-rule.js'
 
 async function doboSumbaUserBeforeRecordValidation (body, options = {}) {
-  const { set } = this.app.bajo.lib._
+  const { set } = this.lib._
   const password = await passwordRule.call(this, options.req)
   const rule = { password }
   set(options, 'validation.params.rule', rule)

package/bajo/hook/dobo@before-record-create.js

@@ -1,7 +1,7 @@
 const doboBeforeRecordCreate = {
   level: 1000,
   handler: async function (model, body, options = {}) {
-    const { get } = this.app.bajo.lib._
+    const { get } = this.lib._
     const { hasColumn } = this
     const { req } = options
 

package/bajo/hook/dobo@before-record-find.js

@@ -1,7 +1,7 @@
 const useAdmin = ['waibuAdmin']
 
 export async function rebuildFilter (model, filter, req) {
-  const { isEmpty, map, find, get } = this.app.bajo.lib._
+  const { isEmpty, map, find, get } = this.lib._
   const { hasColumn } = this
   filter.query = filter.query ?? {}
   const hasSiteId = await hasColumn('siteId', model)

package/dobo/feature/lat-lng.js

@@ -1,7 +1,7 @@
 import latLngHook from '../../lib/lat-lng-hook.js'
 
 async function latLng (opts = {}) {
-  const { merge } = this.app.bajo.lib._
+  const { merge } = this.lib._
   opts.fieldNameLat = opts.fieldNameLat ?? 'lat'
   opts.fieldNameLng = opts.fieldNameLng ?? 'lng'
   opts.scale = opts.scale ?? 5

package/dobo/feature/slug.js

@@ -2,7 +2,7 @@ import slug from 'slug'
 
 async function autoInc ({ schema, body, opts }) {
   const { recordFind } = this.app.dobo
-  const { set, last } = this.app.bajo.lib._
+  const { set, last } = this.lib._
   const query = set({}, opts.fieldName, { $regex: new RegExp('^' + body[opts.fieldName]) })
   const sort = set({}, opts.fieldName, -1)
   const options = { noHook: true, skipCache: true, thrownNotFound: false }
@@ -40,7 +40,7 @@ async function mainFn (opts = {}) {
     hook: {
       beforeCreate: async function ({ schema, body }) {
         const { error } = this.app.bajo
-        const { isEmpty, isString } = this.app.bajo.lib._
+        const { isEmpty, isString } = this.lib._
         if (isEmpty(body[opts.fieldName])) {
           if (isString(opts.fieldSource)) opts.fieldSource = [opts.fieldSource]
           const source = []

package/lib/check-iconset.js

@@ -1,5 +1,5 @@
 async function checkIconset (req, reply) {
-  const { get } = this.app.bajo.lib._
+  const { get } = this.lib._
 
   if (!req.site) return
   const globalIconset = get(this.app, 'waibuMpa.config.iconset.default')

package/lib/check-site-id.js

@@ -1,6 +1,6 @@
 async function mergeSetting (req) {
   const { defaultsDeep, parseObject } = this.app.bajo
-  const { trim, get, filter } = this.app.bajo.lib._
+  const { trim, get, filter } = this.lib._
   const { recordFind, recordGet } = this.app.dobo
   const defSetting = {}
   const nsSetting = {}
@@ -30,7 +30,7 @@ async function mergeSetting (req) {
 const omitted = ['status']
 
 async function checkSiteId (req, reply) {
-  const { omit } = this.app.bajo.lib._
+  const { omit } = this.lib._
   const { recordFind } = this.app.dobo
 
   if (!this.config.multiSite) {

package/lib/check-team.js

@@ -1,7 +1,7 @@
 import { pathsToCheck } from './check-user-id.js'
 
 async function mergeTeam (req) {
-  const { map, pick } = this.app.bajo.lib._
+  const { map, pick } = this.lib._
   const { recordFindAll } = this.app.dobo
   req.user.teams = []
   const query = { userId: req.user.id, siteId: req.site.id }
@@ -15,7 +15,7 @@ async function mergeTeam (req) {
 
 async function checkTeam (req, reply, source) {
   if (!req.user) return
-  const { map } = this.app.bajo.lib._
+  const { map } = this.lib._
   await mergeTeam.call(this, req)
   const paths = pathsToCheck.call(this, req, true)
   const teams = map(req.user.teams, 'alias')

package/lib/check-theme.js

@@ -1,5 +1,5 @@
 async function checkTheme (req, reply) {
-  const { get } = this.app.bajo.lib._
+  const { get } = this.lib._
 
   if (!req.site) return
   const globalTheme = get(this.app, 'waibuMpa.config.theme.default')

package/lib/check-user-id.js

@@ -1,5 +1,5 @@
 export function pathsToCheck (req, withHome) {
-  const { uniq, without } = this.app.bajo.lib._
+  const { uniq, without } = this.lib._
   const checks = uniq(without([req.routeOptions.url, req.url], undefined, null))
   /*
   if (withHome) {
@@ -12,7 +12,7 @@ export function pathsToCheck (req, withHome) {
 }
 
 async function setUser (req) {
-  const { get } = this.app.bajo.lib._
+  const { get } = this.lib._
   const id = get(req, 'session.user.id')
   if (!id) return
   try {
@@ -29,7 +29,7 @@ async function mergeSetting (req) {
 }
 
 async function checkUserId (req, reply, source) {
-  const { isEmpty, camelCase, get } = this.app.bajo.lib._
+  const { isEmpty, camelCase, get } = this.lib._
   const { routePath } = this.app.waibu
 
   const webApp = get(req, 'routeOptions.config.webApp', 'waibu')

package/lib/collect-routes.js

@@ -1,7 +1,7 @@
 export async function collect ({ type = '', handler, container, file, ns, dir }) {
   const { readConfig } = this.app.bajo
   const { routePath, routePathHandlers } = this.app.waibu
-  const { camelCase, find, isString, isEmpty } = this.app.bajo.lib._
+  const { camelCase, find, isString, isEmpty } = this.lib._
   const items = await readConfig(file, { ignoreError: true })
 
   for (let item of items) {
@@ -23,7 +23,7 @@ export async function collect ({ type = '', handler, container, file, ns, dir })
 }
 
 function handler (item) {
-  const { isString } = this.app.bajo.lib._
+  const { isString } = this.lib._
   for (const k of ['methods']) {
     item[k] = item[k] ?? []
     if (isString(item[k])) item[k] = item[k].split(',')

package/lib/collect-team.js

@@ -1,7 +1,7 @@
 import { collect } from './collect-routes.js'
 
 function handler (item) {
-  const { isString } = this.app.bajo.lib._
+  const { isString } = this.lib._
   for (const k of ['methods', 'teams', 'features']) {
     item[k] = item[k] ?? []
     if (isString(item[k])) item[k] = item[k].split(',')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {

package/plugin/factory.js

@@ -1,6 +1,6 @@
 async function getSetting (type, source) {
   const { defaultsDeep } = this.app.bajo
-  const { get } = this.app.bajo.lib._
+  const { get } = this.lib._
 
   const setting = defaultsDeep(get(this.config, `auth.${source}.${type}`, {}), get(this.config, `auth.common.${type}`, {}))
   if (type === 'basic') setting.type = 'Basic'
@@ -8,7 +8,7 @@ async function getSetting (type, source) {
 }
 
 async function getToken (type, req, source) {
-  const { isEmpty } = this.app.bajo.lib._
+  const { isEmpty } = this.lib._
 
   const setting = await getSetting.call(this, type, source)
   let token = req.headers[setting.headerKey.toLowerCase()]
@@ -113,7 +113,7 @@ async function factory (pkgName) {
 
     hasColumn = async (name, model) => {
       const { getInfo } = this.app.dobo
-      const { find } = this.app.bajo.lib._
+      const { find } = this.lib._
       const { schema } = getInfo(model)
 
       const result = find(schema.properties, { name })
@@ -122,7 +122,7 @@ async function factory (pkgName) {
 
     getUser = async (rec, safe = true) => {
       const { recordGet } = this.app.dobo
-      const { omit, isPlainObject } = this.app.bajo.lib._
+      const { omit, isPlainObject } = this.lib._
 
       let user
       if (isPlainObject(rec)) user = rec
@@ -149,9 +149,9 @@ async function factory (pkgName) {
 
     createJwtFromUserRecord = async (rec) => {
       const { importPkg } = this.app.bajo
-      const { dayjs } = this.app.bajo.lib
+      const { dayjs } = this.lib
       const { hash } = this.app.bajoExtra
-      const { get, pick } = this.app.bajo.lib._
+      const { get, pick } = this.lib._
 
       const fastJwt = await importPkg('bajoExtra:fast-jwt')
       const { createSigner } = fastJwt
@@ -208,10 +208,10 @@ async function factory (pkgName) {
     verifyBasic = async (req, reply, source) => {
       const { getUserFromUsernamePassword } = this
       const { getUser } = this
-      const { isEmpty } = this.app.bajo.lib._
+      const { isEmpty } = this.lib._
 
       const setHeader = async (setting, reply) => {
-        const { isString } = this.app.bajo.lib._
+        const { isString } = this.lib._
 
         let header = setting.type
         const exts = []
@@ -251,7 +251,7 @@ async function factory (pkgName) {
       const { importPkg } = this.app.bajo
       const { recordGet } = this.app.dobo
       const { getUser } = this
-      const { isEmpty } = this.app.bajo.lib._
+      const { isEmpty } = this.lib._
 
       const fastJwt = await importPkg('bajoExtra:fast-jwt')
       const { createVerifier } = fastJwt
@@ -277,7 +277,7 @@ async function factory (pkgName) {
 
     checkPathsByTeam = ({ paths = [], method = 'GET', teams = [], guards = [] }) => {
       const { includes } = this.app.bajo
-      const { outmatch } = this.app.bajo.lib
+      const { outmatch } = this.lib
 
       for (const item of guards) {
         const matchPath = outmatch(item.path)
@@ -294,7 +294,7 @@ async function factory (pkgName) {
     }
 
     checkPathsByRoute = ({ paths = [], method = 'GET', guards = [] }) => {
-      const { outmatch } = this.app.bajo.lib
+      const { outmatch } = this.lib
 
       for (const item of guards) {
         const matchPath = outmatch(item.path)
@@ -308,7 +308,7 @@ async function factory (pkgName) {
     }
 
     checkPathsByGuard = ({ guards, paths }) => {
-      const { outmatch } = this.app.bajo.lib
+      const { outmatch } = this.lib
       const matcher = outmatch(guards)
       let guarded
       for (const path of paths) {

package/waibuMpa/route/help/contact-form.js

@@ -2,7 +2,7 @@ const contactForm = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.bajo
-    const { pick } = this.app.bajo.lib._
+    const { pick } = this.lib._
     const { recordCreate, recordFind } = this.app.waibuDb
 
     const def = req.user ? pick(req.user, ['firstName', 'lastName', 'email']) : {}

package/waibuMpa/route/help/trouble-tickets/add.js

@@ -4,7 +4,7 @@ const add = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { recordCreate, recordFind } = this.app.waibuDb
-    const { defaultsDeep } = this.app.bajo.lib._
+    const { defaultsDeep } = this.lib._
     const options = {}
     const form = defaultsDeep(req.body, {})
     let error

package/waibuMpa/route/help/trouble-tickets/details/@id.js

@@ -3,7 +3,7 @@ const model = 'SumbaTicketDetail'
 const id = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { cloneDeep } = this.app.bajo.lib._
+    const { cloneDeep } = this.lib._
     const { recordCreate, recordFind, getSchemaExt } = this.app.waibuDb
     const { schema } = await getSchemaExt(model, 'list')
 

package/waibuMpa/route/my-stuff/profile/edit.js

@@ -4,7 +4,7 @@ const profile = {
     const { defaultsDeep } = this.app.bajo
     // const { attachmentCopyUploaded } = this.app.dobo
     const { recordUpdate, recordGet } = this.app.waibuDb
-    const { omit, pick } = this.app.bajo.lib._
+    const { omit, pick } = this.lib._
     const { hash } = this.app.bajoExtra
     const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: true, noHook: true, noCache: true } })
     let form = defaultsDeep(req.body, omit(resp.data, ['password']))

package/waibuMpa/route/my-stuff/reset-api-key.js

@@ -6,7 +6,7 @@ const resetApiKey = {
     const { defaultsDeep, importPkg, generateId } = this.app.bajo
     const { recordGet, recordUpdate } = this.app.dobo
     const { hash } = this.app.bajoExtra
-    const delay = await importPkg('delay')
+    const delay = await importPkg('bajo:delay')
     const bcrypt = await importPkg('bajoExtra:bcrypt')
     const Joi = await importPkg('dobo:joi')
     const form = defaultsDeep(req.body, { apiKey: await hash(req.user.salt) })

package/waibuMpa/route/signin.js

@@ -3,7 +3,7 @@ const signin = {
   handler: async function (req, reply) {
     const { getUserFromUsernamePassword } = this
     const { runHook } = this.app.bajo
-    const { isEmpty, omit } = this.app.bajo.lib._
+    const { isEmpty, omit } = this.lib._
     const { getSessionId } = this.app.waibuMpa
 
     let { username, password, referer } = req.body || {}

package/waibuMpa/route/signout.js

@@ -2,7 +2,7 @@ const signout = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { runHook } = this.app.bajo
-    // const { isEmpty } = this.app.bajo.lib._
+    // const { isEmpty } = this.lib._
     const { getSessionId } = this.app.waibuMpa
 
     let { referer } = req.body || {}

package/waibuMpa/route/user/forgot-password/@fpl.js

@@ -2,7 +2,7 @@ import passwordRule from '../../../../lib/password-rule.js'
 const model = 'SumbaUser'
 
 async function getUser (req, reply) {
-  const { dayjs } = this.app.bajo.lib
+  const { dayjs } = this.lib
   const { recordFind } = this.app.waibuDb
   const invalidFpl = 'sumba.template:/user/fpl-invalid.html'
   if (Buffer.from(req.params.fpl, 'base64').toString('base64') !== req.params.fpl) return invalidFpl
@@ -20,7 +20,7 @@ const forgotPasswordLink = {
   handler: async function (req, reply) {
     const { sendMail } = this.app.waibu
     const { defaultsDeep, importPkg } = this.app.bajo
-    const { isString } = this.app.bajo.lib._
+    const { isString } = this.lib._
     const { recordUpdate } = this.app.dobo
     const Joi = await importPkg('dobo:joi')
 

package/waibuMpa/route/user/forgot-password.js

@@ -6,7 +6,7 @@ const profile = {
     if (!this.app.masohiMail) return reply.view('sumba.template:/user/forgot-password.html')
     const { sendMail } = this.app.waibu
     const { defaultsDeep } = this.app.bajo
-    const { dayjs } = this.app.bajo.lib
+    const { dayjs } = this.lib
     const { recordFind } = this.app.dobo
     const form = defaultsDeep(req.body, {})
     let error

package/waibuRestApi/route/my-stuff/profile/update.js

@@ -3,7 +3,7 @@ const hidden = ['password', 'token', 'siteId']
 
 async function get ({ ctx }) {
   const { recordUpdate } = this.app.waibuDb
-  const { omit } = this.app.bajo.lib._
+  const { omit } = this.lib._
 
   const { docSchemaModel } = this.app.waibuRestApi
   const schema = await docSchemaModel({ model, method: 'update', ctx, options: { hidden, noId: true } })

package/waibuSocketIo/middleware/server/auth.js

@@ -1,7 +1,7 @@
 export default {
   level: 1,
   handler: async function (socket) {
-    const { merge } = this.app.bajo.lib._
+    const { merge } = this.lib._
     const { recordGet } = this.app.dobo
     const { getSessionId } = this.app.waibuMpa