sumba 2.0.1 → 2.1.0

package/docs/index.js.html

@@ -16,9 +16,9 @@ async function factory (pkgName) {
    *
    * @class
    */
-  class Sumba extends this.app.pluginClass.base {
+  class Sumba extends this.app.baseClass.Base {
     static alias = 'sumba'
-    static dependencies = ['bajo-extra', 'bajo-common-db', 'bajo-config']
+    static dependencies = ['bajo-extra', 'bajo-common-db', 'bajo-config', 'bajo-markdown']
 
     constructor () {
       super(pkgName, me.app)
@@ -195,37 +195,41 @@ async function factory (pkgName) {
     }
 
     getUser = async (rec, safe = true) => {
-      const { recordGet } = this.app.dobo
       const { omit, isPlainObject } = this.app.lib._
       let user
       if (isPlainObject(rec)) user = rec
-      else user = await recordGet('SumbaUser', rec, { noHook: true })
+      else {
+        const mdl = this.app.dobo.getModel('SumbaUser')
+        user = await mdl.getRecord(rec, { noHook: true, throwNotFound: false })
+      }
+      if (!user) return null
       return safe ? omit(user, this.unsafeUserFields) : user
     }
 
     mergeTeam = async (user, site) => {
       if (!user) return
       const { map, pick } = this.app.lib._
-      const { recordFindAll } = this.app.dobo
       user.teams = []
       const query = { userId: user.id, siteId: site.id }
-      const userTeam = await recordFindAll('SumbaTeamUser', { query })
+      let mdl = this.app.dobo.getModel('SumbaTeamUser')
+      const userTeam = await mdl.findAllRecord({ query })
       if (userTeam.length === 0) return
       delete query.userId
-      query.id = { $in: map(userTeam, 'id'), status: 'ENABLED' }
-      const team = await recordFindAll('SumbaTeam', { query })
+      query.id = { $in: map(userTeam, 'id') }
+      query.status = 'ENABLED'
+      mdl = this.app.dobo.getModel('SumbaTeam')
+      const team = await mdl.findAllRecord({ query })
       if (team.length > 0) user.teams.push(...map(team, t => pick(t, ['id', 'alias'])))
     }
 
     getUserFromUsernamePassword = async (username = '', password = '', req) => {
       const { importPkg } = this.app.bajo
-      const { recordFind, validate } = this.app.dobo
-      const model = 'SumbaUser'
-      await validate({ username, password }, model, { ns: ['sumba', 'dobo'], fields: ['username', 'password'] })
+      const model = this.app.dobo.getModel('SumbaUser')
+      await model.validate({ username, password }, null, { partial: true, ns: ['sumba', 'dobo'], fields: ['username', 'password'] })
       const bcrypt = await importPkg('bajoExtra:bcrypt')
 
       const query = { username, provider: 'local' }
-      const rows = await recordFind(model, { query }, { req, forceNoHidden: true, noHook: true })
+      const rows = await model.findRecord({ query }, { req, forceNoHidden: true, noHook: true })
       if (rows.length === 0) throw this.error('validationError', { details: [{ field: 'username', error: 'Unknown username' }], statusCode: 401 })
       const rec = rows[0]
       if (rec.status !== 'ACTIVE') throw this.error('validationError', { details: ['User is inactive or temporarily disabled'], statusCode: 401 })
@@ -271,13 +275,12 @@ async function factory (pkgName) {
       const { merge } = this.app.lib._
       const { isMd5, hash } = this.app.bajoExtra
       const { getUser } = this
-      const { recordFind } = this.app.dobo
 
       let token = await this._getToken('apiKey', req, source)
       if (!isMd5(token)) return false
       token = await hash(token)
       const query = { token }
-      const rows = await recordFind('SumbaUser', { query }, { req, noHook: true })
+      const rows = await this.app.dobo.getModel('SumbaUser').findRecord({ query }, { req, noHook: true })
       if (rows.length === 0) throw this.error('invalidKey', merge({ statusCode: 401 }, payload))
       if (rows[0].status !== 'ACTIVE') throw this.error('userInactive', merge({ details: [{ field: 'status', error: 'inactive' }], statusCode: 401 }, payload))
       req.user = await getUser(rows[0])
@@ -328,7 +331,6 @@ async function factory (pkgName) {
 
     verifyJwt = async (req, reply, source, payload) => {
       const { importPkg } = this.app.bajo
-      const { recordGet } = this.app.dobo
       const { getUser } = this
       const { isEmpty, merge } = this.app.lib._
 
@@ -344,7 +346,7 @@ async function factory (pkgName) {
       const decoded = await verifier(token)
       const id = decoded.payload.uid
       try {
-        const rec = await recordGet('SumbaUser', id, { req, noHook: true })
+        const rec = await this.app.dobo.getModel('SumbaUser').getRecord(id, { req, noHook: true })
         if (!rec) throw this.error('invalidToken', { statusCode: 401 })
         if (rec.status !== 'ACTIVE') throw this.error('userInactive', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
         req.user = await getUser(rec)
@@ -399,14 +401,12 @@ async function factory (pkgName) {
 
     getSite = async (hostname, useId) => {
       const { omit } = this.app.lib._
-      const { recordFind } = this.app.dobo
       const omitted = ['status']
 
       const mergeSetting = async (site) => {
         const { defaultsDeep } = this.app.lib.aneka
-        const { parseObject } = this.app.bajo
+        const { parseObject } = this.app.lib
         const { trim, get, filter } = this.app.lib._
-        const { recordFind, recordGet } = this.app.dobo
         const defSetting = {}
         const nsSetting = {}
         const names = this.app.getAllNs()
@@ -414,7 +414,7 @@ async function factory (pkgName) {
           ns: { $in: names },
           siteId: site.id
         }
-        const all = await recordFind('SumbaSiteSetting', { query, limit: -1 })
+        const all = await this.app.dobo.getModel('SumbaSiteSetting').findRecord({ query, limit: -1 })
         for (const ns of names) {
           nsSetting[ns] = {}
           defSetting[ns] = get(this, `app.${ns}.config.siteSetting`, {})
@@ -429,14 +429,14 @@ async function factory (pkgName) {
         }
         site.setting = parseObject(defaultsDeep({}, nsSetting, defSetting))
         // additional fields
-        const country = await recordGet('CdbCountry', site.country, { noHook: true })
+        const country = await this.app.dobo.getModel('CdbCountry').getRecord(site.country, { noHook: true })
         site.countryName = (country ?? {}).name ?? site.country
       }
 
       let site = {}
 
       if (!this.config.multiSite) {
-        const resp = await recordFind('SumbaSite', { query: { alias: 'default' } }, { noHook: true })
+        const resp = await this.app.dobo.getModel('SumbaSite').findRecord({ query: { alias: 'default' } }, { noHook: true })
         site = omit(resp[0], omitted)
         await mergeSetting(site)
         return site
@@ -452,7 +452,7 @@ async function factory (pkgName) {
         }
       }
       const filter = { query, limit: 1 }
-      const rows = await recordFind('SumbaSite', filter, { noHook: true })
+      const rows = await this.app.dobo.getModel('SumbaSite').findRecord(filter, { noHook: true })
       if (rows.length === 0) throw this.error('unknownSite')
       const row = omit(rows[0], omitted)
       if (row.status !== 'ACTIVE') throw this.error('siteInactiveInfo')
@@ -461,6 +461,19 @@ async function factory (pkgName) {
       return site
     }
 
+    signout = async ({ req, reply, reason }) => {
+      const { runHook } = this.app.bajo
+      const { getSessionId } = this.app.waibuMpa
+      const sid = await getSessionId(req.headers.cookie)
+      req.session.userId = null
+      await runHook(`${this.ns}:afterSignout`, sid, req)
+      const { query, params } = req
+      // const url = !isEmpty(referer) ? referer : this.config.redirect.home
+      const url = this.config.redirect.afterSignout
+      req.flash('notify', req.t(reason ?? 'signoutSuccessfully'))
+      return reply.redirectTo(url, { query, params })
+    }
+
     signin = async ({ user, req, reply }) => {
       const { getSessionId } = this.app.waibuMpa
       const { runHook } = this.app.bajo
@@ -479,7 +492,7 @@ async function factory (pkgName) {
     }
 
     generatePassword = (req) => {
-      const { generateId } = this.app.bajo
+      const { generateId } = this.app.lib.aneka
       const cfg = req ? req.site.setting.sumba.userPassword : this.config.siteSetting.userPassword
       let passwd = generateId()
       if (cfg.minLowercase) passwd += generateId({ pattern: 'abcdefghijklmnopqrstuvwxyz', length: cfg.minLowercase })
@@ -491,7 +504,7 @@ async function factory (pkgName) {
 
     pushDownload = async ({ description, worker, data, source, req, file, type }) => {
       const { getPlugin } = this.app.bajo
-      const { recordCreate } = getPlugin('waibuDb')
+      const { createRecord } = getPlugin('waibuDb')
       const { push } = getPlugin('bajoQueue')
       description = description ?? file
       const jobQueue = {
@@ -505,16 +518,15 @@ async function factory (pkgName) {
       if (!type) type = path.extname(file)
       if (type[0] === '.') type = type.slice(1)
       const body = { file, description, jobQueue, type }
-      const rec = await recordCreate({ model: 'SumbaDownload', body, req, options: { noFlash: true } })
+      const rec = await createRecord({ model: 'SumbaDownload', body, req, options: { noFlash: true } })
       jobQueue.payload.data.download = { id: rec.data.id, file }
       await push(jobQueue)
     }
 
     getApiKeyFromUserId = async id => {
       const { hash } = this.app.bajoExtra
-      const { recordGet } = this.app.dobo
       const options = { forceNoHidden: true, noHook: true, noCache: true, attachment: true, mimeType: true }
-      const resp = await recordGet('SumbaUser', id, options)
+      const resp = await this.app.dobo.getModel('SumbaUser').getRecord(id, options)
       return await hash(resp.salt)
     }
   }

package/extend/bajo/hook/{dobo.sumba-contact-form@after-record-create.js → dobo.sumba-contact-form@after-create-record.js}

@@ -1,4 +1,4 @@
-async function afterRecordCreate (body, options = {}, rec) {
+async function afterCreateRecord (body, options = {}, rec) {
   if (!options.req) return
   if (!this.app.waibu) return
   const { sendMail } = this.app.waibu
@@ -14,4 +14,4 @@ async function afterRecordCreate (body, options = {}, rec) {
   )
 }
 
-export default afterRecordCreate
+export default afterCreateRecord

package/extend/bajo/hook/{dobo.sumba-contact-form@before-record-create.js → dobo.sumba-contact-form@before-create-record.js}

@@ -1,4 +1,4 @@
-const doboBeforeRecordCreate = {
+const beforeCreateRecord = {
   level: 1000,
   handler: async function (body, options = {}) {
     const { get, isEmpty } = this.app.lib._
@@ -13,4 +13,4 @@ const doboBeforeRecordCreate = {
   }
 }
 
-export default doboBeforeRecordCreate
+export default beforeCreateRecord

package/extend/bajo/hook/{dobo.sumba-user@after-record-create.js → dobo.sumba-user@after-create-record.js}

@@ -1,4 +1,4 @@
-async function afterRecordCreate (body, options = {}, rec) {
+async function afterCreateRecord (body, rec, options = {}) {
   if (!options.req) return
   if (!this.app.waibu) return
   const { sendMail } = this.app.waibu
@@ -11,4 +11,4 @@ async function afterRecordCreate (body, options = {}, rec) {
   )
 }
 
-export default afterRecordCreate
+export default afterCreateRecord

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

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

package/extend/bajo/hook/{dobo.sumba-user@after-record-update.js → dobo.sumba-user@after-update-record.js}

@@ -1,4 +1,4 @@
-async function afterRecordUpdate (id, body, options = {}, rec) {
+async function afterUpdateRecord (id, body, rec, options = {}) {
   if (!options.req) return
   if (!this.app.waibu) return
   const { data, oldData } = rec
@@ -27,4 +27,4 @@ async function afterRecordUpdate (id, body, options = {}, rec) {
   }
 }
 
-export default afterRecordUpdate
+export default afterUpdateRecord

package/extend/bajo/hook/{dobo.sumba-user@before-record-create.js → dobo.sumba-user@before-create-record.js}

@@ -1,9 +1,9 @@
 import resetToken from '../../../lib/reset-token.js'
 
-async function afterRecordCreate (body, options = {}) {
+async function beforeCreateRecord (body, options = {}) {
   const { token, salt } = await resetToken.call(this)
   body.token = token
   body.salt = salt
 }
 
-export default afterRecordCreate
+export default beforeCreateRecord

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

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

package/extend/bajo/hook/{dobo.sumba-user@before-record-update.js → dobo.sumba-user@before-update-record.js}

@@ -1,6 +1,6 @@
 import resetToken from '../../../lib/reset-token.js'
 
-async function beforeRecordUpdate (id, body, options = {}) {
+async function beforeUpdateRecord (id, body, options = {}) {
   if (body.salt) {
     const { token, salt } = await resetToken.call(this, body.salt)
     body.token = token
@@ -8,4 +8,4 @@ async function beforeRecordUpdate (id, body, options = {}) {
   }
 }
 
-export default beforeRecordUpdate
+export default beforeUpdateRecord

package/extend/bajo/hook/dobo@before-count-record.js

@@ -0,0 +1,8 @@
+import { handler } from './dobo@before-find-record.js'
+
+const doboBeforeCountRecord = {
+  level: 1000,
+  handler
+}
+
+export default doboBeforeCountRecord

package/extend/bajo/hook/{dobo@before-record-create.js → dobo@before-create-record.js}

@@ -1,18 +1,18 @@
-const doboBeforeRecordCreate = {
+const doboBeforeCreateRecord = {
   level: 1000,
-  handler: async function (model, body, options = {}) {
+  handler: async function (modelName, body, options = {}) {
     const { get } = this.app.lib._
-    const { getField } = this.app.dobo
     const { req } = options
 
     if (options.noAutoFilter || !req) return
     const item = { siteId: 'site.id', userId: 'user.id' }
+    const model = this.app.dobo.getModel(modelName)
     for (const i in item) {
       const rec = get(req, item[i])
-      const field = getField(i, model)
+      const field = model.getProperty(i)
       if (rec && field) body[i] = field.type === 'string' ? (rec + '') : rec
     }
   }
 }
 
-export default doboBeforeRecordCreate
+export default doboBeforeCreateRecord

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

@@ -0,0 +1,8 @@
+import { handler } from './dobo@before-find-record.js'
+
+const doboBeforeFindOneRecord = {
+  level: 1000,
+  handler
+}
+
+export default doboBeforeFindOneRecord

package/extend/bajo/hook/{dobo@before-record-find.js → dobo@before-find-record.js}

@@ -1,12 +1,12 @@
 const useAdmin = ['waibuAdmin']
 
-export async function rebuildFilter (model, filter, req) {
+export async function rebuildFilter (modelName, filter, req) {
   const { isEmpty, map, find, get } = this.app.lib._
-  const { hasField } = this.app.dobo
   filter.query = filter.query ?? {}
-  const hasSiteId = hasField('siteId', model)
-  const hasUserId = hasField('userId', model)
-  const hasTeamId = hasField('teamId', model)
+  const model = this.app.dobo.getModel(modelName)
+  const hasSiteId = model.hasProperty('siteId')
+  const hasUserId = model.hasProperty('userId')
+  const hasTeamId = model.hasProperty('teamId')
   const isAdmin = find(get(req, 'user.teams', []), { alias: 'administrator' }) && useAdmin.includes(get(req, 'routeOptions.config.ns'))
   if (!(hasSiteId || hasUserId || hasTeamId)) return filter
   const q = { $and: [] }
@@ -26,15 +26,15 @@ export async function rebuildFilter (model, filter, req) {
   return filter
 }
 
-export async function handler (model, filter, options = {}) {
+export async function handler (modelName, filter, options = {}) {
   const { req } = options
   if (options.noAutoFilter || !req) return
-  filter = await rebuildFilter.call(this, model, filter, req)
+  filter = await rebuildFilter.call(this, modelName, filter, req)
 }
 
-const doboBeforeRecordFind = {
+const doboBeforeFindRecord = {
   level: 1000,
   handler
 }
 
-export default doboBeforeRecordFind
+export default doboBeforeFindRecord

package/extend/bajo/hook/dobo@before-get-record.js

@@ -0,0 +1,23 @@
+import { rebuildFilter } from './dobo@before-find-record.js'
+
+export async function checker (modelName, id, options = {}) {
+  const { req } = options
+
+  const model = this.app.dobo.getModel(modelName)
+  if (options.noAutoFilter || !req) return
+  const filter = await rebuildFilter.call(this, modelName, {}, req)
+  if (filter.query.$and) filter.query.$and.push({ id })
+  else filter.query.id = id
+  filter.limit = 1
+  const rows = await model.findRecord(filter, { count: false })
+  if (rows.length === 0) throw this.app.dobo.error('recordNotFound%s%s', id, this.name, { statusCode: 404 })
+}
+
+const doboBeforeGetRecord = {
+  level: 1000,
+  handler: async function (modelName, id, options) {
+    await checker.call(this, modelName, id, options)
+  }
+}
+
+export default doboBeforeGetRecord

package/extend/bajo/hook/dobo@before-remove-record.js

@@ -0,0 +1,10 @@
+import { checker } from './dobo@before-get-record.js'
+
+const doboBeforeRemoveRecord = {
+  level: 1000,
+  handler: async function (modelName, id, options = {}) {
+    await checker.call(this, modelName, id, options.req)
+  }
+}
+
+export default doboBeforeRemoveRecord

package/extend/bajo/hook/dobo@before-update-record.js

@@ -0,0 +1,10 @@
+import { checker } from './dobo@before-get-record.js'
+
+const doboBeforeUpdateRecord = {
+  level: 1000,
+  handler: async function (modelName, id, body, options = {}) {
+    await checker.call(this, modelName, id, options)
+  }
+}
+
+export default doboBeforeUpdateRecord

package/extend/bajo/intl/en-US.json

@@ -108,6 +108,7 @@
   "downloadList": "Download List",
   "manageDownload": "Manage Download",
   "userSession": "User Session",
+  "XHandler": "Twitter Account",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",