sumba 1.0.19 → 1.0.21

package/bajo/config.json

@@ -12,7 +12,9 @@
       "/my-stuff": "sumba:/my-stuff/profile",
       "/info": "sumba:/info/about-us",
       "/user": "sumba:/my-stuff/profile",
-      "/db/export": "sumba:/db/export/list"
+      "/db/export": "sumba:/db/export/list",
+      "/help": "sumba:/help/contact-form",
+      "/help/trouble-tickets": "sumba:/help/trouble-tickets/list"
     }
   },
   "waibuAdmin": {
@@ -56,12 +58,15 @@
     "signout": "sumba:/signout",
     "afterSignout": "/"
   },
-  "userPassword": {
-    "minUppercase": 1,
-    "minLowercase": 1,
-    "minSpecialChar": 1,
-    "minNumeric": 1,
-    "noWhitespace": false,
-    "latinOnlyChars": false
+  "siteSetting": {
+    "forgotPasswordExpDur": "5m",
+    "userPassword": {
+      "minUppercase": 1,
+      "minLowercase": 1,
+      "minSpecialChar": 1,
+      "minNumeric": 1,
+      "noWhitespace": false,
+      "latinOnlyChars": false
+    }
   }
 }

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

@@ -0,0 +1,12 @@
+async function afterRecordCreate (body, options = {}, rec) {
+  if (!(this.app.masohi && this.app.masohiMail)) return
+  options.tpl = 'sumba.template:/_mail/user-signup-success.html'
+  const { data } = rec
+  const to = `${data.firstName} ${data.lastName} <${data.email}>`
+  const subject = options.req.t('newUserSignup')
+  try {
+    await this.app.masohi.send({ to, subject, message: data, options })
+  } catch (err) {}
+}
+
+export default afterRecordCreate

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

@@ -0,0 +1,13 @@
+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) {}
+}
+
+export default afterRecordUpdate

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

@@ -2,7 +2,7 @@ import passwordRule from '../../lib/password-rule.js'
 
 async function doboSumbaUserBeforeRecordValidation (body, options = {}) {
   const { set } = this.app.bajo.lib._
-  const password = await passwordRule.call(this)
+  const password = await passwordRule.call(this, options.req)
   const rule = { password }
   set(options, 'validation.params.rule', rule)
 }

package/bajo/intl/en-US.json

@@ -24,7 +24,7 @@
   "signin": "Signin",
   "yourStuff": "Your Stuff",
   "forgotPassword": "Forgot Password",
-  "userActivation": "User Activation",
+  "userActivation": "Account Activation",
   "signup": "Signup",
   "newUserSignup": "New User Signup",
   "updateProfile": "Update Profile",
@@ -58,15 +58,22 @@
   "help": "Help",
   "troubleTickets": "Trouble Tickets",
   "guest": "Guest",
-  "formSubmitted": "Form submitted successfully",
-  "formSubmittedInfo": "Please allow us to read your submission thoroughly and we'll get back to you rightaway",
-  "thankYou": "Thank you!",
   "warningMemberOnly%s": "Please authenticate yourself first, because the <a href=\"%s\">page<a> your're trying to access is a member only page",
   "collectingRouteGuards": "Collecting route guards:",
   "secureRoutes%d": "- Secure routes: %d",
   "secureInvRoutes%d": "- Secure, inverted routes: %d",
   "anonRoutes%d": "- Anonymous routes: %d",
   "anonInvRoutes%d": "- Anonymous, inverted routes: %d",
+  "replies": "Replies",
+  "compose": "Compose",
+  "yourReply": "Your Reply",
+  "you": "You",
+  "us": "Us",
+  "support": "Support",
+  "unknownUsernameEmailOrInactive": "Unknown username/email or account is inactive",
+  "emailSent": "An email has been sent to your address",
+  "forgotPasswordLink": "Forgot Password Link",
+  "forgotPasswordChanged": "Password Successfully Changed",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",
@@ -76,7 +83,8 @@
     "hostname": "Hostname",
     "iconset": "Iconset",
     "subject": "Subject",
-    "message": "Message"
+    "message": "Message",
+    "cat": "Category"
   },
   "validation": {
     "password.minOfUppercase": "Contains at leaset {{min}} uppercase characters",

package/bajo/intl/id.json

@@ -24,7 +24,7 @@
   "signin": "Masuk",
   "yourStuff": "Perkakas Anda",
   "forgotPassword": "Lupa Kata Sandi",
-  "userActivation": "Aktivasi Pengguna",
+  "userActivation": "Aktivasi Akun",
   "signup": "Pendaftaran",
   "newUserSignup": "Pendaftaran Pengguna Baru",
   "updateProfile": "Perbarui Profil",
@@ -52,21 +52,29 @@
   "cookiePolicy": "Kebijakan Cookie",
   "privacy": "Privasi",
   "privacyStatement": "Pernyataan Privasi",
-  "terms": "Terms",
+  "terms": "Ketentuan",
   "termsConditions": "Term dan Kondisi",
   "legalInfo": "Info Legal",
   "help": "Bantuan",
   "troubleTickets": "Tiket Masalah",
   "guest": "Tamu",
-  "formSubmitted": "Formulir sukses dikirim",
-  "formSubmittedInfo": "Kami akan mereview sebentar kiriman Anda dan akan menghubungi Anda kembali secepatnya",
-  "thankYou": "Thank you!",
   "warningMemberOnly%s": "Silahkan melalukan otentikasi terlebih dahulu karena <a href=\"%s\">halaman<a> yang akan Anda akses adalah salah satu halaman khusus anggota saja",
   "collectingRouteGuards": "Mengoleksi pertahanan jalur:",
   "secureRoutes%d": "- Jalur aman: %d",
   "secureInvRoutes%d": "- Jalur aman, terbalik: %d",
   "anonRoutes%d": "- Jalur anonim: %d",
   "anonInvRoutes%d": "- Jalur anonim, terbalik: %d",
+  "conversation": "Percakapan",
+  "replies": "Balas Berbalas",
+  "compose": "Tulis",
+  "yourReply": "Balasan Anda",
+  "you": "Anda",
+  "us": "Kami",
+  "support": "Bantuan",
+  "unknownUsernameEmailOrInactive": "Nama pengguna/surel tidak dikenal atau akun belum aktif",
+  "emailSent": "Sebuah surel telah dikirim ke alamat Anda",
+  "forgotPasswordLink": "Tautan Lupa Kata Sandi",
+  "forgotPasswordChanged": "Kata Sandi Sukses Diubah",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",
@@ -77,7 +85,8 @@
     "hostname": "Nama Host",
     "iconset": "Iconset",
     "subject": "Judul",
-    "message": "Pesan"
+    "message": "Pesan",
+    "cat": "Kategori"
   },
   "validation": {
     "password.minOfUppercase": "Mengandung setidaknya {{min}} huruf besar",

package/bajo/method/create-excerpt.js

@@ -0,0 +1,11 @@
+// based on: https://medium.com/@paulohfev/problem-solving-how-to-create-an-excerpt-fdb048687928
+
+function createExcerpt (content, maxWords = 100, trailChars = '...') {
+  const listOfWords = content.trim().split(' ')
+  const truncatedContent = listOfWords.slice(0, maxWords).join(' ')
+  const excerpt = truncatedContent + trailChars
+  const output = listOfWords.length > maxWords ? excerpt : content
+  return output
+}
+
+export default createExcerpt

package/dobo/feature/category.js

@@ -0,0 +1,16 @@
+async function category (opts = {}) {
+  return {
+    properties: [{
+      name: 'name',
+      type: 'string',
+      maxLength: 50,
+      index: true
+    }, {
+      name: 'level',
+      type: 'integer',
+      index: true
+    }]
+  }
+}
+
+export default category

package/dobo/fixture/contact-form-cat.json

@@ -0,0 +1,21 @@
+[{
+  "name": "QUESTION",
+  "level": 2,
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "INQUIRY",
+  "level": 1,
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "BILLING",
+  "level": 4,
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "API",
+  "level": 3,
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "MISC",
+  "level": 5,
+  "siteId": "?:SumbaSite::alias:default"
+}]

package/dobo/fixture/trouble-cat.json

@@ -0,0 +1,13 @@
+[{
+  "name": "TECHNICAL",
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "BILLING",
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "API",
+  "siteId": "?:SumbaSite::alias:default"
+}, {
+  "name": "MISC",
+  "siteId": "?:SumbaSite::alias:default"
+}]

package/dobo/schema/contact-form-cat.json

@@ -0,0 +1,3 @@
+{
+  "feature": ["sumba.category", "sumba.siteId"]
+}

package/dobo/schema/contact-form.json

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

package/dobo/schema/ticket-cat.json

@@ -0,0 +1,3 @@
+{
+  "feature": ["sumba.category", "sumba.siteId"]
+}

package/dobo/schema/ticket-detail.json

@@ -0,0 +1,7 @@
+{
+  "properties": [
+    "masterId::255:true:true",
+    "message:text"
+  ],
+  "feature": ["createdAt", "sumba.userId", "sumba.siteId"]
+}

package/dobo/schema/ticket.json

@@ -0,0 +1,17 @@
+{
+  "properties": [
+    "subject::255:true:true",
+    "cat::50:true",
+    "message:text:::true"
+  ],
+  "feature": {
+    "createdAt": true,
+    "updatedAt": true,
+    "sumba.siteId": true,
+    "sumba.userId": true,
+    "sumba.status": {
+      "default": "OPEN",
+      "values": ["OPEN", "CLOSED"]
+    }
+  }
+}

package/lib/check-site-id.js

@@ -1,5 +1,5 @@
 async function mergeSetting (req) {
-  const { defaultsDeep } = this.app.bajo
+  const { defaultsDeep, parseObject } = this.app.bajo
   const { trim, get, filter } = this.app.bajo.lib._
   const { recordFind } = this.app.dobo
   const defSetting = {}
@@ -21,7 +21,7 @@ async function mergeSetting (req) {
       nsSetting[ns][item.key] = value
     }
   }
-  req.site.setting = defaultsDeep({}, nsSetting, defSetting)
+  req.site.setting = parseObject(defaultsDeep({}, nsSetting, defSetting))
 }
 
 const omitted = ['status']

package/lib/password-rule.js

@@ -1,6 +1,6 @@
 import { joiPasswordExtendCore } from 'joi-password'
 
-async function passwordRule () {
+async function passwordRule (req) {
   const { importPkg } = this.app.bajo
   const joi = await importPkg('dobo:joi')
   const joiPassword = joi.extend(joiPasswordExtendCore)
@@ -9,12 +9,13 @@ async function passwordRule () {
     .min(8)
     .max(100)
     .required()
-  if (this.config.userPassword.minUppercase) password = password.minOfUppercase(this.config.userPassword.minUppercase)
-  if (this.config.userPassword.minLowercase) password = password.minOfLowercase(this.config.userPassword.minLowercase)
-  if (this.config.userPassword.minSpecialChar) password = password.minOfSpecialCharacters(this.config.userPassword.minSpecialChar)
-  if (this.config.userPassword.minNumeric) password = password.minOfNumeric(this.config.userPassword.minNumeric)
-  if (this.config.userPassword.noWhitespace) password = password.noWhiteSpaces()
-  if (this.config.userPassword.latinOnlyChars) password = password.onlyLatinCharacters()
+  const cfg = req.site.setting.sumba.userPassword
+  if (cfg.minUppercase) password = password.minOfUppercase(cfg.minUppercase)
+  if (cfg.minLowercase) password = password.minOfLowercase(cfg.minLowercase)
+  if (cfg.minSpecialChar) password = password.minOfSpecialCharacters(cfg.minSpecialChar)
+  if (cfg.minNumeric) password = password.minOfNumeric(cfg.minNumeric)
+  if (cfg.noWhitespace) password = password.noWhiteSpaces()
+  if (cfg.latinOnlyChars) password = password.onlyLatinCharacters()
   return password
 }
 

package/package.json

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

package/sumba/waibu-mpa@secure-routes.json

@@ -1,5 +1,5 @@
 {
   "/my-stuff/*": ["*"],
   "/signout": ["*"],
-  "/help/trouble-tickets": ["*"]
+  "/help/trouble-tickets/*": ["*"]
 }

package/waibuMpa/partial/_mail/user-activation-success.html

@@ -0,0 +1,9 @@
+<p>Congratulations, your account with username <strong><%= username %></strong>
+has been successfully activated. Thus you can now access the Members-only pages
+according to the permissions set by your Admin.</p>
+
+<p>If you still have questions, please don't hesitate to
+fill out the form on the <strong>Help</strong> page.
+We will be happy to answer all your questions.</p>
+
+<p>Thank you!</p>

package/waibuMpa/partial/_mail/user-activation-success.id.html

@@ -0,0 +1,10 @@
+<p>Selamat, akun Anda dengan nama pengguna <strong><%= username %></strong>
+telah berhasil diaktivkan. Dengan demikian Anda telah bisa mengakses
+halaman-halaman khusus Anggota sesuai dengan permisi yang ditetapkan oleh
+Admin Anda.</p>
+
+<p>Jika Anda masih memiliki pertanyaan-pertanyaan, silahkan untuk tidak segan
+mengisi formulir di halaman <strong>Bantuan</strong>. Dengan senang hati
+kami akan menjawab semua pertanyaan Anda.</p>
+
+<p>Terima kasih!</p>

package/waibuMpa/partial/_mail/user-forgot-password-changed.html

@@ -0,0 +1,4 @@
+<p>Your password has been successfully changed via the <b>Forgot Password</b> page.
+Therefore, please use a new password because the old one is no longer valid.</p>
+
+<p>Please contact us if you are still having trouble, thank you!</p>

package/waibuMpa/partial/_mail/user-forgot-password-changed.id.html

@@ -0,0 +1,4 @@
+<p>Kata sandi Anda telah sukses diganti via fasilitas <b>Lupa Kata Sandi</b>. Untuk itu
+silahkan menggunakan kata sandi yang baru karena yang lama sudah tidak berlaku lagi.</p>
+
+<p>Silahkan hubungi kami jika Anda masih mengalami kendala, terima kasih!</p>

package/waibuMpa/partial/_mail/user-forgot-password-link.html

@@ -0,0 +1,9 @@
+<p>Here is a special password change link for you:</p>
+
+<% const url = 'http://' + _meta.hostHeader + _routePath('sumba:/user/forgot-password') + '/' + fpToken %>
+<p><a href="<%= url %>"><%= url %></a></p>
+
+<p>Please make the change immediately because after <strong>5 minutes</strong> the link above
+is no longer valid.</p>
+
+<p>Please contact us if you still have questions, thank you!</p>

package/waibuMpa/partial/_mail/user-forgot-password-link.id.html

@@ -0,0 +1,9 @@
+<p>Berikut adalah tautan khusus pergantian password untuk Anda:</p>
+
+<% const url = 'http://' + _meta.hostHeader + _routePath('sumba:/user/forgot-password') + '/' + fpToken %>
+<p><a href="<%= url %>"><%= url %></a></p>
+
+<p>Silahkan melakukan pergantian segera karena setelah <strong>5 menit</strong> tautan diatas
+tidak berlaku kembali.</p>
+
+<p>Silahkan hubungi kami jika Anda masih memiliki pertanyaan, terima kasih!</p>

package/waibuMpa/partial/_mail/user-signup-success.html

@@ -0,0 +1,16 @@
+<p>Welcome and thank your for joining us in <%= _meta.site.title %>.
+Please click the following link to activate your account:</p>
+
+<p><% const url = _meta.hostHeader + _routePath("sumba:/user/activation") + "?key=" + token %>
+<a href="http://<%= url %>">http://<%= url %></a></p>
+
+<p>If you are unable to click the link above, please visit our website
+at http://<%= _meta.hostHeader %>, then visit the <strong>Account Activation</strong> from
+the link available in the footer.</p>
+
+<p>Please copy the key below, then enter it in the input box on the page and press
+the <strong>Submit</strong> button:</p>
+
+<strong><%= token %></strong>
+
+<p>Once again, thank you for joining us. We hope our services will benefit you.<p>

package/waibuMpa/partial/_mail/user-signup-success.id.html

@@ -0,0 +1,17 @@
+<p>Selamat datang dan telah bergabung di <%= _meta.site.title %>. Selanjutnya,
+silahkan mengklik link dibawah ini untuk melakukan aktivasi akun anda:</p>
+
+<p><% const url = _meta.hostHeader + _routePath("sumba:/user/activation") + "?key=" + token %>
+<a href="http://<%= url %>">http://<%= url %></a></p>
+
+<p>Jika Ada tidak bisa mengklik link diatas, silahkan kunjungi situs kami
+di http://<%= _meta.hostHeader %>, kemudian kunjungi di halaman <strong>Aktivasi
+Akun</strong> dari link yang tersedia di catatan kaki.</p>
+
+<p>Silahkan kopi kunci dibawah ini, kemudian masukkan di kotak masukan yang
+ada di halaman tersebut dan tekan tombol <strong>Kirim</strong>:</p>
+
+<strong><%= token %></strong>
+
+<p>Sekali lagi terimakasih telah bergabung bersama kami, semoga layanan kami
+membawa manfaat untuk Anda.<p>

package/waibuMpa/partial/help/contact-form/form.html

@@ -3,11 +3,9 @@
   <c:form-input name="lastName" col="6-lg" label-floating <%= _meta.user ? 'readonly' : '' %> />
   <c:form-input type="email" col="6-lg" name="email" label-floating <%= _meta.user ? 'readonly' : '' %> />
   <c:form-select name="category" col="6-lg" label-floating>
-    <c:option value="QUESTION" t:content="Question" />
-    <c:option value="INQUIRY" t:content="Inquiry" />
-    <c:option value="BILLING" t:content="Billing" />
-    <c:option value="API" t:content="API Integration" />
-    <c:option value="MISC" t:content="Misc" />
+    <% for (const cat of cats) { %>
+    <c:option value="<%= cat.name %>" t:content="<%= _.camelCase('cat ' + cat.name) %>" />
+    <% } %>
   </c:form-select>
   <c:form-input name="subject" label-floating />
   <c:form-textarea name="message" label-floating style="height:10em"/>

package/waibuMpa/partial/help/trouble-tickets/add.html

@@ -0,0 +1,21 @@
+<c:form reset-validation grid-gutter="2">
+  <c:form-input name="subject" col="8-lg 6-md" label-floating />
+  <c:form-select name="cat" col="4-lg 6-md" label-floating>
+    <% for (const cat of cats) { %>
+    <c:option value="<%= cat.name %>" <%= form.cat === cat.name ? 'selected' : '' %> t:content="<%= _.camelCase('cat ' + cat.name) %>" />
+    <% } %>
+  </c:form-select>
+  <c:form-textarea name="message" label-floating style="height:10em"/>
+  <c:div flex="justify-content:between" margin="top-4">
+    <c:div>
+      <c:btn color="primary" icon="arrowStart" t:content="Back" href="sumba:/help/trouble-tickets/list" />
+      <% if (error) { %>
+      <c:a margin="start-2" icon="remove" t:content="Clear" x-data @click="wbs.invalidateForm" />
+      <% } %>
+    </c:div>
+    <c:div>
+      <c:btn type="reset" color="link" t:content="Reset" />
+      <c:btn type="submit" color="primary" t:content="Submit" />
+    </c:div>
+  </c:div>
+</c:form>

package/waibuMpa/partial/help/trouble-tickets/details.html

@@ -0,0 +1,26 @@
+<c:card margin="bottom-4">
+  <c:card-body shadow>
+    <c:card-title><%= master.subject %></c:card-title>
+    <c:card-subtitle>
+      <%= _format(master.createdAt, 'datetime') %>
+      <c:badge margin="start-2" background="color:primary"><%= master.status %></c:badge>
+    </c:card-subtitle>
+    <c:card-text>
+      <%= _parseMarkdown(master.message) %>
+    </c:card-text>
+  </c:card-body>
+</c:card>
+<c:grid-row>
+  <c:grid-col col="8-lg 6-md">
+    <c:wdb-table responsive body-divider strip hover no-details-click />
+    <c:div>
+      <c:wdb-pagination />
+    </c:div>
+  </c:grid-col>
+  <c:grid-col col="4-lg 6-md">
+    <c:form button reset-validation>
+      <c:form-textarea t:label="yourReply" name="message" label-floating style="height:10em"/>
+    </c:form>
+  </c:grid-col>
+</c:grid-row>
+

package/waibuMpa/partial/help/trouble-tickets/list.html

@@ -0,0 +1,10 @@
+<c:grid-row gutter="3" margin="bottom-3">
+  <c:grid-col col="4-lg">
+    <c:wdb-query />
+  </c:grid-col>
+  <c:grid-col col="8-lg" flex="justify-content:end-lg">
+    <c:wdb-btn-add href="sumba:/help/trouble-tickets/add"/>
+  </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" />

package/waibuMpa/partial/list-item/member-links.html

@@ -8,4 +8,7 @@
 <c:list-item href="sumba:/signin" t:content="signin" />
 <c:list-item href="sumba:/user/signup" t:content="signup" />
 <c:list-item href="sumba:/user/forgot-password" t:content="forgotPassword" />
+  <% if (_hasPlugin('masohi') && _hasPlugin('masohiMail')) { %>
+  <c:list-item href="sumba:/user/activation" t:content="userActivation" />
+  <% } %>
 <% } %>

package/waibuMpa/partial/user/forgot-password-nomail.id.md

@@ -0,0 +1,4 @@
+Anda lupa dengan kata sandi Anda? Tidak masalah, silahkan hubungi kami
+segera!
+
+Dengan senang hati kami akan membantu Anda!

package/waibuMpa/partial/user/forgot-password.html

@@ -1,6 +1,10 @@
+<% if (_hasPlugin('masohiMail')) { %>
 <c:form button reset-validation>
   <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" />
+<% } %>
 <% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
   <c:include resource="sumba.partial:/list-item/signin.html" />

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

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

package/waibuMpa/partial/user/fpl-invalid.id.md

@@ -0,0 +1,3 @@
+Link lupa kata sandi yang Anda masukkan salah atau sudah kadaluarsa dan tidak berlaku lagi. Silahkan membuatnya sekali lagi jika Anda masih menginginkannya.
+
+Untuk itu selalu pastikan bahwa Anda mengkliknya dari link yang dikirim melalui email, terima kasih!

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

@@ -0,0 +1,3 @@
+The forgot password link that you entered is incorrect or has expired and is no longer valid. Please make it again if you still want it.
+
+Therefore always make sure that you click on it from the link sent via email, thank you!

package/waibuMpa/partial/user/fpl.html

@@ -0,0 +1,5 @@
+<c:form button reset-validation referer>
+  <c:form-plaintext name="username" label-floating wrapper-margin="bottom-2" />
+  <c:form-password name="newPassword" label-floating wrapper-margin="bottom-2" />
+  <c:form-password name="verifyNewPassword" label-floating wrapper-margin="bottom-3" />
+</c:form>

package/waibuMpa/partial/user/signup/success-mail.id.md

@@ -0,0 +1,5 @@
+Formulir sukses dikirim.
+
+Sebuah email telah dikirimkan ke alamat email Anda berisikan link aktivasi akun Anda. Mohon untuk dicek dan melakukan aktivasi secepatnya.
+
+Terima kasih!

package/waibuMpa/partial/user/signup/success-mail.md

@@ -0,0 +1,5 @@
+Form submitted successfully.
+
+An email has been sent to your email address containing your account activation link. Please check and activate as soon as possible.
+
+Thank You!

package/waibuMpa/partial/user/signup/success-nomail.id.md

@@ -0,0 +1,5 @@
+Formulir sukses dikirim.
+
+Kami akan segera melakukan review kiriman Anda dan akan menghubungi Anda kembali secepatnya.
+
+Thank you!

package/waibuMpa/partial/user/signup/success-nomail.md

@@ -0,0 +1,5 @@
+Form submitted successfully.
+
+Please allow us to read your submission thoroughly and we'll get back to you as soon as possible.
+
+Thank you!

package/waibuMpa/partial/user/signup/success.html

@@ -1,6 +1,8 @@
-<c:p t:content="formSubmitted" />
-<c:p t:content="formSubmittedInfo" />
-<c:p t:content="thankYou" />
+<% if (_hasPlugin('masohiMail')) { %>
+<c:include resource="sumba.partial:/user/signup/success-mail.md" />
+<% } else { %>
+<c:include resource="sumba.partial:/user/signup/success-nomail.md" />
+<% } %>
 <% if (!page.noLinks) { %>
 <c:list type="unstyled" margin="start-3">
   <c:list-item t:content="gotoHome" href="/" icon="house"/>

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

@@ -3,7 +3,7 @@ const contactForm = {
   handler: async function (req, reply) {
     const { defaultsDeep } = this.app.bajo
     const { pick } = this.app.bajo.lib._
-    const { recordCreate } = this.app.waibuDb
+    const { recordCreate, recordFind } = this.app.waibuDb
 
     const def = req.user ? pick(req.user, ['firstName', 'lastName', 'email']) : {}
     const form = defaultsDeep(req.body, def)
@@ -17,7 +17,8 @@ const contactForm = {
         error = err
       }
     }
-    return reply.view('sumba.template:/help/contact-form/form.html', { form, error })
+    const cats = await recordFind({ model: 'SumbaContactFormCat', req, options: { sort: 'level:1+name:1', limit: -1, dataOnly: true } })
+    return reply.view('sumba.template:/help/contact-form/form.html', { form, error, cats })
   }
 }
 

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

@@ -0,0 +1,24 @@
+const model = 'SumbaTicket'
+
+const add = {
+  method: ['GET', 'POST'],
+  handler: async function (req, reply) {
+    const { recordCreate, recordFind } = this.app.waibuDb
+    const { defaultsDeep } = this.app.bajo.lib._
+    const options = {}
+    const form = defaultsDeep(req.body, {})
+    let error
+    if (req.method === 'POST') {
+      try {
+        await recordCreate({ 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 } })
+    return reply.view('sumba.template:/help/trouble-tickets/add.html', { form, error, cats })
+  }
+}
+
+export default add

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

@@ -0,0 +1,41 @@
+const model = 'SumbaTicketDetail'
+
+const id = {
+  method: ['GET', 'POST'],
+  handler: async function (req, reply) {
+    const { cloneDeep } = this.app.bajo.lib._
+    const { recordCreate, recordFind, 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]
+    if (!master) throw this.error('_notFound')
+    const form = cloneDeep(req.body)
+    let error
+    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) {
+        error = err
+      }
+    }
+    const query = { masterId: req.params.id + '' }
+    const options = { count: true, query }
+    const list = await recordFind({ model, req, options })
+    schema.view.disabled = ['update', 'remove']
+    schema.view.fields = ['createdAt']
+    schema.view.label = { createdAt: 'conversation' }
+    schema.view.formatter = {
+      createdAt: (val, rec) => {
+        const message = this.app.bajoMarkdown ? this.app.bajoMarkdown.parseContent(rec.message) : rec.message
+        const isMe = rec.userId === req.user.id
+        return `<c:div margin="bottom-3"><c:badge background="color:${isMe ? 'primary' : 'secondary'}" t:content="${isMe ? 'you' : 'us'}" /> <small>${req.format(val, 'datetime')}</small></c:div> ${message}`
+      }
+    }
+    return reply.view('sumba.template:/help/trouble-tickets/details.html', { list, schema, master, form, error })
+  }
+}
+
+export default id

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

@@ -0,0 +1,22 @@
+const model = 'SumbaTicket'
+
+const list = {
+  method: ['GET'],
+  handler: async function (req, reply) {
+    const { recordFind, getSchemaExt } = this.app.waibuDb
+    const { schema } = await getSchemaExt(model, 'list')
+    const options = { count: true }
+    const list = await recordFind({ model, req, options })
+    schema.view.disabled = ['update', 'remove']
+    schema.view.fields = ['createdAt', 'subject', 'status']
+    schema.view.label = { subject: 'Your Message' }
+    schema.view.formatter = {
+      subject: (val, rec) => {
+        return `<strong>${val}</strong><br />${this.createExcerpt(rec.message, 35)}`
+      }
+    }
+    return reply.view('sumba.template:/help/trouble-tickets/list.html', { list, schema })
+  }
+}
+
+export default list

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

@@ -12,7 +12,7 @@ const profile = {
     let error
     if (req.method === 'POST') {
       try {
-        const newPassword = await passwordRule.call(this)
+        const newPassword = await passwordRule.call(this, req)
         const schema = Joi.object({
           currentPassword: Joi.string().min(8).max(50).required(),
           newPassword,
@@ -26,11 +26,11 @@ const profile = {
         const rec = await recordGet(model, req.user.id)
         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 })
+        await recordUpdate(model, req.user.id, { password: req.body.newPassword }, { req, noFlash: true })
         // signout and redirect to signin
         req.session.user = null
         req.flash('notify', req.t('passwordChangedReSignin'))
-        return reply.redirectTo('sumba:/signin')
+        return reply.redirectTo(this.config.redirect.signin)
       } catch (err) {
         error = err
       }

package/waibuMpa/route/user/activation.js

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

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

@@ -0,0 +1,59 @@
+import passwordRule from '../../../../lib/password-rule.js'
+const model = 'SumbaUser'
+
+async function getUser (req, reply) {
+  const { dayjs } = this.app.bajo.lib
+  const { recordFind } = 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 } })
+  if (users.length === 0) return invalidFpl
+  return users[0]
+}
+
+const forgotPasswordLink = {
+  method: ['GET', 'POST'],
+  handler: async function (req, reply) {
+    const { defaultsDeep, importPkg } = this.app.bajo
+    const { isString } = this.app.bajo.lib._
+    const { recordUpdate } = this.app.dobo
+    const Joi = await importPkg('dobo:joi')
+
+    const form = defaultsDeep(req.body, {})
+    const user = await getUser.call(this, req, reply)
+    if (isString(user)) return reply.view(user)
+    form.username = user.username
+    let error
+    if (req.method === 'POST') {
+      try {
+        const newPassword = await passwordRule.call(this, req)
+        const schema = Joi.object({
+          newPassword,
+          verifyNewPassword: Joi.ref('newPassword')
+        })
+        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' })
+        }
+        await recordUpdate(model, user.id, { password: req.body.newPassword }, { req, noFlash: true })
+        const to = `${user.firstName} ${user.lastName} <${user.email}>`
+        const subject = req.t('forgotPasswordChanged')
+        const options = { req, reply, tpl: 'sumba.template:/_mail/user-forgot-password-changed.html' }
+        await this.app.masohi.send({ to, subject, message: user, options })
+        req.flash('notify', req.t('passwordChangedReSignin'))
+        return reply.redirectTo(this.config.redirect.signin)
+      } catch (err) {
+        console.log(err)
+        error = err
+      }
+    }
+    return reply.view('sumba.template:/user/fpl.html', { form, error })
+  }
+}
+
+export default forgotPasswordLink

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

@@ -1,7 +1,33 @@
+const model = 'SumbaUser'
+
 const profile = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    return reply.view('sumba.template:/user/forgot-password.html')
+    if (!this.app.masohiMail) return reply.view('sumba.template:/user/forgot-password.html')
+    const { defaultsDeep } = this.app.bajo
+    const { dayjs } = this.app.bajo.lib
+    const { recordFind } = this.app.dobo
+    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 })
+        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}>`
+        const subject = req.t('forgotPasswordLink')
+        const options = { req, reply, tpl: 'sumba.template:/_mail/user-forgot-password-link.html' }
+        const exp = req.site.setting.sumba.forgotPasswordExpDur
+        data.fpToken = Buffer.from(`${data.token}:${dayjs().add(exp, 'ms').unix()}`).toString('base64')
+        await this.app.masohi.send({ to, subject, message: data, options })
+        req.flash('notify', req.t('emailSent'))
+        return reply.redirectTo(this.config.redirect.signin)
+      } catch (err) {
+        error = err
+      }
+    }
+    return reply.view('sumba.template:/user/forgot-password.html', { form, error })
   }
 }
 

package/waibuMpa/template/_mail/user-activation-success.html

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

package/waibuMpa/template/_mail/user-forgot-password-changed.html

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

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

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

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

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

package/waibuMpa/template/help/trouble-tickets/add.html

@@ -0,0 +1,4 @@
+---
+t:title: addTroubleTickets
+layout: sumba.layout:/wide.html
+---

package/waibuMpa/template/help/trouble-tickets/details.html

@@ -0,0 +1,4 @@
+---
+t:title: troubleTicketsDetails
+layout: sumba.layout:/wide.html
+---

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

@@ -0,0 +1,3 @@
+---
+t:title: forgotPassword
+---

package/waibuMpa/template/user/fpl.html

@@ -0,0 +1,3 @@
+---
+t:title: forgotPassword
+---

package/dobo/i18n/en-US.json

@@ -1,7 +0,0 @@
-{
-  "field": {
-    "hostname": "Hostname",
-    "allowUserTheme": "Theme by User",
-    "expires": "Expiration"
-  }
-}

package/dobo/i18n/id.json

@@ -1,7 +0,0 @@
-{
-  "field": {
-    "hostname": "Nama host",
-    "allowUserTheme": "Tema oleh Pengguna",
-    "expires": "Kadaluarsa"
-  }
-}

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

@@ -1,24 +0,0 @@
-const troubleTicketsForm = {
-  method: ['GET', 'POST'],
-  handler: async function (req, reply) {
-    const { defaultsDeep } = this.app.bajo
-    const { pick } = this.app.bajo.lib._
-    const { recordCreate } = 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 } })
-        req.flash('notify', 'Contact form successfully submitted')
-        return reply.view('sumba.template:/help/trouble-tickets/success.html', { form: req.body, data })
-      } catch (err) {
-        error = err
-      }
-    }
-    return reply.view('sumba.template:/help/trouble-tickets/list.html', { form, error })
-  }
-}
-
-export default troubleTicketsForm