sumba 1.2.1 → 1.2.3

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

@@ -6,7 +6,7 @@ async function afterRecordCreate (body, options = {}, rec) {
   const to = `${data.firstName} ${data.lastName} <${data.email}>`
   const subject = options.req.t('newUserSignup')
   await sendMail(
-    'sumba.template:/_mail/user-signup-success.html',
+    `sumba.template:/_mail/user-signup-success${data.status === 'ACTIVE' ? '-active' : ''}.html`,
     { to, subject, data, options, source: this.name }
   )
 }

package/bajoTemplate/partial/_mail/user-signup-success-active.html

@@ -0,0 +1,8 @@
+<p>Congratulations, your account has been created successfully. 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 for joining us. We hope our services will benefit you</p>

package/bajoTemplate/partial/_mail/user-signup-success-active.id.html

@@ -0,0 +1,10 @@
+<p>Selamat, akun Anda telah berhasil dibuat. 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 telah bergabung bersama kami, semoga layanan kami
+membawa manfaat untuk Anda.</p>

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

@@ -13,5 +13,5 @@ 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
+<p>Sekali lagi terima kasih telah bergabung bersama kami, semoga layanan kami
 membawa manfaat untuk Anda.<p>

package/bajoTemplate/partial/layout/footer.html

@@ -1,4 +1,4 @@
-<c:footer margin="top-5">
+<c:footer margin="top-4">
   <c:div id="footer"></c:div>
   <small>
     <c:nav flex="justify-content:center"  tag="ul">

package/bajoTemplate/partial/list-item/oauth-signin.html

@@ -0,0 +1,8 @@
+<% if (_hasPlugin('sumbaOauth')) { %>
+<c:div margin="bottom-2" flex="justify-content:center" t:content="<%= attr.label %>" />
+<c:div flex="justify-content:center" margin="bottom-3">
+  <% for (const p of oauthProviders) { %>
+  <c:btn color="primary-outline" content="<%= _.upperFirst(p) %>" icon="logo<%= _.upperFirst(p) %>" href="sumbaOauth:/<%= p %>" margin="x-1"/>
+  <% } %>
+</c:div>
+<% } %>

package/bajoTemplate/partial/signin.html

@@ -3,9 +3,12 @@
   <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
 </c:form>
 <c:div move-to="#footer" flex="justify-content:center">
-  <c:nav type="inline">
-    <!-- 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:nav>
+  <c:div>
+    <!-- include sumba.partial:/list-item/oauth-signin.html|<%= JSON.stringify({ label: 'orSigninThrough' }) %> -->
+    <c:nav type="inline">
+      <!-- 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:nav>
+  </c:div>
 </c:div>

package/bajoTemplate/partial/user/signup/form.html

@@ -9,10 +9,13 @@
 </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 -->
-  <!-- include sumba.partial:/list-item/signin.html -->
-  <!-- include sumba.partial:/list-item/goto-home.html -->
-  </c:nav>
+  <c:div>
+    <!-- include sumba.partial:/list-item/oauth-signin.html|<%= JSON.stringify({ label: 'orSignupThrough' }) %> -->
+    <c:nav type="inline">
+    <!-- include sumba.partial:/list-item/forgot-password.html -->
+    <!-- include sumba.partial:/list-item/signin.html -->
+    <!-- include sumba.partial:/list-item/goto-home.html -->
+    </c:nav>
+  </c:div>
 </c:div>
 <% } %>

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

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

package/dobo/fixture/user.json

@@ -10,6 +10,7 @@
   "zipCode": "12345",
   "provinceState": "State",
   "country": "US",
+  "provider": "local",
   "siteId": "?:SumbaSite::alias:default",
   "status": "ACTIVE"
 }]

package/dobo/schema/user.json

@@ -21,12 +21,18 @@
     "type": "string",
     "maxLength": 50,
     "required": true
+  }, {
+    "name": "provider",
+    "type": "string",
+    "maxLength": 50,
+    "index": true,
+    "required": true,
+    "default": "local"
   }, {
     "name": "email",
     "type": "string",
     "maxLength": 100,
     "required": true,
-    "index": true,
     "rules": ["email"]
   }, {
     "name": "firstName",

package/index.js

@@ -198,7 +198,7 @@ async function factory (pkgName) {
       await validate({ username, password }, model, { ns: ['sumba', 'dobo'], fields: ['username', 'password'] })
       const bcrypt = await importPkg('bajoExtra:bcrypt')
 
-      const query = { username }
+      const query = { username, provider: 'local' }
       const rows = await recordFind(model, { query }, { req, forceNoHidden: true, noHook: true })
       if (rows.length === 0) throw this.error('validationError', { details: [{ field: 'username', error: 'Unknown username' }], statusCode: 401 })
       const rec = rows[0]
@@ -433,6 +433,34 @@ async function factory (pkgName) {
       await mergeSetting(site)
       return site
     }
+
+    signin = async ({ user, req, reply }) => {
+      const { getSessionId } = this.app.waibuMpa
+      const { runHook } = this.app.bajo
+      const { isEmpty, omit } = this.lib._
+      let { referer } = req.body || {}
+      if (req.session.ref) referer = req.session.ref
+      req.session.ref = null
+      const _user = omit(user, ['password', 'token'])
+      req.session.userId = _user.id
+      const sid = await getSessionId(req.headers.cookie)
+      await runHook(`${this.name}:afterSignin`, _user, sid, req)
+      const { query, params } = req
+      const url = !isEmpty(referer) ? referer : this.config.redirect.afterSignin
+      req.flash('notify', req.t('signinSuccessfully'))
+      return reply.redirectTo(url, { query, params })
+    }
+
+    generatePassword = (req) => {
+      const { generateId } = this.app.bajo
+      const cfg = req ? req.site.setting.sumba.userPassword : this.config.siteSetting.userPassword
+      let passwd = generateId()
+      if (cfg.minLowercase) passwd += generateId({ pattern: 'abcdefghijklmnopqrstuvwxyz', length: cfg.minLowercase })
+      if (cfg.minUppercase) passwd += generateId({ pattern: 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', length: cfg.minUppercase })
+      if (cfg.minSpecialChar) passwd += generateId({ pattern: '!@#$%*', length: cfg.minSpecialChar })
+      if (cfg.minNumeric) passwd += generateId({ pattern: '0123456789', length: cfg.minNumeric })
+      return passwd
+    }
   }
 }
 

package/lib/password-rule.js

@@ -9,7 +9,7 @@ async function passwordRule (req) {
     .min(8)
     .max(100)
     .required()
-  const cfg = req ? req.site.setting.sumba.userPassword : this.config.siteSetting
+  const cfg = req ? req.site.setting.sumba.userPassword : this.config.siteSetting.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)

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "sumba",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "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/signin.js

@@ -1,26 +1,14 @@
 const signin = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
-    const { getUserFromUsernamePassword } = this
-    const { runHook } = this.app.bajo
-    const { isEmpty, omit } = this.lib._
-    const { getSessionId } = this.app.waibuMpa
-
     let { username, password, referer } = req.body || {}
     if (req.session.ref) referer = req.session.ref
     req.session.ref = null
     let error
     if (req.method === 'POST') {
       try {
-        const user = omit(await getUserFromUsernamePassword(username, password, req), ['password', 'token'])
-        req.session.userId = user.id
-        const sid = await getSessionId(req.headers.cookie)
-        if (this.bajoEmitter) await this.app.bajoEmitter.emit(`${this.name}.signin`, user, sid)
-        await runHook(`${this.name}:afterSignin`, user, sid, req)
-        const { query, params } = req
-        const url = !isEmpty(referer) ? referer : this.config.redirect.afterSignin
-        req.flash('notify', req.t('signinSuccessfully'))
-        return reply.redirectTo(url, { query, params })
+        const user = await this.getUserFromUsernamePassword(username, password, req)
+        return await this.signin({ user, req, reply })
       } catch (err) {
         error = err
       }

package/waibuMpa/route/user/signup.js

@@ -23,6 +23,7 @@ const signup = {
         const fields = ['username', 'password', 'verifyPassword', 'email', 'firstName', 'lastName', 'agree']
         const validation = { ns: ['sumba', 'dobo'], fields, extFields }
         req.body.token = generateId()
+        req.body.provider = 'local'
         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 })