sumba 1.2.0 → 1.2.2

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

@@ -10,7 +10,7 @@ async function afterRecordCreate (body, options = {}, rec) {
   const subject = options.req.t('contactForm')
   await sendMail(
     'sumba.template:/_mail/help-contact-form.html',
-    { to, bcc, subject, data, options }
+    { to, bcc, subject, data, options, source: this.name }
   )
 }
 

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

@@ -7,7 +7,7 @@ async function afterRecordCreate (body, options = {}, rec) {
   const subject = options.req.t('newUserSignup')
   await sendMail(
     'sumba.template:/_mail/user-signup-success.html',
-    { to, subject, data, options }
+    { to, subject, data, options, source: this.name }
   )
 }
 

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

@@ -10,19 +10,19 @@ async function afterRecordUpdate (id, body, options = {}, rec) {
     subject = options.req.t('userActivation')
     await sendMail(
       'sumba.template:/_mail/user-activation-success.html',
-      { to, subject, data, options }
+      { to, subject, data, options, source: this.name }
     )
   } else if (oldData.token !== data.token) {
     subject = options.req.t('resetApiKey')
     await sendMail(
       'sumba.template:/_mail/mystuff-reset-api-key.html',
-      { to, subject, data, options }
+      { to, subject, data, options, source: this.name }
     )
   } else if (body.password) {
     subject = options.req.t('changePassword')
     await sendMail(
       'sumba.template:/_mail/mystuff-change-password.html',
-      { to, subject, data, options }
+      { to, subject, data, options, source: this.name }
     )
   }
 }

package/bajo/hook/waibu-mpa@pre-parsing.js

@@ -15,8 +15,8 @@ const preParsing = {
     req.menu = req.menu ?? {}
     if (req.user) {
       req.menu.user = [
-        { value: routePath('sumba:/change-password', req), text: req.t('Change Password') },
-        { value: routePath('sumba:/profile', req), text: req.t('yourProfile') },
+        { value: routePath('sumba:/your-stuff/change-password', req), text: req.t('Change Password') },
+        { value: routePath('sumba:/your-stuff/profile', req), text: req.t('yourProfile') },
         '-',
         { value: routePath('sumba:/signout', req), text: req.t('signout') }
       ]
@@ -24,8 +24,8 @@ const preParsing = {
       req.menu.user = [
         { value: routePath('sumba:/signin', req), text: req.t('signin') },
         '-',
-        { value: routePath('sumba:/signup', req), text: req.t('signup') },
-        { value: routePath('sumba:/forgot-password', req), text: req.t('forgotPassword') }
+        { value: routePath('sumba:/user/signup', req), text: req.t('signup') },
+        { value: routePath('sumba:/user/forgot-password', req), text: req.t('forgotPassword') }
       ]
     }
   }

package/bajo/intl/en-US.json

@@ -35,7 +35,7 @@
   "aboutUs": "About Us",
   "invalidActivationKey": "Invalid activation key",
   "signoutNow": "Yes, sign me out now",
-  "signoutWarning": "You\\'re about to sign out. This means your session will be cleared and you\\'ll be asked for your credential again in case you want to access any protected pages and resources.<br /><br />Are your sure?",
+  "signoutWarning": "You're about to sign out. This means your session will be cleared and you'll be asked for your credential again in case you want to access any protected pages and resources.<br /><br />Are your sure?",
   "clearInvalidKey": "Clear Invalid Fields",
   "linkPasswordWillbeSent": "Link to reset password will be sent to your email",
   "signinSuccessfully": "You've successfully signed in",
@@ -103,6 +103,8 @@
   "unknownUser": "User Unknown/Invalid",
   "socialMedia": "Social Media",
   "resetPassword": "Reset Password",
+  "contactFormSubmitted": "Contact form successfully submitted",
+  "currentApiKey": "Current API Key",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/bajo/intl/id.json

@@ -104,6 +104,8 @@
   "unknownUser": "Pengguna Tidak Dikenal/Tidak Valid",
   "socialMedia": "Media Sosial",
   "resetPassword": "Reset Kata Sandi",
+  "contactFormSubmitted": "Form kontak sukses dikirim",
+  "currentApiKey": "Kunci API Saat Ini",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/bajoTemplate/partial/layout/footer.html

@@ -2,15 +2,15 @@
   <c:div id="footer"></c:div>
   <small>
     <c:nav flex="justify-content:center"  tag="ul">
-    <% if (!(_meta.routeOpts.pathSrc.startsWith('/my-profile') || _meta.routeOpts.pathSrc.startsWith('/info') ||
+    <% if (!(_meta.routeOpts.pathSrc.startsWith('/your-stuff') || _meta.routeOpts.pathSrc.startsWith('/info') ||
     _meta.routeOpts.pathSrc.startsWith('/help'))) { %>
       <c:nav-dropdown-darkmode padding="x-2"/>
       <c:nav-dropdown-language padding="x-2"/>
       <c:nav-divider />
     <% } %>
-      <c:nav-item t:content="cookie" href="sumba:/info/cookie-policy" padding="x-1"/>
-      <c:nav-item t:content="privacy" href="sumba:/info/privacy" padding="x-1"/>
-      <c:nav-item t:content="terms" href="sumba:/info/terms-conditions" padding="x-2"/>
+      <c:nav-item t:content="cookie" href="sumba:/info/:item|cookie-policy" padding="x-1"/>
+      <c:nav-item t:content="privacy" href="sumba:/info/:item|privacy" padding="x-1"/>
+      <c:nav-item t:content="terms" href="sumba:/info/:item|terms-conditions" padding="x-2"/>
     </c:nav>
   </small>
 </c:footer>

package/bajoTemplate/partial/signin.html

@@ -2,7 +2,6 @@
   <c:form-input name="username" label-floating wrapper-margin="bottom-2" />
   <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
 </c:form>
-<% if (!page.noLinks) { %>
 <c:div move-to="#footer" flex="justify-content:center">
   <c:nav type="inline">
     <!-- include sumba.partial:/list-item/forgot-password.html -->
@@ -10,4 +9,3 @@
     <!-- include sumba.partial:/list-item/goto-home.html -->
   </c:nav>
 </c:div>
-<% } %>

package/bajoTemplate/partial/signout.html

@@ -5,6 +5,8 @@
 <% if (!page.noLinks) { %>
 <c:div move-to="#footer" flex="justify-content:center">
   <c:nav type="inline">
+    <!-- include sumba.partial:/list-item/your-profile.html -->
+    <!-- include sumba.partial:/list-item/change-password.html -->
     <!-- include sumba.partial:/list-item/goto-home.html -->
   </c:nav>
 </c:div>

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

@@ -1,7 +1,7 @@
 <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-plaintext name="apiKey" label-floating wrapper-margin="bottom-2" t:label="currentApiKey"/>
       <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
     </c:form>
   </c:grid-col>

package/index.js

@@ -53,7 +53,7 @@ async function factory (pkgName) {
             children: [
               // anonymous only
               { title: 'signin', href: 'sumba:/signin', visible: 'anon' },
-              { title: 'forgotPassword', href: 'sumba:/forgot-password', visible: 'anon' },
+              { title: 'forgotPassword', href: 'sumba:/user/forgot-password', visible: 'anon' },
               { title: 'newUserSignup', href: 'sumba:/user/signup', visible: 'anon' },
               { title: '-', visible: 'anon' },
               { title: 'activation', href: 'sumba:/user/activation', visible: 'anon' },

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "sumba",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Bajo Framework's Biz Suite",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "type": "module",
+  "bajo": {
+    "type": "plugin"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ardhi/sumba.git"

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

@@ -11,7 +11,7 @@ const contactForm = {
     if (req.method === 'POST') {
       try {
         const { data } = await recordCreate({ model: 'SumbaContactForm', req, reply, options: { noFlash: true } })
-        req.flash('notify', 'Contact form successfully submitted')
+        req.flash('notify', req.t('contactFormSubmitted'))
         return reply.view('sumba.template:/help/contact-form/success.html', { form: req.body, data })
       } catch (err) {
         error = err

package/waibuMpa/route/user/activation.js

@@ -12,7 +12,7 @@ const userActivation = {
         const query = { status: 'UNVERIFIED', token: req.body.key }
         const result = await recordFind(model, { query, limit: 1 })
         if (result.length === 0) throw this.error('validationError', { details: [{ field: 'key', error: 'invalidActivationKey' }] })
-        await recordUpdate(model, result[0].id, { status: 'ACTIVE' }, { noValidation: true, noFlash: true })
+        await recordUpdate(model, 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/waibuMpa/route/user/forgot-password/@fpl.js

@@ -42,13 +42,13 @@ const forgotPasswordLink = {
         } 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 })
+        await recordUpdate(model, 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 }
+          { to, subject, data: user, options, source: this.name }
         )
         req.flash('notify', req.t('passwordChangedReSignin'))
         return reply.redirectTo(this.config.redirect.signin)

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

@@ -24,7 +24,7 @@ const profile = {
         data._meta = { hostHeader: req.headers.host }
         await sendMail(
           'sumba.template:/_mail/user-forgot-password-link.html',
-          { to, subject, data, options }
+          { to, subject, data, options, source: this.name }
         )
         req.flash('notify', req.t('emailSent'))
         return reply.redirectTo(this.config.redirect.signin)

package/waibuMpa/route/user/signup.js

@@ -23,8 +23,8 @@ const signup = {
         const fields = ['username', 'password', 'verifyPassword', 'email', 'firstName', 'lastName', 'agree']
         const validation = { ns: ['sumba', 'dobo'], fields, extFields }
         req.body.token = generateId()
-        const { data } = await recordCreate({ model: 'SumbaUser', req, reply, options: { validation, noFlash: true } })
-        req.flash('notify', 'userCreated')
+        const { data } = await recordCreate({ model: 'SumbaUser', req, reply, options: { validation, noFlash: true, forceNoHidden: true } })
+        req.flash('notify', req.t('userCreated'))
         return reply.view('sumba.template:/user/signup/success.html', { form: req.body, data })
       } catch (err) {
         error = err

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

@@ -29,7 +29,7 @@ const profile = {
         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 })
         // signout and redirect to signin
-        req.session.user = null
+        req.session.userId = null
         req.flash('notify', req.t('passwordChangedReSignin'))
         return reply.redirectTo(this.config.redirect.signin)
       } catch (err) {

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

@@ -25,7 +25,7 @@ const resetApiKey = {
         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, { salt: generateId() }, { req, reply, noFlash: true })
+        await recordUpdate(model, 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')