sumba 2.0.1 → 2.1.1

package/extend/waibuRestApi/route/your-stuff/profile/get.js

@@ -2,12 +2,12 @@ const model = 'SumbaUser'
 const hidden = ['password', 'token', 'siteId', 'salt']
 
 async function get ({ ctx }) {
-  const { recordGet } = this.app.waibuDb
+  const { getRecord } = this.app.waibuDb
   const { docSchemaModel } = this.app.waibuRestApi
   const schema = await docSchemaModel({ model, method: 'get', ctx, options: { hidden, noId: true } })
   const handler = async function get (req, reply, options) {
     options.hidden = hidden
-    return await recordGet({ model, req, reply, id: req.user.id, options })
+    return await getRecord({ model, req, reply, id: req.user.id, options })
   }
   return { schema, handler }
 }

package/extend/waibuRestApi/route/your-stuff/profile/update.js

@@ -2,7 +2,7 @@ const model = 'SumbaUser'
 const hidden = ['password', 'token', 'siteId']
 
 async function get ({ ctx }) {
-  const { recordUpdate } = this.app.waibuDb
+  const { updateRecord } = this.app.waibuDb
   const { omit } = this.app.lib._
 
   const { docSchemaModel } = this.app.waibuRestApi
@@ -10,7 +10,7 @@ async function get ({ ctx }) {
   const handler = async function get (req, reply, options) {
     options.hidden = hidden
     const body = omit(req.body, ['username', 'status', ...hidden])
-    return await recordUpdate({ model, req, reply, id: req.user.id, body, options })
+    return await updateRecord({ model, req, reply, id: req.user.id, body, options })
   }
   return { schema, handler }
 }

package/extend/waibuSocketIo/middleware/server/auth.js

@@ -2,12 +2,11 @@ export default {
   level: 1,
   handler: async function (socket) {
     const { merge } = this.app.lib._
-    const { recordGet } = this.app.dobo
     const { getSessionId } = this.app.waibuMpa
 
     if (socket.handshake) {
       const sessionId = await getSessionId(socket.request.headers.cookie)
-      const resp = await recordGet('WbmpaSession', sessionId, { noHook: true, thrownNotFound: false })
+      const resp = await this.app.dobo.getModel('WbmpaSession').getRecord(sessionId, { noHook: true, thrownNotFound: false })
       if (resp) {
         const session = JSON.parse(resp.session) ?? {}
         socket.session = merge({}, session.user, { sessionId, authMethod: 'cookie' })

package/index.js

@@ -14,10 +14,7 @@ async function factory (pkgName) {
    *
    * @class
    */
-  class Sumba extends this.app.pluginClass.base {
-    static alias = 'sumba'
-    static dependencies = ['bajo-extra', 'bajo-common-db', 'bajo-config']
-
+  class Sumba extends this.app.baseClass.Base {
     constructor () {
       super(pkgName, me.app)
       this.config = {
@@ -193,37 +190,41 @@ async function factory (pkgName) {
     }
 
     getUser = async (rec, safe = true) => {
-      const { recordGet } = this.app.dobo
       const { omit, isPlainObject } = this.app.lib._
       let user
       if (isPlainObject(rec)) user = rec
-      else user = await recordGet('SumbaUser', rec, { noHook: true })
+      else {
+        const mdl = this.app.dobo.getModel('SumbaUser')
+        user = await mdl.getRecord(rec, { noHook: true, throwNotFound: false })
+      }
+      if (!user) return null
       return safe ? omit(user, this.unsafeUserFields) : user
     }
 
     mergeTeam = async (user, site) => {
       if (!user) return
       const { map, pick } = this.app.lib._
-      const { recordFindAll } = this.app.dobo
       user.teams = []
       const query = { userId: user.id, siteId: site.id }
-      const userTeam = await recordFindAll('SumbaTeamUser', { query })
+      let mdl = this.app.dobo.getModel('SumbaTeamUser')
+      const userTeam = await mdl.findAllRecord({ query })
       if (userTeam.length === 0) return
       delete query.userId
-      query.id = { $in: map(userTeam, 'id'), status: 'ENABLED' }
-      const team = await recordFindAll('SumbaTeam', { query })
+      query.id = { $in: map(userTeam, 'id') }
+      query.status = 'ENABLED'
+      mdl = this.app.dobo.getModel('SumbaTeam')
+      const team = await mdl.findAllRecord({ query })
       if (team.length > 0) user.teams.push(...map(team, t => pick(t, ['id', 'alias'])))
     }
 
     getUserFromUsernamePassword = async (username = '', password = '', req) => {
       const { importPkg } = this.app.bajo
-      const { recordFind, validate } = this.app.dobo
-      const model = 'SumbaUser'
-      await validate({ username, password }, model, { ns: ['sumba', 'dobo'], fields: ['username', 'password'] })
+      const model = this.app.dobo.getModel('SumbaUser')
+      await model.validate({ username, password }, null, { partial: true, ns: ['sumba', 'dobo'], fields: ['username', 'password'] })
       const bcrypt = await importPkg('bajoExtra:bcrypt')
 
       const query = { username, provider: 'local' }
-      const rows = await recordFind(model, { query }, { req, forceNoHidden: true, noHook: true })
+      const rows = await model.findRecord({ 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]
       if (rec.status !== 'ACTIVE') throw this.error('validationError', { details: ['User is inactive or temporarily disabled'], statusCode: 401 })
@@ -269,13 +270,12 @@ async function factory (pkgName) {
       const { merge } = this.app.lib._
       const { isMd5, hash } = this.app.bajoExtra
       const { getUser } = this
-      const { recordFind } = this.app.dobo
 
       let token = await this._getToken('apiKey', req, source)
       if (!isMd5(token)) return false
       token = await hash(token)
       const query = { token }
-      const rows = await recordFind('SumbaUser', { query }, { req, noHook: true })
+      const rows = await this.app.dobo.getModel('SumbaUser').findRecord({ query }, { req, noHook: true })
       if (rows.length === 0) throw this.error('invalidKey', merge({ statusCode: 401 }, payload))
       if (rows[0].status !== 'ACTIVE') throw this.error('userInactive', merge({ details: [{ field: 'status', error: 'inactive' }], statusCode: 401 }, payload))
       req.user = await getUser(rows[0])
@@ -326,7 +326,6 @@ async function factory (pkgName) {
 
     verifyJwt = async (req, reply, source, payload) => {
       const { importPkg } = this.app.bajo
-      const { recordGet } = this.app.dobo
       const { getUser } = this
       const { isEmpty, merge } = this.app.lib._
 
@@ -342,7 +341,7 @@ async function factory (pkgName) {
       const decoded = await verifier(token)
       const id = decoded.payload.uid
       try {
-        const rec = await recordGet('SumbaUser', id, { req, noHook: true })
+        const rec = await this.app.dobo.getModel('SumbaUser').getRecord(id, { req, noHook: true })
         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)
@@ -397,14 +396,12 @@ async function factory (pkgName) {
 
     getSite = async (hostname, useId) => {
       const { omit } = this.app.lib._
-      const { recordFind } = this.app.dobo
       const omitted = ['status']
 
       const mergeSetting = async (site) => {
         const { defaultsDeep } = this.app.lib.aneka
-        const { parseObject } = this.app.bajo
+        const { parseObject } = this.app.lib
         const { trim, get, filter } = this.app.lib._
-        const { recordFind, recordGet } = this.app.dobo
         const defSetting = {}
         const nsSetting = {}
         const names = this.app.getAllNs()
@@ -412,7 +409,7 @@ async function factory (pkgName) {
           ns: { $in: names },
           siteId: site.id
         }
-        const all = await recordFind('SumbaSiteSetting', { query, limit: -1 })
+        const all = await this.app.dobo.getModel('SumbaSiteSetting').findRecord({ query, limit: -1 })
         for (const ns of names) {
           nsSetting[ns] = {}
           defSetting[ns] = get(this, `app.${ns}.config.siteSetting`, {})
@@ -427,14 +424,14 @@ async function factory (pkgName) {
         }
         site.setting = parseObject(defaultsDeep({}, nsSetting, defSetting))
         // additional fields
-        const country = await recordGet('CdbCountry', site.country, { noHook: true })
+        const country = await this.app.dobo.getModel('CdbCountry').getRecord(site.country, { noHook: true })
         site.countryName = (country ?? {}).name ?? site.country
       }
 
       let site = {}
 
       if (!this.config.multiSite) {
-        const resp = await recordFind('SumbaSite', { query: { alias: 'default' } }, { noHook: true })
+        const resp = await this.app.dobo.getModel('SumbaSite').findRecord({ query: { alias: 'default' } }, { noHook: true })
         site = omit(resp[0], omitted)
         await mergeSetting(site)
         return site
@@ -450,7 +447,7 @@ async function factory (pkgName) {
         }
       }
       const filter = { query, limit: 1 }
-      const rows = await recordFind('SumbaSite', filter, { noHook: true })
+      const rows = await this.app.dobo.getModel('SumbaSite').findRecord(filter, { noHook: true })
       if (rows.length === 0) throw this.error('unknownSite')
       const row = omit(rows[0], omitted)
       if (row.status !== 'ACTIVE') throw this.error('siteInactiveInfo')
@@ -459,6 +456,19 @@ async function factory (pkgName) {
       return site
     }
 
+    signout = async ({ req, reply, reason }) => {
+      const { runHook } = this.app.bajo
+      const { getSessionId } = this.app.waibuMpa
+      const sid = await getSessionId(req.headers.cookie)
+      req.session.userId = null
+      await runHook(`${this.ns}:afterSignout`, sid, req)
+      const { query, params } = req
+      // const url = !isEmpty(referer) ? referer : this.config.redirect.home
+      const url = this.config.redirect.afterSignout
+      req.flash('notify', req.t(reason ?? 'signoutSuccessfully'))
+      return reply.redirectTo(url, { query, params })
+    }
+
     signin = async ({ user, req, reply }) => {
       const { getSessionId } = this.app.waibuMpa
       const { runHook } = this.app.bajo
@@ -477,7 +487,7 @@ async function factory (pkgName) {
     }
 
     generatePassword = (req) => {
-      const { generateId } = this.app.bajo
+      const { generateId } = this.app.lib.aneka
       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 })
@@ -489,7 +499,7 @@ async function factory (pkgName) {
 
     pushDownload = async ({ description, worker, data, source, req, file, type }) => {
       const { getPlugin } = this.app.bajo
-      const { recordCreate } = getPlugin('waibuDb')
+      const { createRecord } = getPlugin('waibuDb')
       const { push } = getPlugin('bajoQueue')
       description = description ?? file
       const jobQueue = {
@@ -503,16 +513,15 @@ async function factory (pkgName) {
       if (!type) type = path.extname(file)
       if (type[0] === '.') type = type.slice(1)
       const body = { file, description, jobQueue, type }
-      const rec = await recordCreate({ model: 'SumbaDownload', body, req, options: { noFlash: true } })
+      const rec = await createRecord({ model: 'SumbaDownload', body, req, options: { noFlash: true } })
       jobQueue.payload.data.download = { id: rec.data.id, file }
       await push(jobQueue)
     }
 
     getApiKeyFromUserId = async id => {
       const { hash } = this.app.bajoExtra
-      const { recordGet } = this.app.dobo
       const options = { forceNoHidden: true, noHook: true, noCache: true, attachment: true, mimeType: true }
-      const resp = await recordGet('SumbaUser', id, options)
+      const resp = await this.app.dobo.getModel('SumbaUser').getRecord(id, options)
       return await hash(resp.salt)
     }
   }

package/lib/check-iconset.js

@@ -3,11 +3,9 @@ async function checkIconset (req, reply) {
   const mpa = this.app.waibuMpa
 
   if (!req.site) return
-  if (mpa.iconsets.length === 1) req.iconset = mpa.iconsets[0].name
-  else {
-    const siteIconset = get(req, 'site.setting.waibuMpa.iconset')
-    req.iconset = get(mpa, 'config.iconset.default', siteIconset)
-  }
+  const siteIconset = get(req, 'site.setting.waibuMpa.iconset')
+  req.iconset = get(mpa, 'config.iconset.set', siteIconset)
+  req.iconset = req.iconset ?? 'default'
 }
 
 export default checkIconset

package/lib/check-theme.js

@@ -3,12 +3,9 @@ async function checkTheme (req, reply) {
   const mpa = this.app.waibuMpa
 
   if (!req.site) return
-  if (mpa.themes.length === 1) req.theme = mpa.themes[0].name
-  else {
-    const siteTheme = get(req, 'site.setting.waibuMpa.theme')
-    req.theme = get(mpa, 'config.theme.set', siteTheme)
-    req.theme = req.theme ?? mpa.themes[0].name
-  }
+  const siteTheme = get(req, 'site.setting.waibuMpa.theme')
+  req.theme = get(mpa, 'config.theme.set', siteTheme)
+  req.theme = req.theme ?? 'default'
 }
 
 export default checkTheme

package/lib/check-user-id.js

@@ -12,6 +12,7 @@ async function setUser (req) {
     if (user) req.user = user
     else req.session.userId = null
   } catch (err) {
+    console.log(err)
     req.session.userId = null
   }
 }

package/lib/reset-token.js

@@ -1,5 +1,5 @@
 async function resetToken (salt) {
-  const { generateId } = this.app.bajo
+  const { generateId } = this.app.lib.aneka
   const { hash } = this.app.bajoExtra
   salt = salt ?? generateId()
   const token = await hash(await hash(salt))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,9 @@
   },
   "type": "module",
   "bajo": {
-    "type": "plugin"
+    "type": "plugin",
+    "alias": "sumba",
+    "dependencies": ["bajo-extra", "bajo-common-db", "bajo-config", "bajo-markdown"]
   },
   "repository": {
     "type": "git",
@@ -29,8 +31,8 @@
   },
   "homepage": "https://github.com/ardhi/sumba#readme",
   "dependencies": {
-    "joi-password": "^4.2.0",
-    "slug": "^10.0.0"
+    "joi-password": "^4.3.0",
+    "slug": "^11.0.1"
   },
   "devDependencies": {
     "clean-jsdoc-theme": "^4.3.0",

package/wiki/CHANGES.md

@@ -0,0 +1,10 @@
+# Changes
+
+## 2026-01-13
+
+- [2.1.1] Bug fix on waibuMpa's widgeting system
+
+## 2026-01-01
+
+- [2.1.0] Ported to match ```bajo@2.2.x``` & ```dobo@2.2.x``` specs
+- [2.1.0] Upgrade to ```slug@11.0.1```

package/extend/bajo/hook/dobo@before-record-count.js

@@ -1,8 +0,0 @@
-import { handler } from './dobo@before-record-find.js'
-
-const doboBeforeRecordCount = {
-  level: 1000,
-  handler
-}
-
-export default doboBeforeRecordCount

package/extend/bajo/hook/dobo@before-record-find-one.js

@@ -1,8 +0,0 @@
-import { handler } from './dobo@before-record-find.js'
-
-const doboBeforeRecordFindOne = {
-  level: 1000,
-  handler
-}
-
-export default doboBeforeRecordFindOne

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

@@ -1,23 +0,0 @@
-import { rebuildFilter } from './dobo@before-record-find.js'
-
-export async function checker (model, id, options = {}) {
-  const { recordFind } = this.app.dobo
-  const { req } = options
-
-  if (options.noAutoFilter || !req) return
-  const filter = await rebuildFilter.call(this, model, {}, req)
-  if (filter.query.$and) filter.query.$and.push({ id })
-  else filter.query.id = id
-  filter.limit = 1
-  const rows = await recordFind(model, filter, { noCount: true })
-  if (rows.length === 0) throw this.error('recordNotFound%s%s', id, model, { statusCode: 404 })
-}
-
-const doboBeforeRecordGet = {
-  level: 1000,
-  handler: async function (model, id, options) {
-    await checker.call(this, model, id, options)
-  }
-}
-
-export default doboBeforeRecordGet

package/extend/bajo/hook/dobo@before-record-remove.js

@@ -1,10 +0,0 @@
-import { checker } from './dobo@before-record-get.js'
-
-const doboBeforeRecordRemove = {
-  level: 1000,
-  handler: async function (model, id, options = {}) {
-    await checker.call(this, model, id, options.req)
-  }
-}
-
-export default doboBeforeRecordRemove

package/extend/bajo/hook/dobo@before-record-update.js

@@ -1,10 +0,0 @@
-import { checker } from './dobo@before-record-get.js'
-
-const doboBeforeRecordUpdate = {
-  level: 1000,
-  handler: async function (model, id, body, options = {}) {
-    await checker.call(this, model, id, options)
-  }
-}
-
-export default doboBeforeRecordUpdate

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

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

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

@@ -1,20 +0,0 @@
-{
-  "properties": [
-    "firstName::50:true:true",
-    "lastName::50:true:true",
-    "email::50:true:true",
-    "cat::50:true",
-    "subject::255::true",
-    "message:text"
-  ],
-  "feature": {
-    "sumba.status": {
-      "default": "NEW",
-      "values": ["NEW", "ACK"]
-    },
-    "sumba.userId": true,
-    "sumba.siteId": true,
-    "createdAt": true,
-    "updatedAt": true
-  }
-}

package/extend/dobo/schema/download.json

@@ -1,24 +0,0 @@
-{
-  "properties": [
-    "description::50:true",
-    "file:text:::true",
-    "type::20:true",
-    "jobQueue:object",
-    {
-      "name": "size",
-      "type": "integer",
-      "default": 0,
-      "index": true
-    }
-  ],
-  "feature": {
-    "sumba.siteId": true,
-    "sumba.userId": true,
-    "createdAt": true,
-    "updatedAt": true,
-    "sumba.status": {
-      "default": "INQUEUE",
-      "values": ["INQUEUE", "PROCESSING", "COMPLETE", "FAIL"]
-    }
-  }
-}

package/extend/dobo/schema/site-setting.json

@@ -1,8 +0,0 @@
-{
-  "properties": [
-    "ns::50:true:true",
-    "key::50:true:true",
-    "value:text"
-  ],
-  "feature": ["sumba.siteId", "updatedAt"]
-}

package/extend/dobo/schema/team.json

@@ -1,19 +0,0 @@
-{
-  "properties": [
-    "alias::20::true",
-    "name::50:true:true"
-  ],
-  "indexes": [{
-    "fields": ["alias", "siteId"],
-    "unique": true
-  }],
-  "feature": {
-    "createdAt": true,
-    "updatedAt": true,
-    "sumba.siteId": true,
-    "sumba.status": {
-      "default": "ENABLED",
-      "values": ["ENABLED", "DISABLED"]
-    }
-  }
-}

package/extend/dobo/schema/ticket-cat.json

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

package/extend/dobo/schema/ticket-detail.json

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

package/extend/dobo/schema/ticket.json

@@ -1,17 +0,0 @@
-{
-  "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"]
-    }
-  }
-}