sumba 2.0.1 → 2.1.1

package/extend/waibuBootstrap/theme/component/{factory → widget}/nav-dropdown-user.js

@@ -1,8 +1,8 @@
 async function navDropdownUser () {
-  return class NavDropdownUser extends this.baseFactory {
+  return class NavDropdownUser extends this.app.baseClass.MpaWidget {
     build = async () => {
       const { has, omit, find, filter } = this.app.lib._
-      const { routePath } = this.plugin.app.waibu
+      const { routePath } = this.app.waibu
       const { req } = this.component
       const icon = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name: 'person' } }) : ''
       let text = ''
@@ -14,7 +14,7 @@ async function navDropdownUser () {
         } else text = req.t('guest')
       }
       const html = []
-      const attr = omit(this.params.attr, ['text'])
+      const attr = omit(this.params.attr, ['text', 'noMenu'])
       attr.dropdown = true
       attr.content = `${icon} ${text}`
       if (this.params.attr.noMenu) {
@@ -22,7 +22,7 @@ async function navDropdownUser () {
         delete attr.dropdownMenu
         attr.href = routePath(this.component.req.user ? 'sumba:/your-stuff/profile' : 'sumba:/signin')
       } else {
-        const menu = find(this.plugin.app.sumba.config.waibuMpa.menuHandler, { title: 'account' })
+        const menu = find(this.app.sumba.config.waibuMpa.menuHandler, { title: 'account' })
         if (menu) {
           const items = filter(menu.children, c => {
             if (!has(c, 'visible')) return true
@@ -53,7 +53,7 @@ async function navDropdownUser () {
         }
       }
       this.params.noTag = true
-      this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html: html.join('\n') })
+      this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html: html.join('\n'), noEscape: true })
     }
   }
 }

package/extend/waibuDb/schema/download.js

@@ -8,7 +8,7 @@ async function download () {
           return await this.component.buildSentence(sentence)
         },
         size: function (val, rec) {
-          const { formatByte } = this.plugin.app.bajoExtra
+          const { formatByte } = this.app.bajoExtra
           return formatByte(rec.size)
         }
       }

package/extend/waibuDb/schema/site.json

@@ -6,7 +6,7 @@
       { "name": "General", "fields": ["hostname", "alias", "title", "orgName", "email", "status:4-md 6-sm"] },
       { "name": "Person In Charge", "fields": ["picName:3-md 6-sm:Name", "picRole:3-md 6-sm:Role", "picPhone:3-md 6-sm:Phone", "picEmail:3-md 6-sm:Email"] },
       { "name": "Address", "fields": ["address1:12", "address2:12", "city:6-md 8-sm", "zipCode:2-md 4-sm", "provinceState:4-md", "country:6-md", "phone:6-md", "website:12"] },
-      { "name": "Social Media", "fields": ["socX:3-md 6-sm", "socInstagram:3-md 6-sm", "socFacebook:3-md 6-sm", "linkedIn:3-md 6-sm"] }
+      { "name": "Social Media", "fields": ["socX:3-md 6-sm", "socInstagram:3-md 6-sm", "socFacebook:3-md 6-sm", "socLinkedIn:3-md 6-sm"] }
     ],
     "widget": {
       "country": {
@@ -28,7 +28,7 @@
         "noCloneBtn": true,
         "detailsHref": "waibuAdmin:/site/site"
       },
-      "readonly": ["id", "createdAt", "updatedAt"]
+      "readonly": ["id", "createdAt", "updatedAt", "hostname"]
     }
   }
 }

package/extend/waibuDb/schema/team-user.js

@@ -11,10 +11,10 @@ async function teamUser () {
       ],
       valueFormatter: {
         user: (val, rec) => {
-          return rec._rel.user.username
+          return rec._ref.user.username
         },
         team: (val, rec) => {
-          return rec._rel.team.name
+          return rec._ref.team.name
         }
       },
       widget: {

package/extend/waibuMpa/extend/waibuAdmin/route/reset-user-password.js

@@ -5,10 +5,9 @@ const resetUserPassword = {
   title: 'resetUserPassword',
   handler: async function (req, reply) {
     const { importPkg } = this.app.bajo
-    const { recordFindOne, recordUpdate } = this.app.dobo
     const { defaultsDeep } = this.app.lib.aneka
     const Joi = await importPkg('dobo:joi')
-    const model = 'SumbaUser'
+    const model = this.app.dobo.getModel('SumbaUser')
     const form = defaultsDeep(req.body, { username: req.query.username })
     let error
     if (req.method === 'POST') {
@@ -24,9 +23,9 @@ const resetUserPassword = {
         } catch (err) {
           throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        const rec = await recordFindOne(model, { query: { username: req.body.username } })
+        const rec = await model.findOneRecord({ query: { username: req.body.username } })
         if (!rec) throw this.error('unknownUser', { details: [{ field: 'username', error: 'unknownUser' }], statusCode: 400 })
-        await recordUpdate(model, rec.id, { password: req.body.password }, { req, reply })
+        await model.updateRecord(rec.id, { password: req.body.password }, { req, reply })
         form.password = ''
         form.verifyPassword = ''
       } catch (err) {

package/extend/waibuMpa/extend/waibuAdmin/route/site.js

@@ -9,7 +9,32 @@ const manageSite = {
     const template = `waibuDb.template:/crud/${req.query.edit ? 'edit' : 'details'}.html`
     const model = 'SumbaSite'
     req.params.id = req.site.id
+    req.query.id = req.site.id
     req.params.base = ''
+    /*
+    const options = {
+      schema: {
+        view: {
+          details: {
+            control: {
+              noBackBtn: true,
+              noCloneBtn: true,
+              noDeleteBtn: true,
+              editHref: '?edit=1'
+            }
+          },
+          edit: {
+            control: {
+              noDetailsBtn: true,
+              noCloneBtn: true,
+              noDeleteBtn: true,
+              backHref: '?details=1'
+            }
+          }
+        }
+      }
+    }
+    */
     return await action.call(this, { req, reply, model, template })
   }
 }

package/extend/waibuMpa/route/access-token.js

@@ -1,9 +1,8 @@
 const apiToken = {
   method: 'POST',
   handler: async function (req, reply) {
-    const { recordGet } = this.app.dobo
     if (!req.user) return ''
-    const rec = await recordGet('SumbaUser', req.user.id, { forceNoHidden: true, noCache: true })
+    const rec = await this.app.dobo.getModel('SumbaUser').getRecord(req.user.id, { forceNoHidden: true, noCache: true })
     return (await this.createJwtFromUserRecord(rec)).token
   }
 }

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

@@ -3,21 +3,21 @@ const contactForm = {
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
     const { pick } = this.app.lib._
-    const { recordCreate, recordFind } = this.app.waibuDb
+    const { createRecord, findRecord } = this.app.waibuDb
 
     const def = req.user ? pick(req.user, ['firstName', 'lastName', 'email']) : {}
     const form = defaultsDeep(req.body, def)
     let error
     if (req.method === 'POST') {
       try {
-        const { data } = await recordCreate({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
+        const { data } = await createRecord({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
         req.flash('notify', req.t('contactFormSubmitted'))
         return await reply.view('sumba.template:/help/contact-form/success.html', { form: req.body, data })
       } catch (err) {
         error = err
       }
     }
-    const cats = await recordFind({ model: 'SumbaContactFormCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
+    const cats = await findRecord({ model: 'SumbaContactFormCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
     return await reply.view('sumba.template:/help/contact-form/form.html', { form, error, cats })
   }
 }

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

@@ -4,19 +4,19 @@ const add = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
-    const { recordCreate, recordFind } = this.app.waibuDb
+    const { createRecord, findRecord } = this.app.waibuDb
     const options = {}
     const form = defaultsDeep(req.body, {})
     let error
     if (req.method === 'POST') {
       try {
-        await recordCreate({ model, req, reply, options })
+        await createRecord({ model, req, reply, options })
         return reply.redirectTo('sumba:/help/trouble-tickets/list')
       } catch (err) {
         error = err
       }
     }
-    const cats = await recordFind({ model: 'SumbaTicketCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
+    const cats = await findRecord({ model: 'SumbaTicketCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
     return await reply.view('sumba.template:/help/trouble-tickets/add.html', { form, error, cats })
   }
 }

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

@@ -4,17 +4,17 @@ const id = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { cloneDeep } = this.app.lib._
-    const { recordCreate, recordFind, getSchemaExt } = this.app.waibuDb
+    const { createRecord, findRecord, getSchemaExt } = this.app.waibuDb
     const { schema } = await getSchemaExt(model, 'list')
 
-    const master = (await recordFind({ model: 'SumbaTicket', req, options: { dataOnly: true, query: { id: req.params.id }, limit: 1 } }))[0]
+    const master = (await findRecord({ model: 'SumbaTicket', req, options: { dataOnly: true, query: { id: req.params.id }, limit: 1 } }))[0]
     if (!master) throw this.error('_notFound')
     const form = cloneDeep(req.body)
     let error
     if (req.method === 'POST') {
       try {
         form.masterId = master.id + ''
-        await recordCreate({ model: 'SumbaTicketDetail', req, body: form })
+        await createRecord({ model: 'SumbaTicketDetail', req, body: form })
         return reply.redirectTo('sumba:/help/trouble-tickets/list')
       } catch (err) {
         error = err
@@ -22,7 +22,7 @@ const id = {
     }
     const query = { masterId: req.params.id + '' }
     const options = { count: true, query }
-    const list = await recordFind({ model, req, options })
+    const list = await findRecord({ model, req, options })
     schema.view.disabled = ['update', 'remove']
     schema.view.fields = ['createdAt']
     schema.view.label = { createdAt: 'conversation' }

package/extend/waibuMpa/route/help/trouble-tickets/list.js

@@ -3,11 +3,11 @@ const model = 'SumbaTicket'
 const list = {
   method: ['GET'],
   handler: async function (req, reply) {
-    const { recordFind, getSchemaExt } = this.app.waibuDb
+    const { findRecord, getSchemaExt } = this.app.waibuDb
     const { getExcerpt } = this.app.bajoTemplate
     const { schema } = await getSchemaExt(model, 'list')
     const options = { count: true }
-    const list = await recordFind({ model, req, options })
+    const list = await findRecord({ model, req, options })
     schema.view.disabled = ['update', 'remove']
     schema.view.fields = ['createdAt', 'subject', 'status']
     schema.view.label = { subject: 'Your Message' }

package/extend/waibuMpa/route/signout.js

@@ -1,23 +1,10 @@
 const signout = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { runHook } = this.app.bajo
-    // const { isEmpty } = this.app.lib._
-    const { getSessionId } = this.app.waibuMpa
-
     let { referer } = req.body || {}
     if (req.session.ref) referer = req.session.ref
     req.session.ref = null
-    if (req.method === 'POST') {
-      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('signoutSuccessfully'))
-      return reply.redirectTo(url, { query, params })
-    }
+    if (req.method === 'POST') return this.signout({ req, reply })
     return await reply.view('sumba.template:/signout.html', { form: { referer } })
   }
 }

package/extend/waibuMpa/route/user/activation.js

@@ -1,18 +1,16 @@
-const model = 'SumbaUser'
-
 const userActivation = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
-    const { recordFind, recordUpdate } = this.app.dobo
     const form = defaultsDeep(req.body, { key: req.query.key })
+    const model = this.app.dobo.getModel('SumbaUser')
     let error
     if (req.method === 'POST') {
       try {
         const query = { status: 'UNVERIFIED', token: req.body.key }
-        const result = await recordFind(model, { query, limit: 1 })
+        const result = await model.findRecord({ query, limit: 1 })
         if (result.length === 0) throw this.error('validationError', { details: [{ field: 'key', error: 'invalidActivationKey' }] })
-        await recordUpdate(model, result[0].id, { status: 'ACTIVE' }, { req, noValidation: true, noFlash: true })
+        await model.updateRecord(result[0].id, { status: 'ACTIVE' }, { req, noValidation: true, noFlash: true })
         req.flash('notify', req.t('userActivated'))
         return reply.redirectTo(this.config.redirect.signin, req)
       } catch (err) {

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

@@ -1,16 +1,15 @@
 import passwordRule from '../../../../../lib/password-rule.js'
-const model = 'SumbaUser'
 
 async function getUser (req, reply) {
   const { dayjs } = this.app.lib
-  const { recordFind } = this.app.waibuDb
+  const { findRecord } = 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
   const fpToken = Buffer.from(req.params.fpl, 'base64').toString()
   const [token, sec] = fpToken.split(':')
   if (dayjs().unix() > Number(sec)) return invalidFpl
   const query = { token, status: 'ACTIVE' }
-  const users = await recordFind({ model, req, reply, options: { query, limit: 1, dataOnly: true, noHook: true } })
+  const users = await findRecord({ model: 'SumbaUser', req, options: { query, limit: 1, dataOnly: true, noHook: true } })
   if (users.length === 0) return invalidFpl
   return users[0]
 }
@@ -22,7 +21,7 @@ const forgotPasswordLink = {
     const { defaultsDeep } = this.app.lib.aneka
     const { importPkg } = this.app.bajo
     const { isString } = this.app.lib._
-    const { recordUpdate } = this.app.dobo
+    const model = this.app.dobo.getModel('SumbaUser')
     const Joi = await importPkg('dobo:joi')
 
     const form = defaultsDeep(req.body, {})
@@ -42,7 +41,7 @@ const forgotPasswordLink = {
         } catch (err) {
           throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        await recordUpdate(model, user.id, { password: req.body.newPassword }, { noFlash: true })
+        await model.updateRecord(user.id, { password: req.body.newPassword }, { noFlash: true })
         const to = `${user.firstName} ${user.lastName} <${user.email}>`
         const subject = req.t('forgotPasswordChanged')
         const options = { req, reply, tpl: '' }

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

@@ -1,5 +1,3 @@
-const model = 'SumbaUser'
-
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
@@ -7,13 +5,13 @@ const profile = {
     const { sendMail } = this.app.waibu
     const { defaultsDeep } = this.app.lib.aneka
     const { dayjs } = this.app.lib
-    const { recordFind } = this.app.dobo
+    const model = this.app.dobo.getModel('SumbaUser')
     const form = defaultsDeep(req.body, {})
     let error
     if (req.method === 'POST') {
       try {
         const query = { status: 'ACTIVE', $or: [{ username: req.body.usernameEmail }, { email: req.body.usernameEmail }] }
-        const result = await recordFind(model, { query, limit: 1 }, { dataOnly: true, noHook: true, forceNoHidden: true })
+        const result = await model.findRecord({ query, limit: 1 }, { dataOnly: true, noHook: true, forceNoHidden: true })
         if (result.length === 0) throw this.error('validationError', { details: [{ field: 'usernameEmail', error: 'unknownUsernameEmailOrInactive' }] })
         const data = result[0]
         const to = `${data.firstName} ${data.lastName} <${data.email}>`

package/extend/waibuMpa/route/user/signup.js

@@ -2,8 +2,8 @@ const signup = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
-    const { generateId } = this.app.bajo
-    const { recordCreate } = this.app.waibuDb
+    const { generateId } = this.app.lib.aneka
+    const { createRecord } = this.app.waibuDb
 
     const form = defaultsDeep(req.body, {})
     let error
@@ -24,7 +24,7 @@ const signup = {
         const validation = { ns: ['sumba', 'dobo'], fields, extFields }
         req.body.token = generateId()
         req.body.provider = 'local'
-        const { data } = await recordCreate({ model: 'SumbaUser', req, reply, options: { validation, noFlash: true, forceNoHidden: true } })
+        const { data } = await createRecord({ model: 'SumbaUser', req, reply, options: { validation, noFlash: true, forceNoHidden: true } })
         req.flash('notify', req.t('userCreated'))
         return await reply.view('sumba.template:/user/signup/success.html', { form: req.body, data })
       } catch (err) {

package/extend/waibuMpa/route/your-stuff/change-password.js

@@ -5,10 +5,9 @@ const profile = {
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
     const { importPkg } = this.app.bajo
-    const { recordGet, recordUpdate } = this.app.dobo
     const bcrypt = await importPkg('bajoExtra:bcrypt')
     const Joi = await importPkg('dobo:joi')
-    const model = 'SumbaUser'
+    const model = this.app.dobo.getModel('SumbaUser')
     const form = defaultsDeep(req.body, {})
     let error
     if (req.method === 'POST') {
@@ -24,10 +23,10 @@ const profile = {
         } catch (err) {
           throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        const rec = await recordGet(model, req.user.id, { forceNoHidden: true })
+        const rec = await model.getRecord(req.user.id, { forceNoHidden: true })
         const verified = await bcrypt.compare(req.body.currentPassword, rec.password)
         if (!verified) throw this.error('invalidCurrentPassword', { details: [{ field: 'currentPassword', error: 'invalidPassword' }], statusCode: 400 })
-        await recordUpdate(model, req.user.id, { password: req.body.newPassword }, { req, reply, noFlash: true })
+        await model.updateRecord(req.user.id, { password: req.body.newPassword }, { req, reply, noFlash: true })
         // signout and redirect to signin
         req.session.userId = null
         req.flash('notify', req.t('passwordChangedReSignin'))

package/extend/waibuMpa/route/your-stuff/profile/edit.js

@@ -3,10 +3,10 @@ const profile = {
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
     // const { attachmentCopyUploaded } = this.app.dobo
-    const { recordUpdate, recordGet } = this.app.waibuDb
+    const { updateRecord, getRecord } = this.app.waibuDb
     const { omit, pick } = this.app.lib._
     const { hash } = this.app.bajoExtra
-    const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: true, noHook: true, noCache: true } })
+    const resp = await getRecord({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: true, noHook: true, noCache: true } })
     let form = defaultsDeep(req.body, omit(resp.data, ['password']))
     form.token = await hash(form.token)
     let error
@@ -14,7 +14,7 @@ const profile = {
       try {
         const body = pick(form, ['firstName', 'lastName', 'address1', 'address2', 'city', 'zipCode', 'provinceState', 'country', 'phone', 'website'])
         const options = { noFlash: true, hidden: [], setField: 'profile', setFile: 'main.png' }
-        const resp = await recordUpdate({ req, reply, model: 'SumbaUser', id: req.user.id, body, options })
+        const resp = await updateRecord({ req, reply, model: 'SumbaUser', id: req.user.id, body, options })
         form = resp.data
         req.flash('notify', req.t('profileUpdated'))
         return reply.redirectTo('sumba:/your-stuff/profile')

package/extend/waibuMpa/route/your-stuff/profile.js

@@ -2,9 +2,9 @@ const profile = {
   method: ['GET'],
   handler: async function (req, reply) {
     const { hash } = this.app.bajoExtra
-    const { recordGet } = this.app.waibuDb
+    const { getRecord } = this.app.waibuDb
     const options = { forceNoHidden: true, noHook: true, noCache: true, attachment: true, mimeType: true }
-    const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options })
+    const resp = await getRecord({ model: 'SumbaUser', req, id: req.user.id, options })
     const form = resp.data
     form.token = await hash(form.salt)
     return await reply.view('sumba.template:/your-stuff/profile/view.html', { form })

package/extend/waibuMpa/route/your-stuff/reset-api-key.js

@@ -1,16 +1,15 @@
-const model = 'SumbaUser'
-
 const resetApiKey = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.lib.aneka
-    const { importPkg, generateId } = this.app.bajo
-    const { recordGet, recordUpdate } = this.app.dobo
+    const { importPkg } = this.app.bajo
+    const { generateId } = this.app.lib.aneka
     const { hash } = this.app.bajoExtra
     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) })
+    const model = this.app.dobo.getModel('SumbaUser')
     let error
     if (req.method === 'POST') {
       try {
@@ -22,10 +21,10 @@ const resetApiKey = {
         } catch (err) {
           throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        const rec = await recordGet(model, req.user.id, { forceNoHidden: true })
-        const verified = await bcrypt.compare(req.body.password, rec.password)
+        const rec = await model.getRecord(req.user.id, { forceNoHidden: true })
+        const verified = await bcrypt.compare(form.password, rec.password)
         if (!verified) throw this.error('validationError', { details: [{ field: 'password', error: 'invalidPassword' }], statusCode: 400 })
-        await recordUpdate(model, req.user.id, { salt: generateId() }, { req, reply, noFlash: true, forceNoHidden: true })
+        await model.updateRecord(req.user.id, { salt: generateId() }, { req, reply, noFlash: true, forceNoHidden: true })
         await delay(2000) // ensure req.user cache is expired
         req.flash('notify', req.t('resetApiKeySuccessfull'))
         return reply.redirectTo('sumba:/your-stuff/profile')

package/extend/waibuRestApi/route/info/get.js

@@ -2,13 +2,13 @@ const hidden = []
 const model = 'SumbaSite'
 
 async function get ({ ctx }) {
-  const { recordGet } = this.app.waibuDb
+  const { getRecord } = this.app.waibuDb
   const { docSchemaModel } = this.app.waibuRestApi
 
   const schema = await docSchemaModel({ model, method: 'get', ctx, options: { hidden, noId: true } })
   const handler = async function (req, reply, options) {
     options.hidden = hidden
-    return await recordGet({ model, req, reply, id: req.site.id, options })
+    return await getRecord({ model, req, reply, id: req.site.id, options })
   }
   return { schema, handler }
 }

package/extend/waibuRestApi/route/user/api-key/get.js

@@ -12,10 +12,9 @@ async function get ({ ctx }) {
   }
 
   const handler = async function (req, reply, options) {
-    const { recordGet } = this.app.dobo
     const { hash } = this.app.bajoExtra
 
-    const profile = await recordGet('SumbaUser', req.user.id)
+    const profile = await this.app.dobo.getModel('SumbaUser').getRecord(req.user.id)
     return { data: { token: await hash(profile.password) } }
   }
   return { schema, handler }

package/extend/waibuRestApi/route/your-stuff/api-key/get.js

@@ -2,10 +2,9 @@ import { response } from './update.js'
 
 async function get ({ ctx }) {
   const { hash } = this.app.bajoExtra
-  const { recordGet } = this.app.dobo
   const schema = { response: await response.call(this) }
   const handler = async function get (req, reply) {
-    const rec = await recordGet('SumbaUser', req.user.id, { forceNoHidden: true })
+    const rec = await this.app.dobo.getModel('SumbaUser').getRecord(req.user.id, { forceNoHidden: true })
     return { data: { token: await hash(rec.salt) } }
   }
   return { schema, handler }

package/extend/waibuRestApi/route/your-stuff/api-key/update.js

@@ -19,22 +19,21 @@ export const body = {
   }
 }
 
-const model = 'SumbaUser'
-
 async function update ({ ctx }) {
-  const { importPkg, generateId } = this.app.bajo
-  const { recordGet, recordUpdate } = this.app.dobo
+  const { importPkg } = this.app.bajo
+  const { generateId } = this.app.lib.aneka
   const { hash } = this.app.bajoExtra
   const bcrypt = await importPkg('bajoExtra:bcrypt')
+  const model = this.app.dobo.getModel('SumbaUser')
 
   const schema = { body, response: await response.call(this) }
 
   const handler = async function get (req, reply, options) {
-    const rec = await recordGet(model, req.user.id, { forceNoHidden: true })
+    const rec = await model.getRecord(req.user.id, { forceNoHidden: true })
     const verified = await bcrypt.compare(req.body.password, rec.password)
     if (!verified) throw this.error('invalidPassword', { details: [{ field: 'password', error: 'invalidPassword' }], statusCode: 400 })
     const input = { salt: generateId() }
-    const resp = await recordUpdate(model, req.user.id, input, { forceNoHidden: true })
+    const resp = await model.updateRecord(req.user.id, input, { forceNoHidden: true })
     return { data: { token: await hash(resp.salt) } }
   }
 

package/extend/waibuRestApi/route/your-stuff/change-password/update.js

@@ -25,7 +25,6 @@ const model = 'SumbaUser'
 
 async function update ({ ctx }) {
   const { importPkg } = this.app.bajo
-  const { recordGet, recordUpdate } = this.app.dobo
   const bcrypt = await importPkg('bajoExtra:bcrypt')
 
   const schema = {
@@ -40,11 +39,11 @@ async function update ({ ctx }) {
   }
 
   const handler = async function get (req, reply, options) {
-    const rec = await recordGet(model, req.user.id, { forceNoHidden: true })
+    const rec = await this.app.dobo.getModel(model).getRecord(req.user.id, { forceNoHidden: true })
     const verified = await bcrypt.compare(req.body.currentPassword, rec.password)
     if (!verified) throw this.error('invalidCurrentPassword', { details: [{ field: 'current', error: 'invalidPassword' }], statusCode: 400 })
     const input = { password: req.body.password }
-    await recordUpdate(model, req.user.id, input)
+    await this.app.dobo.getModel(model).updateRecord(req.user.id, input)
     return {}
   }