npm - sumba - Versions diffs - 2.4.1 → 2.6.0 - Mend

sumba 2.4.1 → 2.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

package/extend/bajo/hook/dobo.sumba-contact-form@after-create-record.js CHANGED Viewed

@@ -1,16 +1,16 @@
-async function afterCreateRecord (body, options = {}, rec) {
-  if (!options.req) return
-  if (!this.app.waibu) return
-  const { sendMail } = this.app.waibu
+async function afterCreateRecord (body, rec, options = {}) {
   const { data } = rec
   const { req } = options
+  const { get } = this.app.lib._
+  const t = get(req, 't', this.t)
   const to = `${data.firstName} ${data.lastName} <${data.email}>`
   let bcc
-  if (req && req.site) bcc = req.site.email
-  const subject = options.req.t('contactForm')
-  await sendMail(
+  if (req.site) bcc = req.site.email
+  const subject = t('contactForm')
+  const payload = { to, bcc, subject, data }
+  await this.sendMail(
     'sumba.template:/_mail/help-contact-form.html',
-    { to, bcc, subject, data, options, source: this.ns }
+    { payload, options, source: this.ns }
   )
 }

package/extend/bajo/hook/dobo.sumba-user@after-create-record.js CHANGED Viewed

@@ -1,13 +1,14 @@
 async function afterCreateRecord (body, rec, options = {}) {
-  if (!options.req) return
-  if (!this.app.waibu) return
-  const { sendMail } = this.app.waibu
   const { data } = rec
+  const { req } = options
+  const { get } = this.app.lib._
+  const t = get(req, 't', this.t)
   const to = `${data.firstName} ${data.lastName} <${data.email}>`
-  const subject = options.req.t('newUserSignup')
-  await sendMail(
+  const subject = t('newUserSignup')
+  const payload = { to, subject, data }
+  await this.sendMail(
     `sumba.template:/_mail/user-signup-success${data.status === 'ACTIVE' ? '-active' : ''}.html`,
-    { to, subject, data, options, source: this.ns }
+    { payload, options, source: this.ns }
   )
 }

package/extend/bajo/hook/dobo.sumba-user@after-update-record.js CHANGED Viewed

@@ -1,28 +1,30 @@
 async function afterUpdateRecord (id, body, rec, options = {}) {
-  if (!options.req) return
-  if (!this.app.waibu) return
   const { data, oldData } = rec
-  const { sendMail } = this.app.waibu
+  const { req } = options
+  const { get } = this.app.lib._
+  const t = get(req, 't', this.t)
   const to = `${data.firstName} ${data.lastName} <${data.email}>`
+  const source = this.ns
   let subject
+  const payload = { to, subject, data }
   if (oldData.status === 'UNVERIFIED' && data.status === 'ACTIVE') {
-    subject = options.req.t('userActivation')
-    await sendMail(
+    payload.subject = t('userActivation')
+    await this.sendMail(
       'sumba.template:/_mail/user-activation-success.html',
-      { to, subject, data, options, source: this.ns }
+      { payload, options, source }
     )
   } else if (oldData.token !== data.token) {
-    subject = options.req.t('resetApiKey')
-    await sendMail(
+    payload.subject = t('resetApiKey')
+    await this.sendMail(
       'sumba.template:/_mail/mystuff-reset-api-key.html',
-      { to, subject, data, options, source: this.ns }
+      { payload, options, source }
     )
   } else if (body.password) {
-    subject = options.req.t('changePassword')
-    await sendMail(
+    payload.subject = t('changePassword')
+    await this.sendMail(
       'sumba.template:/_mail/mystuff-change-password.html',
-      { to, subject, data, options, source: this.ns }
+      { payload, options, source }
     )
   }
 }

package/extend/bajoTemplate/layout/email.html ADDED Viewed

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<head lang="<%= _meta.lang %>">
+  <meta charset="UTF-8">
+  <title><%= page.fullTitle %></title>
+  <style type="text/css">
+  </style>
+</head>
+<body>
+  <% if (arguments[0].firstName && arguments[0].lastName) { %>
+  <p>Dear <%= firstName %> <%= lastName %>,</p>
+  <% } %>
+  <!-- body -->
+  <p>Sincerely,</p>
+  <p><%= _meta.site.title %></p>
+</body>
+</html>

package/extend/bajoTemplate/layout/email.id.html ADDED Viewed

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="<%= _meta.lang %>">
+<head>
+  <meta charset="UTF-8">
+  <title><%= page.fullTitle %></title>
+  <style type="text/css">
+  </style>
+</head>
+<body>
+  <% if (arguments[0].firstName && arguments[0].lastName) { %>
+  <p>Yth <%= firstName %> <%= lastName %>,</p>
+  <% } %>
+  <!-- body -->
+  <p>Hormat kami,</p>
+  <p><%= _meta.site.title %></p>
+</body>
+</html>

package/extend/bajoTemplate/partial/_mail/help-contact-form.html CHANGED Viewed

@@ -4,7 +4,7 @@
   <table>
     <tr>
       <td>Category:</td>
-      <td><%= cat %></td>
+      <td><%= category %></td>
     </tr>
     <tr>
       <td>Subject:</td>

package/extend/bajoTemplate/template/_mail/help-contact-form.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/bajoTemplate/template/_mail/mystuff-change-password.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/bajoTemplate/template/_mail/mystuff-reset-api-key.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/bajoTemplate/template/_mail/user-activation-success.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/bajoTemplate/template/_mail/user-forgot-password-changed.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/bajoTemplate/template/_mail/user-forgot-password-link.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/bajoTemplate/template/_mail/user-signup-success-active.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/bajoTemplate/template/_mail/user-signup-success.html CHANGED Viewed

@@ -1,3 +1,3 @@
 ---
-layout: waibu.layout:/email.html
+layout: sumba.layout:/email.html
 ---

package/extend/dobo/model/contact-form.json CHANGED Viewed

@@ -3,7 +3,7 @@
     "firstName,,50,true,true",
     "lastName,,50,true,true",
     "email,,50,true,true",
-    "cat,,50,true",
+    "category,,50,true",
     "subject,,255,,true",
     "message,text"
   ],

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -17,7 +17,6 @@ async function getUser (req, reply) {
 const forgotPasswordLink = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { sendMail } = this.app.waibu
     const { defaultsDeep } = this.app.lib.aneka
     const { importPkg } = this.app.bajo
     const { isString } = this.app.lib._
@@ -41,14 +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: '' }
-        await sendMail(
-          'sumba.template:/_mail/user-forgot-password-changed.html',
-          { to, subject, data: user, 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/forgot-password.js CHANGED Viewed

@@ -2,7 +2,6 @@ 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.app.lib.aneka
     const { dayjs } = this.app.lib
     const model = this.app.dobo.getModel('SumbaUser')
@@ -20,9 +19,10 @@ const profile = {
         const exp = req.site.setting.sumba.forgotPasswordExpDur
         data.fpToken = Buffer.from(`${data.token}:${dayjs().add(exp, 'ms').unix()}`).toString('base64')
         data._meta = { hostHeader: req.headers.host }
-        await sendMail(
+        const payload = { to, subject, data }
+        await this.sendMail(
           'sumba.template:/_mail/user-forgot-password-link.html',
-          { to, subject, data, options, source: this.ns }
+          { payload, options, source: this.ns }
         )
         req.flash('notify', req.t('emailSent'))
         return reply.redirectTo(this.config.redirect.signin)

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/index.js CHANGED Viewed

@@ -541,6 +541,39 @@ async function factory (pkgName) {
       const items = await model.findAllRecord()
       return items.map(item => ({ value: item.id, text: item.name }))
     }
+    /**
+     * Method to send mail through Masohi Messaging System. It is a thin wrapper
+     * for {@link https://github.com/ardhi/masohi-mail|masohi-mail} send method.
+     *
+     * If both masohiMail and waibu are not loaded, nothing is delivered.
+     *
+     * @method
+     * @async
+     * @param {(string|Array)} tpl - Mail's template to use. If a string is given, the same template will be used for html & plaintext versions. Otherwise, the first template will be used for html mail, and the second one is for it's plaintext version
+     * @param {Object} [params={}] - {@link https://github.com/ardhi/masohi-mail|masohi-mail}'s params object.
+     * @returns
+     */
+    sendMail = async (tpl, { payload = {}, conn, source, options = {} } = {}) => {
+      if (!this.app.masohiMail || !this.app.waibu) return
+      conn = conn ?? 'masohiMail:default'
+      const { importModule } = this.app.bajo
+      const { get, isString } = this.app.lib._
+      const { generateId } = this.app.lib.aneka
+      const { render } = this.app.bajoTemplate
+      const buildLocals = await importModule('waibu:/lib/build-locals.js')
+      if (isString(tpl)) tpl = [tpl]
+      const locals = await buildLocals.call(this, { params: payload.data, opts: options })
+      payload.from = payload.from ?? get(options, 'req.site.email', payload.from)
+      const opts = {
+        lang: get(options, 'req.lang'),
+        groupId: get(options, 'req.id', generateId())
+      }
+      payload.html = await render(tpl[0], locals, opts)
+      if (tpl[1]) payload.text = await render(tpl[1], locals, opts)
+      await this.app.masohiMail.send({ payload, source: source ?? this.ns, conn })
+    }
   }
   return Sumba

package/package.json CHANGED Viewed

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

package/wiki/CHANGES.md CHANGED Viewed

@@ -1,5 +1,15 @@
 # Changes
+## 2026-03-05
+- [2.6.0] Update multiple endpoints to support dobo's transaction
+- [2.6.0] Bug fix on ```profile.edit``` route
+## 2026-03-02
+- [2.5.0] Add ```sendMail()``` to send mail using ```masohiMail```
+- [2.5.0] Update all mail templates and hooks to match with the new specs
 ## 2026-02-21
 - [2.4.1] Bug fix on intl functions. Now moved to ```preParsing``` instead of ```onRequest```