sumba 2.5.0 → 2.7.0

package/extend/bajo/hook/waibu-rest-api@pre-parsing.js

@@ -1,7 +1,7 @@
 import checkUserId from '../../../lib/check-user-id.js'
 import checkTeam from '../../../lib/check-team.js'
 
-const onRequest = {
+const preParsing = {
   level: 10,
   handler: async function (req, reply) {
     await checkUserId.call(this, req, reply, 'waibuRestApi')
@@ -9,4 +9,4 @@ const onRequest = {
   }
 }
 
-export default onRequest
+export default preParsing

package/extend/bajo/hook/waibu-static@pre-parsing.js

@@ -1,7 +1,7 @@
 import checkUserId from '../../../lib/check-user-id.js'
 import checkTeam from '../../../lib/check-team.js'
 
-const onRequest = {
+const preParsing = {
   level: 10,
   handler: async function (req, reply) {
     await checkUserId.call(this, req, reply, 'waibuStatic')
@@ -9,4 +9,4 @@ const onRequest = {
   }
 }
 
-export default onRequest
+export default preParsing

package/extend/bajo/hook/waibu@after-app-boot.js

@@ -6,13 +6,16 @@ async function afterAppBoot () {
   await runHook(`${this.ns}:beforeBoot`)
   this.log.trace('collectingRouteGuards')
   await collectRoutes.call(this, 'secure')
+  await runHook(`${this.ns}:afterCollectSecureRoutes`, this.secureRoutes, this.secureNegRoutes)
   this.log.trace('secureRoutes%d', this.secureRoutes.length)
   this.log.trace('secureNegRoutes%d', this.secureNegRoutes.length)
   await collectRoutes.call(this, 'anonymous')
+  await runHook(`${this.ns}:afterCollectAnonymousRoutes`, this.anonymousRoutes, this.anonymousNegRoutes)
   this.log.trace('anonRoutes%d', this.anonymousRoutes.length)
   this.log.trace('anonNegRoutes%d', this.anonymousNegRoutes.length)
   this.log.trace('collectingTeamGuards')
   await collectTeam.call(this)
+  await runHook(`${this.ns}:afterCollectTeamRoutes`, this.teamRoutes, this.teamNegRoutes)
   this.log.trace('teamRoutes%d', this.teamRoutes.length)
   this.log.trace('teamNegRoutes%d', this.teamNegRoutes.length)
   await runHook(`${this.ns}:afterBoot`)

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

@@ -10,7 +10,7 @@ const contactForm = {
     let error
     if (req.method === 'POST') {
       try {
-        const { data } = await createRecord({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
+        const { data } = await createRecord({ model: 'SumbaContactForm', req, reply, transaction: true, 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) {

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

@@ -10,7 +10,9 @@ const userActivation = {
         const query = { status: 'UNVERIFIED', token: req.body.key }
         const result = await model.findRecord({ query, limit: 1 })
         if (result.length === 0) throw this.error('validationError', { details: [{ field: 'key', error: 'invalidActivationKey' }] })
-        await model.updateRecord(result[0].id, { status: 'ACTIVE' }, { req, noValidation: true, noFlash: true })
+        await model.transaction(async (trx) => {
+          await model.updateRecord(result[0].id, { status: 'ACTIVE' }, { req, noValidation: true, noFlash: true, trx })
+        })
         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

@@ -40,15 +40,17 @@ const forgotPasswordLink = {
         } catch (err) {
           throw this.error('validationError', { details: err.details, values: err.values, ns: this.ns, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        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: '' }
-        const payload = { to, subject, data: user }
-        await this.sendMail(
-          'sumba.template:/_mail/user-forgot-password-changed.html',
-          { payload, options, source: this.ns }
-        )
+        await model.transaction(async trx => {
+          await model.updateRecord(user.id, { password: req.body.newPassword }, { noFlash: true, trx })
+          const to = `${user.firstName} ${user.lastName} <${user.email}>`
+          const subject = req.t('forgotPasswordChanged')
+          const options = { req, reply, tpl: '' }
+          const payload = { to, subject, data: user }
+          await this.sendMail(
+            'sumba.template:/_mail/user-forgot-password-changed.html',
+            { payload, options, source: this.ns }
+          )
+        })
         req.flash('notify', req.t('passwordChangedReSignin'))
         return reply.redirectTo(this.config.redirect.signin)
       } catch (err) {

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

@@ -24,7 +24,7 @@ const signup = {
         const validation = { ns: ['sumba', 'dobo'], fields, extFields }
         req.body.token = generateId()
         req.body.provider = 'local'
-        const { data } = await createRecord({ model: 'SumbaUser', req, reply, options: { validation, noFlash: true, forceNoHidden: true } })
+        const { data } = await createRecord({ model: 'SumbaUser', req, reply, transaction: true, 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

@@ -26,7 +26,9 @@ const profile = {
         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 model.updateRecord(req.user.id, { password: req.body.newPassword }, { req, reply, noFlash: true })
+        await model.transaction(async (trx) => {
+          await model.updateRecord(req.user.id, { password: req.body.newPassword }, { req, reply, noFlash: true, trx })
+        })
         // 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,3 +1,5 @@
+const fields = ['email', 'firstName', 'lastName', 'address1', 'address2', 'city', 'zipCode', 'provinceState', 'country', 'phone', 'website']
+
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
@@ -7,13 +9,13 @@ const profile = {
     const { omit, pick } = this.app.lib._
     const { hash } = this.app.bajoExtra
     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']))
+    let form = defaultsDeep(req.body, omit(resp.data, ['password', 'salt']))
     form.token = await hash(form.token)
     let error
     if (req.method === 'POST') {
       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 body = pick(form, fields)
+        const options = { noFlash: true, hidden: [], setField: 'profile', setFile: 'main.png', partial: true, fields }
         const resp = await updateRecord({ req, reply, model: 'SumbaUser', id: req.user.id, body, options })
         form = resp.data
         req.flash('notify', req.t('profileUpdated'))

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

@@ -24,7 +24,9 @@ const resetApiKey = {
         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 model.updateRecord(req.user.id, { salt: generateId() }, { req, reply, noFlash: true, forceNoHidden: true })
+        await model.transaction(async (trx) => {
+          await model.updateRecord(req.user.id, { salt: generateId() }, { req, reply, noFlash: true, forceNoHidden: true, trx })
+        })
         await delay(2000) // ensure req.user cache is expired
         req.flash('notify', req.t('resetApiKeySuccessfull'))
         return reply.redirectTo('sumba:/your-stuff/profile')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-03-05
+
+- [2.6.0] Update multiple endpoints to support dobo's transaction
+- [2.6.0] Bug fix on ```profile.edit``` route
+- [2.7.0] Add hook ```sumba:afterCollectSecureRoutes```
+- [2.7.0] Add hook ```sumba:afterCollectAnonymousRoutes```
+- [2.7.0] Add hook ```sumba:afterCollectTeamRoutes```
+
 ## 2026-03-02
 
 - [2.5.0] Add ```sendMail()``` to send mail using ```masohiMail```