sumba 2.0.0 → 2.1.0

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.lib.aneka
-    const { recordFind, recordUpdate } = this.app.dobo
+    const { defaultsDeep } = this.app.lib.aneka
     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.lib
-  const { recordFind } = this.app.waibuDb
+  const { dayjs } = this.app.lib
+  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]
 }
@@ -19,10 +18,10 @@ const forgotPasswordLink = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { sendMail } = this.app.waibu
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     const { importPkg } = this.app.bajo
-    const { isString } = this.lib._
-    const { recordUpdate } = this.app.dobo
+    const { isString } = this.app.lib._
+    const model = this.app.dobo.getModel('SumbaUser')
     const Joi = await importPkg('dobo:joi')
 
     const form = defaultsDeep(req.body, {})
@@ -40,15 +39,15 @@ const forgotPasswordLink = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          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: '' }
         await sendMail(
           'sumba.template:/_mail/user-forgot-password-changed.html',
-          { to, subject, data: user, options, source: this.name }
+          { to, subject, data: user, options, source: this.ns }
         )
         req.flash('notify', req.t('passwordChangedReSignin'))
         return reply.redirectTo(this.config.redirect.signin)

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

@@ -1,19 +1,17 @@
-const model = 'SumbaUser'
-
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     if (!this.app.masohiMail) return await reply.view('sumba.template:/user/forgot-password.html')
     const { sendMail } = this.app.waibu
-    const { defaultsDeep } = this.lib.aneka
-    const { dayjs } = this.lib
-    const { recordFind } = this.app.dobo
+    const { defaultsDeep } = this.app.lib.aneka
+    const { dayjs } = this.app.lib
+    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}>`
@@ -24,7 +22,7 @@ const profile = {
         data._meta = { hostHeader: req.headers.host }
         await sendMail(
           'sumba.template:/_mail/user-forgot-password-link.html',
-          { to, subject, data, options, source: this.name }
+          { to, subject, data, options, source: this.ns }
         )
         req.flash('notify', req.t('emailSent'))
         return reply.redirectTo(this.config.redirect.signin)

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

@@ -1,9 +1,9 @@
 const signup = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
-    const { generateId } = this.app.bajo
-    const { recordCreate } = this.app.waibuDb
+    const { defaultsDeep } = this.app.lib.aneka
+    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

@@ -3,12 +3,11 @@ import passwordRule from '../../../../lib/password-rule.js'
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    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') {
@@ -22,12 +21,12 @@ const profile = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          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

@@ -1,12 +1,12 @@
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { defaultsDeep } = this.lib.aneka
+    const { defaultsDeep } = this.app.lib.aneka
     // const { attachmentCopyUploaded } = this.app.dobo
-    const { recordUpdate, recordGet } = this.app.waibuDb
-    const { omit, pick } = this.lib._
+    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.lib.aneka
-    const { importPkg, generateId } = this.app.bajo
-    const { recordGet, recordUpdate } = this.app.dobo
+    const { defaultsDeep } = this.app.lib.aneka
+    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 {
@@ -20,12 +19,12 @@ const resetApiKey = {
         try {
           await schema.validateAsync(req.body, this.app.dobo.config.validationParams)
         } catch (err) {
-          throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
+          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 {}
   }
 

package/extend/waibuRestApi/route/your-stuff/profile/get.js

@@ -2,12 +2,12 @@ const model = 'SumbaUser'
 const hidden = ['password', 'token', 'siteId', 'salt']
 
 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 get (req, reply, options) {
     options.hidden = hidden
-    return await recordGet({ model, req, reply, id: req.user.id, options })
+    return await getRecord({ model, req, reply, id: req.user.id, options })
   }
   return { schema, handler }
 }

package/extend/waibuRestApi/route/your-stuff/profile/update.js

@@ -2,15 +2,15 @@ const model = 'SumbaUser'
 const hidden = ['password', 'token', 'siteId']
 
 async function get ({ ctx }) {
-  const { recordUpdate } = this.app.waibuDb
-  const { omit } = this.lib._
+  const { updateRecord } = this.app.waibuDb
+  const { omit } = this.app.lib._
 
   const { docSchemaModel } = this.app.waibuRestApi
   const schema = await docSchemaModel({ model, method: 'update', ctx, options: { hidden, noId: true } })
   const handler = async function get (req, reply, options) {
     options.hidden = hidden
     const body = omit(req.body, ['username', 'status', ...hidden])
-    return await recordUpdate({ model, req, reply, id: req.user.id, body, options })
+    return await updateRecord({ model, req, reply, id: req.user.id, body, options })
   }
   return { schema, handler }
 }

package/extend/waibuSocketIo/middleware/server/auth.js

@@ -1,13 +1,12 @@
 export default {
   level: 1,
   handler: async function (socket) {
-    const { merge } = this.lib._
-    const { recordGet } = this.app.dobo
+    const { merge } = this.app.lib._
     const { getSessionId } = this.app.waibuMpa
 
     if (socket.handshake) {
       const sessionId = await getSessionId(socket.request.headers.cookie)
-      const resp = await recordGet('WbmpaSession', sessionId, { noHook: true, thrownNotFound: false })
+      const resp = await this.app.dobo.getModel('WbmpaSession').getRecord(sessionId, { noHook: true, thrownNotFound: false })
       if (resp) {
         const session = JSON.parse(resp.session) ?? {}
         socket.session = merge({}, session.user, { sessionId, authMethod: 'cookie' })