sumba 2.33.2 → 2.33.4

package/extend/bajo/hook.js

@@ -127,6 +127,7 @@ async function rebuildFilter (model, filter = {}, options = {}) {
     const fields = keys(req.getSetting('sumba:modelGuard', {}))
     const results = []
     for (const field of fields) {
+      if (!model.hasProperty(field)) continue
       const inSetting = filterModelFromSetting.call(this, { model, field, options })
       if (inSetting.results.length > 0) results.push(...inSetting.results)
     }

package/extend/bajo/intl/en-US.json

@@ -140,6 +140,7 @@
   "xSiteAdminArea": "Cross-Site Admin Area",
   "x": "Cross-Site",
   "misc": "Miscellaneous",
+  "populateRouteGuard": "Populate route guard",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/extend/bajo/intl/id.json

@@ -146,6 +146,7 @@
   "xSiteAdminArea": "Area Admin Antar Situs",
   "x": "Antar Situs",
   "misc": "Lain-lain",
+  "populateRouteGuard": "Isikan pelindung rute",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/index.js

@@ -190,19 +190,19 @@ async function factory (pkgName) {
       }
       if (this.config.xSiteAdmins.length === 0) {
         const site = await getModel('SumbaSite').findOneRecord({ query: { alias: 'default' } }, { noMagic: true })
-        const user = await getModel('SumbaUser').findOneRecord({ query: { username: 'admin', siteId: site.id } }, { noMagic: true })
+        const user = await getModel('SumbaUser').findOneRecord({ query: { username: 'admin', siteId: site.id + '' } }, { noMagic: true })
         this.config.xSiteAdmins.push(`${site.alias}:${user.username}`)
       }
     }
 
-    populateRouteGuards = async () => {
+    populateRouteGuards = async (sites) => {
       const { isString, get, difference } = this.app.lib._
       const { pascalCase } = this.app.lib.aneka
       const { eachPlugins, readConfig, breakNsPath } = this.app.bajo
       const { getModel } = this.app.dobo
 
       const allNs = this.app.getAllNs()
-      const sites = await getModel('SumbaSite').findAllRecord({ query: { status: 'ACTIVE' } }, { noMagic: true, dataOnly: true, fields: ['id', 'hostname'] })
+      if (!sites) sites = await getModel('SumbaSite').findAllRecord({ query: { status: 'ACTIVE' } }, { noMagic: true, dataOnly: true, fields: ['id', 'hostname'] })
 
       const sanitize = (item, ns) => {
         if (isString(item)) item = { path: item }
@@ -257,13 +257,13 @@ async function factory (pkgName) {
         const paths = routes.map(item => item.path)
         const model = getModel(pascalCase(`Sumba ${type} Guard`))
         for (const site of sites) {
-          const query = { path: { $in: paths }, siteId: site.id }
+          const query = { path: { $in: paths }, siteId: site.id + '' }
           const recs = await model.findAllRecord({ query }, { noMagic: true, dataOnly: true, fields: ['path', 'status'] })
           const spaths = difference(paths, recs.map(rec => rec.path))
           for (const path of spaths) {
             const body = cloneDeep(routes.find(r => r.path === path))
             body.status = 'ACTIVE'
-            body.siteId = site.id
+            body.siteId = site.id + ''
             await model.sanitizeFixture({ body, lookupValue: body })
             try {
               await model.createRecord(body, { noMagic: true, noReturn: true })

package/lib/create-new-site.js

@@ -66,10 +66,12 @@ export async function createRefs (site, data, options, verbose) {
         const val = f[key]
         if (isString(val) && val.slice(0, 2) === '?:') f[key] = await mdl._simpleLookup(val.slice(2), lv, options)
       }
-      await mdl.createRecord(f, options)
+      await mdl.createRecord(f, { ...options, noFlash: true })
     }
     if (verbose) this.print.succeed('writingModel%s%s', mdl.name, fixtures.length)
   }
+  if (verbose) this.print.succeed('populateRouteGuard')
+  await this.populateRouteGuards([site])
 }
 
 async function createNewSite (alias, hostname, verbose) {

package/lib/get-site.js

@@ -12,7 +12,7 @@ async function getSite (input, byId = false) {
     const names = this.app.getAllNs()
     const query = {
       ns: { $in: names },
-      siteId: site.id
+      siteId: site.id + ''
     }
     const all = await this.app.dobo.getModel('SumbaSiteSetting').findAllRecord({ query })
     for (const ns of names) {

package/lib/get-user.js

@@ -78,7 +78,7 @@ export async function getUserByUsernamePassword (username = '', password = '', r
   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', siteId: req.site.id }
+  const query = { username, provider: 'local', siteId: req.site.id + '' }
   const user = await model.findOneRecord({ query }, { req, forceNoHidden: true, noHook: true, noDriverHook: true })
   if (!user) throw this.error('validationError', { details: [{ field: 'username', error: 'Unknown username' }], statusCode: 401 })
   if (user.status !== 'ACTIVE') throw this.error('validationError', { details: ['User is inactive or temporarily disabled'], statusCode: 401 })

package/lib/remove-site.js

@@ -7,12 +7,12 @@ export async function removeRefs (site, options, verbose) {
   }).map(m => m.name)
   for (const m of models) {
     const mdl = getModel(m)
-    const rows = await mdl.findAllRecord({ query: { siteId: site.id } }, { ...options, dataOnly: true })
+    const rows = await mdl.findAllRecord({ query: { siteId: site.id + '' } }, { ...options, dataOnly: true })
     const ids = rows.map(item => item.id)
     // TODO: backup
     if (ids.length === 0) continue
     for (const id of ids) {
-      await mdl.removeRecord(id, { noReturn: true, ...options })
+      await mdl.removeRecord(id, { noReturn: true, ...options, noFlash: true })
     }
     if (verbose) this.print.succeed('removedFrom%s%s', mdl.name, ids.length)
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumba",
-  "version": "2.33.2",
+  "version": "2.33.4",
   "description": "Biz Suite for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -3,6 +3,8 @@
 ## 2026-06-18
 
 - [2.33.2] Bug fix in ```hook.js```
+- [2.33.3] Bug fix in ```hook.js```
+- [2.33.4] Bug fix in ```create-new-site.js```
 
 ## 2026-06-17