sumba 1.0.21 → 1.0.23

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

@@ -1,13 +1,29 @@
 async function afterRecordUpdate (id, body, options = {}, rec) {
   if (!(this.app.masohi && this.app.masohiMail)) return
+
   const { data, oldData } = rec
-  if (!(oldData.status === 'UNVERIFIED' && data.status === 'ACTIVE')) return
-  options.tpl = 'sumba.template:/_mail/user-activation-success.html'
   const to = `${data.firstName} ${data.lastName} <${data.email}>`
-  const subject = options.req.t('userActivation')
-  try {
-    await this.app.masohi.send({ to, subject, message: data, options })
-  } catch (err) {}
+  let subject
+
+  const send = async () => {
+    try {
+      await this.app.masohi.send({ to, subject, message: data, options })
+    } catch (err) {
+    }
+  }
+  if (oldData.status === 'UNVERIFIED' && data.status === 'ACTIVE') {
+    subject = options.req.t('userActivation')
+    options.tpl = 'sumba.template:/_mail/user-activation-success.html'
+    await send()
+  } else if (oldData.token !== data.token) {
+    subject = options.req.t('resetApiKey')
+    options.tpl = 'sumba.template:/_mail/mystuff-reset-api-key.html'
+    await send()
+  } else if (body.password) {
+    subject = options.req.t('changePassword')
+    options.tpl = 'sumba.template:/_mail/mystuff-change-password.html'
+    await send()
+  }
 }
 
 export default afterRecordUpdate

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

@@ -3,7 +3,7 @@ async function doboSumbaUserAfterRecordValidation (body, options) {
   const { has } = this.app.bajo.lib._
 
   if (has(body, 'password') && !isBcrypt(body.password)) body.password = await hash(body.password, 'bcrypt')
-  if (has(body, 'token') && !isMd5(body.token)) body.token = await hash(body.password)
+  if (has(body, 'token') && !isMd5(body.token)) body.token = await hash(body.password ?? body.token)
 }
 
 export default doboSumbaUserAfterRecordValidation

package/bajo/intl/en-US.json

@@ -87,11 +87,13 @@
     "cat": "Category"
   },
   "validation": {
-    "password.minOfUppercase": "Contains at leaset {{min}} uppercase characters",
-    "password.minOfSpecialCharacters": "Contains at least {{min}} special characters",
-    "password.minOfLowercase": "Contains at least {{min}} special characters",
-    "password.minOfNumeric": "Contains at least {{min}} numerical characters",
-    "password.noWhiteSpaces": "No space allowed",
-    "password.onlyLatinCharacters": "Only latin characters allowed"
+    "password": {
+      "minOfUppercase": "Contains at leaset %(min)s uppercase characters",
+      "minOfSpecialCharacters": "Contains at least %(min)s special characters",
+      "minOfLowercase": "Contains at least %(min)s special characters",
+      "minOfNumeric": "Contains at least %(min)s numerical characters",
+      "noWhiteSpaces": "No space allowed",
+      "onlyLatinCharacters": "Only latin characters allowed"
+    }
   }
 }

package/bajo/intl/id.json

@@ -89,11 +89,13 @@
     "cat": "Kategori"
   },
   "validation": {
-    "password.minOfUppercase": "Mengandung setidaknya {{min}} huruf besar",
-    "password.minOfSpecialCharacters": "Mengandung setidaknya {{min}} karakter spesial",
-    "password.minOfLowercase": "Mengandung setidaknya {{min}} huruf kecil",
-    "password.minOfNumeric": "Mengandung setidaknya {{min}} numerik/angka",
-    "password.noWhiteSpaces": "Tidak boleh ada spasi",
-    "password.onlyLatinCharacters": "Harus berupa karakter latin saja"
+    "password": {
+      "minOfUppercase": "Mengandung setidaknya %(min)s huruf besar",
+      "minOfSpecialCharacters": "Mengandung setidaknya %(min)s karakter spesial",
+      "minOfLowercase": "Mengandung setidaknya %(min)s huruf kecil",
+      "minOfNumeric": "Mengandung setidaknya %(min)s numerik/angka",
+      "noWhiteSpaces": "Tidak boleh ada spasi",
+      "onlyLatinCharacters": "Harus berupa karakter latin saja"
+    }
   }
 }

package/{waibuMpa → bajoTemplate}/layout/default.html

@@ -8,7 +8,7 @@
       <c:app-launcher trigger />
       <c:heading margin="bottom-4" text="align:center" type="3-display" content="<%= page.title %>" />
       <!-- body -->
-      <c:include resource="sumba.partial:/layout/footer.html" />
+      <!-- include sumba.partial:/layout/footer.html -->
     </c:grid-col>
     <c:grid-col col="4-md"></c:grid-col>
   </c:grid-row>

package/{waibuMpa → bajoTemplate}/layout/info.html

@@ -1,13 +1,13 @@
 <c:page-start title="<%= page.fullTitle %>" />
 <c:main flex>
-  <c:include resource="sumba.partial:/layout/sidebar.html" />
+  <!-- include sumba.partial:/layout/sidebar.html -->
   <c:div flex="fill column">
-    <c:include resource="sumba.partial:/layout/navbar.html" />
-    <c:include resource="sumba.partial:/layout/breadcrumb.html" />
+    <!-- include sumba.partial:/layout/navbar.html -->
+    <!-- include sumba.partial:/layout/breadcrumb.html -->
     <c:container margin="start-0 bottom-5" padding="x-3">
       <c:div style="max-width: 992px;">
         <!-- body -->
-        <c:include resource="sumba.partial:/layout/footer.html" />
+        <!-- include sumba.partial:/layout/footer.html -->
       </c:div>
     </c:container>
   </c:div>

package/{waibuMpa → bajoTemplate}/layout/wide.html

@@ -1,13 +1,13 @@
 <c:page-start title="<%= page.fullTitle %>" />
 <c:main flex>
-  <c:include resource="sumba.partial:/layout/sidebar.html" />
+  <!-- include sumba.partial:/layout/sidebar.html -->
   <c:div flex="fill column">
-    <c:include resource="sumba.partial:/layout/navbar.html" />
-    <c:include resource="sumba.partial:/layout/breadcrumb.html" />
+    <!-- include sumba.partial:/layout/navbar.html -->
+    <!-- include sumba.partial:/layout/breadcrumb.html -->
     <c:container margin="start-0 bottom-5" padding="x-3">
       <c:div style="max-width: 992px;">
         <!-- body -->
-        <c:include resource="sumba.partial:/layout/footer.html" />
+        <!-- include sumba.partial:/layout/footer.html -->
       </c:div>
     </c:container>
   </c:div>

package/bajoTemplate/partial/_mail/mystuff-change-password.html

@@ -0,0 +1,3 @@
+<p>Your password has been changed successfully. Please only use your new password
+as the old one is no longer valid.</p>
+<p>Thank you!</p>

package/bajoTemplate/partial/_mail/mystuff-change-password.id.html

@@ -0,0 +1,3 @@
+<p>Kata sandi Anda telah diubah dengan sukses. Silahkan hanya gunakan kata sandi
+baru Anda karena yang lama sudah tidak berlaku lagi.</p>
+<p>Terima kasih!</p>

package/bajoTemplate/partial/_mail/mystuff-reset-api-key.html

@@ -0,0 +1,3 @@
+<p>Your API key has been successfully reset. Please make sure to use the new key
+in every connected application as the old key is no longer valid.</p>
+<p>Thank you!</p>

package/bajoTemplate/partial/_mail/mystuff-reset-api-key.id.html

@@ -0,0 +1,4 @@
+<p>Kunci API Anda telah direset dengan sukses. Pastikan untuk memakai
+kunci baru di setiap aplikasi yang terhubung karena kunci yang lama sudah
+tidak berlaku lagi.</p>
+<p>Terima kasih!</p>

package/{waibuMpa → bajoTemplate}/partial/help/trouble-tickets/list.html

@@ -7,4 +7,4 @@
   </c:grid-col>
 </c:grid-row>
 <c:wdb-table responsive body-divider strip hover details-href="sumba:/help/trouble-tickets/details/:id" />
-<c:include resource="waibuDb.partial:/crud/_list-footer.html" />
+<!-- include waibuDb.partial:/crud/_list-footer.html -->

package/{waibuMpa → bajoTemplate}/partial/my-stuff/profile/edit.html

@@ -1,4 +1,4 @@
-<c:form referer>
+<c:form referer enctype="multipart/form-data">
   <c:grid-row>
     <c:grid-col col="8-md">
       <c:fieldset t:legend="meta" grid-gutter="2" margin="bottom-3">
@@ -24,7 +24,7 @@
     </c:grid-col>
     <c:grid-col col="4-md">
       <c:heading type="5" t:content="image" />
-      <c:img holder="400x200" responsive rounded />
+      <c:img src="dobo:/attachment/SumbaUser/<%= form.id %>/profile/main.png" responsive rounded />
       <c:form-file name="image" no-label wrapper-margin="top-2"/>
       <c:btn-group margin="top-3" flex="full">
         <c:btn type="reset" t:content="reset" color="secondary" />
@@ -44,7 +44,7 @@
       <c:list type="unstyled" margin="top-3">
         <c:list-item href="sumba:/my-stuff/profile" t:content="backToProfile" icon="arrowStart" />
       </c:list>
-      <c:include resource="sumba.partial:/api-key-modal.html" />
+      <!-- include sumba.partial:/api-key-modal.html -->
     </c:grid-col>
   </c:grid-row>
 </c:form>

package/{waibuMpa → bajoTemplate}/partial/my-stuff/profile/view.html

@@ -23,12 +23,12 @@
   </c:grid-col>
   <c:grid-col col="4-md">
     <c:heading type="5" t:content="image" />
-    <c:img holder="400x200" responsive rounded />
+    <c:img src="dobo:/attachment/SumbaUser/<%= form.id %>/profile/main.png" responsive rounded />
     <c:heading type="5" t:content="more" margin="top-3" />
     <c:list type="group" hover>
       <c:list-item href="sumba:/my-stuff/profile/edit" t:content="updateProfile" />
       <c:list-item t:content="displayApiKey" target="api-key-modal"/>
     </c:list>
-    <c:include resource="sumba.partial:/api-key-modal.html" />
+    <!-- include sumba.partial:/api-key-modal.html -->
   </c:grid-col>
 </c:grid-row>

package/bajoTemplate/partial/my-stuff/reset-api-key.html

@@ -0,0 +1,10 @@
+<c:grid-row>
+  <c:grid-col col="6-md">
+    <c:form button reset-validation>
+      <c:form-plaintext name="apiKey" label-floating wrapper-margin="bottom-2" />
+      <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
+    </c:form>
+  </c:grid-col>
+  <c:grid-col col="6-md">
+  </c:grid-col>
+</c:grid-row>

package/{waibuMpa → bajoTemplate}/partial/signin.html

@@ -4,8 +4,8 @@
 </c:form>
 <% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
-  <c:include resource="sumba.partial:/list-item/forgot-password.html" />
-  <c:include resource="sumba.partial:/list-item/user-signup.html" />
-  <c:include resource="sumba.partial:/list-item/goto-home.html" />
+  <!-- include sumba.partial:/list-item/forgot-password.html -->
+  <!-- include sumba.partial:/list-item/user-signup.html -->
+  <!-- include sumba.partial:/list-item/goto-home.html -->
 </c:list>
 <% } %>

package/bajoTemplate/partial/user/activation.html

@@ -0,0 +1,10 @@
+<c:form button reset-validation referer>
+  <c:form-input name="key" label-floating />
+</c:form>
+<% if (!page.noLinks) { %>
+<c:list type="unstyled" margin="start-3">
+  <!-- include sumba.partial:/list-item/signin.html -->
+  <!-- include sumba.partial:/list-item/forgot-password.html -->
+  <!-- include sumba.partial:/list-item/goto-home.html -->
+</c:list>
+<% } %>

package/{waibuMpa → bajoTemplate}/partial/user/forgot-password.html

@@ -3,12 +3,12 @@
   <c:form-input name="usernameEmail" label-floating wrapper-margin="bottom-2" t:hint="linkPasswordWillbeSent"/>
 </c:form>
 <% } else { %>
-<c:include resource="sumba.partial:/user/forgot-password-nomail.md" />
+<!-- include sumba.partial:/user/forgot-password-nomail.md" />
 <% } %>
 <% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
-  <c:include resource="sumba.partial:/list-item/signin.html" />
-  <c:include resource="sumba.partial:/list-item/user-signup.html" />
-  <c:include resource="sumba.partial:/list-item/goto-home.html" />
+  <!-- include sumba.partial:/list-item/signin.html -->
+  <!-- include sumba.partial:/list-item/user-signup.html -->
+  <!-- include sumba.partial:/list-item/goto-home.html -->
 </c:list>
 <% } %>

package/bajoTemplate/partial/user/fpl-invalid.html

@@ -0,0 +1 @@
+<!-- include sumba.partial:/user/fpl-invalid.md" />

package/{waibuMpa → bajoTemplate}/partial/user/signup/form.html

@@ -9,8 +9,8 @@
 </c:form>
 <% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
-  <c:include resource="sumba.partial:/list-item/forgot-password.html" />
-  <c:include resource="sumba.partial:/list-item/signin.html" />
-  <c:include resource="sumba.partial:/list-item/goto-home.html" />
+  <!-- include sumba.partial:/list-item/forgot-password.html -->
+  <!-- include sumba.partial:/list-item/signin.html -->
+  <!-- include sumba.partial:/list-item/goto-home.html -->
 </c:list>
 <% } %>

package/{waibuMpa → bajoTemplate}/partial/user/signup/success.html

@@ -1,7 +1,7 @@
 <% if (_hasPlugin('masohiMail')) { %>
-<c:include resource="sumba.partial:/user/signup/success-mail.md" />
+<!-- include sumba.partial:/user/signup/success-mail.md" />
 <% } else { %>
-<c:include resource="sumba.partial:/user/signup/success-nomail.md" />
+<!-- include sumba.partial:/user/signup/success-nomail.md" />
 <% } %>
 <% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">

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

@@ -0,0 +1,3 @@
+---
+layout: waibuMpa.layout:/email.html
+---

package/bajoTemplate/template/_mail/user-signup-success.html

@@ -0,0 +1,3 @@
+---
+layout: waibuMpa.layout:/email.html
+---

package/dobo/schema/user.json

@@ -43,7 +43,7 @@
     "fields": ["email", "siteId"],
     "unique": true
   }],
-  "hidden": ["password", "token"],
+  "hidden": ["password"],
   "feature": {
     "sumba.address": true,
     "sumba.social": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {

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

@@ -14,7 +14,6 @@ const id = {
     if (req.method === 'POST') {
       try {
         form.masterId = master.id + ''
-        console.log(form, master)
         await recordCreate({ model: 'SumbaTicketDetail', req, body: form })
         return reply.redirectTo('sumba:/help/trouble-tickets/list')
       } catch (err) {

package/waibuMpa/route/my-stuff/change-password.js

@@ -23,10 +23,10 @@ const profile = {
         } catch (err) {
           throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        const rec = await recordGet(model, req.user.id)
+        const rec = await recordGet(model, 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, noFlash: true })
+        await recordUpdate(model, req.user.id, { password: req.body.newPassword }, { req, reply, noFlash: true })
         // signout and redirect to signin
         req.session.user = null
         req.flash('notify', req.t('passwordChangedReSignin'))

package/waibuMpa/route/my-stuff/profile/edit.js

@@ -2,29 +2,33 @@ const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.bajo
-    const { attachmentCopyUploaded } = this.app.dobo
+    // const { attachmentCopyUploaded } = this.app.dobo
     const { recordUpdate, recordGet } = this.app.waibuDb
-    const { has } = this.app.bajo.lib._
+    const { omit, pick } = this.app.bajo.lib._
     const { hash } = this.app.bajoExtra
     const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: true, noHook: true, noCache: true } })
-    let form = defaultsDeep(req.body, resp.data)
+    let form = defaultsDeep(req.body, omit(resp.data, ['password']))
+    form.token = await hash(form.token)
     let error
     if (req.method === 'POST') {
       try {
+        /*
         if (has(req.body, 'profile')) {
-          const opts = { req, setField: 'profile', setFile: 'main.png' }
+          const opts = { req, setField: 'profile', setFile: 'main.png', noFlash: true }
           await attachmentCopyUploaded('SumbaUser', req.user.id, opts)
         } else {
-          const resp = await recordUpdate({ req, model: 'SumbaUser', id: req.user.id, body: form, options: { noFlash: true, hidden: [] } })
-          form = resp.data
-          req.flash('notify', req.t('profileUpdated'))
-        }
+        */
+        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 })
+        form = resp.data
+        req.flash('notify', req.t('profileUpdated'))
+        return reply.redirectTo('sumba:/my-stuff/profile')
+        // }
       } catch (err) {
-        console.log(err)
         error = err
       }
     }
-    if (form.token) form.token = await hash(form.token)
     return reply.view('sumba.template:/my-stuff/profile/edit.html', { form, error })
   }
 }

package/waibuMpa/route/my-stuff/profile.js

@@ -3,7 +3,8 @@ const profile = {
   handler: async function (req, reply) {
     const { hash } = this.app.bajoExtra
     const { recordGet } = this.app.waibuDb
-    const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options: { forceNoHidden: true, noHook: true, noCache: true } })
+    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 form = resp.data
     form.token = await hash(form.token)
     return reply.view('sumba.template:/my-stuff/profile/view.html', { form })

package/waibuMpa/route/my-stuff/reset-api-key.js

@@ -20,13 +20,13 @@ const resetApiKey = {
         } catch (err) {
           throw this.error('validationError', { details: err.details, values: err.values, ns: this.name, statusCode: 422, code: 'DB_VALIDATION' })
         }
-        const rec = await recordGet(model, req.user.id)
+        const rec = await recordGet(model, req.user.id, { forceNoHidden: true })
         const verified = await bcrypt.compare(req.body.password, rec.password)
         if (!verified) throw this.error('validationError', { details: [{ field: 'password', error: 'invalidPassword' }], statusCode: 400 })
-        await recordUpdate(model, req.user.id, { token: generateId() })
+        await recordUpdate(model, req.user.id, { token: generateId() }, { req, reply, noFlash: true })
         await delay(2000) // ensure req.user cache is expired
         req.flash('notify', req.t('resetApiKeySuccessfull'))
-        return reply.redirectTo('sumba:/profile')
+        return reply.redirectTo('sumba:/my-stuff/profile')
       } catch (err) {
         error = err
       }

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

@@ -48,7 +48,6 @@ const forgotPasswordLink = {
         req.flash('notify', req.t('passwordChangedReSignin'))
         return reply.redirectTo(this.config.redirect.signin)
       } catch (err) {
-        console.log(err)
         error = err
       }
     }

package/waibuMpa/partial/my-stuff/reset-api-key.html

@@ -1,12 +0,0 @@
-<c:form button reset-validation>
-  <c:form-plaintext name="apiKey" label-floating wrapper-margin="bottom-2" />
-  <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
-</c:form>
-<% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
-  <c:include resource="sumba.partial:/list-item/your-profile.html" />
-  <c:include resource="sumba.partial:/list-item/change-password.html" />
-  <c:include resource="sumba.partial:/list-item/signout.html" />
-  <c:include resource="sumba.partial:/list-item/goto-home.html" />
-</c:list>
-<% } %>

package/waibuMpa/partial/user/activation.html

@@ -1,10 +0,0 @@
-<c:form button reset-validation referer>
-  <c:form-input name="key" label-floating />
-</c:form>
-<% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
-  <c:include resource="sumba.partial:/list-item/signin.html" />
-  <c:include resource="sumba.partial:/list-item/forgot-password.html" />
-  <c:include resource="sumba.partial:/list-item/goto-home.html" />
-</c:list>
-<% } %>

package/waibuMpa/partial/user/fpl-invalid.html

@@ -1 +0,0 @@
-<c:include resource="sumba.partial:/user/fpl-invalid.md" />