sumba 1.0.18 → 1.0.19

package/bajo/hook/dobo@before-record-get.js

@@ -11,7 +11,7 @@ export async function checker (model, id, options = {}) {
       const filter = { query: { id }, limit: 1 }
       filter.query[i] = rec
       const rows = await recordFind(model, filter)
-      if (rows.length === 0) throw this.error('Record \'%s@%s\' not found!', id, model, { statusCode: 404 })
+      if (rows.length === 0) throw this.error('recordNotFound%s%s', id, model, { statusCode: 404 })
     }
   }
 }

package/bajo/hook/waibu@after-app-boot.js

@@ -1,13 +1,13 @@
 import collectRoutes from '../../lib/collect-routes.js'
 
 async function afterAppBoot () {
-  this.log.trace('Collecting route guards:')
+  this.log.trace('collectingRouteGuards')
   await collectRoutes.call(this, 'secure')
   await collectRoutes.call(this, 'anonymous')
-  this.log.trace('- Secure routes: %d', this.secureRoutes.length)
-  this.log.trace('- Secure, inverted routes: %d', this.secureInvRoutes.length)
-  this.log.trace('- Anonymous routes: %d', this.anonymousRoutes.length)
-  this.log.trace('- Anonymous, inverted routes: %d', this.anonymousInvRoutes.length)
+  this.log.trace('secureRoutes%d', this.secureRoutes.length)
+  this.log.trace('secureInvRoutes%d', this.secureInvRoutes.length)
+  this.log.trace('anonRoutes%d', this.anonymousRoutes.length)
+  this.log.trace('anonInvRoutes%d', this.anonymousInvRoutes.length)
 }
 
 export default afterAppBoot

package/bajo/intl/en-US.json

@@ -62,6 +62,11 @@
   "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",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/bajo/intl/id.json

@@ -62,6 +62,11 @@
   "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",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/bajo/method/verify/api-key.js

@@ -31,8 +31,8 @@ async function verifyApiKey (req, reply, source) {
   token = await hash(token)
   const query = { token }
   const rows = await recordFind('SumbaUser', { query }, { req, noHook: true })
-  if (rows.length === 0) throw this.error('Invalid api key provided', { statusCode: 401 })
-  if (rows[0].status !== 'ACTIVE') throw this.error('User is inactive or temporarily disabled', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
+  if (rows.length === 0) throw this.error('invalidKey', { statusCode: 401 })
+  if (rows[0].status !== 'ACTIVE') throw this.error('userInactive', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
   req.user = await getUser(rows[0])
   return true
 }

package/bajo/method/verify/jwt.js

@@ -19,8 +19,8 @@ async function verifyJwt (req, reply, source) {
   const id = decoded.payload.uid
   try {
     const rec = await recordGet('SumbaUser', id, { req, noHook: true })
-    if (!rec) throw this.error('Invalid token or token is expired', { statusCode: 401 })
-    if (rec.status !== 'ACTIVE') throw this.error('User is inactive or temporarily disabled', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
+    if (!rec) throw this.error('invalidToken', { statusCode: 401 })
+    if (rec.status !== 'ACTIVE') throw this.error('userInactive', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
     req.user = await getUser(rec)
     return true
   } catch (err) {

package/bajo/method/verify/session.js

@@ -9,7 +9,7 @@ async function verifySession (req, reply, source) {
   }
   const redir = routePath(this.config.redirect.signin, req)
   req.session.ref = req.url
-  throw this.error('redirect', { redirect: redir })
+  throw this.error('_redirect', { redirect: redir })
 }
 
 export default verifySession

package/lib/check-site-id.js

@@ -44,9 +44,9 @@ async function checkSiteId (req, reply) {
   }
   const filter = { query }
   const rows = await recordFind('SumbaSite', filter, { noHook: true })
-  if (rows.length === 0) throw this.error('Unknown site or site is not configured yet')
+  if (rows.length === 0) throw this.error('unknownSite')
   const row = omit(rows[0], omitted)
-  if (row.status !== 'ACTIVE') throw this.error('This site is currently inactive or disabled. Please contact your admin, thanks!')
+  if (row.status !== 'ACTIVE') throw this.error('siteInactiveInfo')
   req.site = row
   await mergeSetting.call(this, req)
 }

package/lib/check-user-id.js

@@ -34,7 +34,7 @@ async function anonymous (req) {
     if (match) {
       const redir = routePath(this.config.redirect.signout, req)
       req.session.ref = req.url
-      throw this.error('redirect', { redirect: redir })
+      throw this.error('_redirect', { redirect: redir })
     }
     req.user = omit(await getUser(req.session.user.id), ['password', 'token'])
   }
@@ -73,18 +73,18 @@ async function checkUserId (req, reply, source) {
     return
   }
   const authMethods = this.config.auth[match.source].methods ?? []
-  if (isEmpty(authMethods)) throw this.error('No authentication method found. Please contact your admin immediately!', { statusCode: 500 })
+  if (isEmpty(authMethods)) throw this.error('noAuthMethod', { statusCode: 500 })
   let success
   for (const m of authMethods) {
     const handler = this[camelCase(`verify ${m}`)]
-    if (!handler) throw this.error('Invalid authentication method \'%s\'', m, { statusCode: 500 })
+    if (!handler) throw this.error('invalidAuthMethod%s', m, { statusCode: 500 })
     const check = await handler(req, reply, source, ctx)
     if (check) {
       success = check
       break
     }
   }
-  if (!success) throw this.error('Access denied. Can\'t authenticate you through all available methods', { statusCode: 401 })
+  if (!success) throw this.error('accessDenied', { statusCode: 401 })
   await mergeSetting.call(this, req)
   return success
 }

package/package.json

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

package/waibuRestApi/route/user/access-token/@type/create.js

@@ -16,7 +16,7 @@ async function create () {
     const { hash } = this.app.bajoExtra
     const { getUserFromUsernamePassword, createJwtFromUserRecord } = this
 
-    if (!['api-key', 'jwt', 'apiKey'].includes(req.params.type)) throw this.error('Invalid token type')
+    if (!['api-key', 'jwt', 'apiKey'].includes(req.params.type)) throw this.error('invalidTokenType')
     const rec = await getUserFromUsernamePassword(req.body.username, req.body.password, req)
     if (req.params.type === 'jwt') {
       const jwt = await createJwtFromUserRecord(rec)