sumba 2.26.0 → 2.27.0

package/extend/bajo/hook.js

@@ -255,14 +255,6 @@ async function hook () {
         { payload, options, source: this.ns }
       )
     }
-  }, {
-    name: 'dobo.sumbaUser:afterRecordValidation',
-    handler: async function (body, options) {
-      const { isBcrypt, hash } = this.app.bajoExtra
-      const { has } = this.app.lib._
-
-      if (has(body, 'password') && !isBcrypt(body.password)) body.password = await hash(body.password, 'bcrypt')
-    }
   }, {
     name: 'dobo.sumbaUser:afterRemoveRecord',
     handler: async function (id, rec, options = {}) {
@@ -303,30 +295,6 @@ async function hook () {
         )
       }
     }
-  }, {
-    name: 'dobo.sumbaUser:beforeCreateRecord',
-    handler: async function (body, options = {}) {
-      const { token, salt } = await this.resetToken()
-      body.token = token
-      body.salt = salt
-    }
-  }, {
-    name: 'dobo.sumbaUser:beforeRecordValidation',
-    handler: async function (body, options = {}) {
-      const { set } = this.app.lib._
-      const password = await this.passwordRule(options.req)
-      const rule = { password }
-      set(options, 'validation.params.rule', rule)
-    }
-  }, {
-    name: 'dobo.sumbaUser:beforeUpdateRecord',
-    handler: async function (id, body, options = {}) {
-      if (body.salt) {
-        const { token, salt } = await this.resetToken(body.salt)
-        body.token = token
-        body.salt = salt
-      }
-    }
   }, {
     level: 1000,
     name: 'dobo.driver:beforeCreateRecord',

package/extend/dobo/fixture/team-user.json

@@ -1,6 +1,6 @@
 [{
   "siteId": "?:SumbaSite::alias:default",
-  "userId": "?:SumbaUser::username:admin+siteId={siteId}",
-  "teamId": "?:SumbaTeam::alias:administrator+siteId={siteId}",
+  "userId": "?:SumbaUser::username:'admin'+siteId:'{siteId}'",
+  "teamId": "?:SumbaTeam::alias:'administrator'+siteId:'{siteId}'",
   "_immutable": true
 }]

package/extend/dobo/model.js

@@ -102,8 +102,11 @@ async function model () {
     options
   }, {
     baseName: 'x-route-guard',
-    properties: rgProperties.filter(prop => !isString(prop) || (isString(prop) && !prop.startsWith('teamIds'))),
-    features: rgFeatures.filter(feat => !isString(feat) || (isString(feat) && !['sumba:siteId', 'dobo:updatedAt'].includes(feat))).concat('sumba:siteIds', 'dobo:updatedAt'),
+    properties: rgProperties.filter(prop => {
+      if (!isString(prop)) return true
+      return !(prop.startsWith('teamIds') || prop.startsWith('siteId'))
+    }).concat('siteIds,sumba:siteIds'),
+    features: rgFeatures,
     options
   }, {
     baseName: 'attrib-guard',
@@ -113,8 +116,11 @@ async function model () {
     buildEnd
   }, {
     baseName: 'x-attrib-guard',
-    properties: agProperties.filter(prop => !isString(prop) || (isString(prop) && !prop.startsWith('teamIds'))),
-    features: agFeatures.filter(feat => !isString(feat) || (isString(feat) && !['sumba:siteId', 'dobo:updatedAt'].includes(feat))).concat('sumba:siteIds', 'dobo:updatedAt'),
+    properties: agProperties.filter(prop => {
+      if (!isString(prop)) return true
+      return !(prop.startsWith('teamIds') || prop.startsWith('siteId'))
+    }).concat('siteIds,sumba:siteIds'),
+    features: agFeatures,
     options,
     buildEnd
   }, {
@@ -125,8 +131,11 @@ async function model () {
     buildEnd
   }, {
     baseName: 'x-model-guard',
-    properties: mgProperties.filter(prop => !isString(prop) || (isString(prop) && !prop.startsWith('teamIds'))),
-    features: mgFeatures.filter(feat => !isString(feat) || (isString(feat) && !['sumba:siteId', 'dobo:updatedAt'].includes(feat))).concat('sumba:siteIds', 'dobo:updatedAt'),
+    properties: mgProperties.filter(prop => {
+      if (!isString(prop)) return true
+      return !(prop.startsWith('teamIds') || prop.startsWith('siteId'))
+    }).concat('siteIds,sumba:siteIds'),
+    features: mgFeatures,
     options,
     buildEnd
   }, {
@@ -208,7 +217,40 @@ async function model () {
       'dobo:createdAt',
       'dobo:updatedAt',
       'dobo:immutable'
-    ]
+    ],
+    hooks: [{
+      name: 'afterRecordValidation',
+      handler: async function (body, options) {
+        const { isBcrypt, hash } = this.app.bajoExtra
+        const { has } = this.app.lib._
+
+        if (has(body, 'password') && !isBcrypt(body.password)) body.password = await hash(body.password, 'bcrypt')
+      }
+    }, {
+      name: 'beforeCreateRecord',
+      handler: async function (body, options = {}) {
+        const { token, salt } = await this.plugin.resetToken()
+        body.token = token
+        body.salt = salt
+      }
+    }, {
+      name: 'beforeRecordValidation',
+      handler: async function (body, options = {}) {
+        const { set } = this.app.lib._
+        const password = await this.plugin.passwordRule(options.req)
+        const rule = { password }
+        set(options, 'validation.params.rule', rule)
+      }
+    }, {
+      name: 'beforeUpdateRecord',
+      handler: async function (id, body, options = {}) {
+        if (body.salt) {
+          const { token, salt } = await this.plugin.resetToken(body.salt)
+          body.token = token
+          body.salt = salt
+        }
+      }
+    }]
   }]
 }
 

package/index.js

@@ -377,7 +377,7 @@ async function factory (pkgName) {
       return true
     }
 
-    checkPathsByRoute = ({ paths = [], teamIds = [], guards = [] }) => {
+    checkPathsByRoute = ({ req, paths = [], teamIds = [], guards = [] }) => {
       const { includes } = this.app.lib.aneka
       const { outmatch } = this.app.lib
 
@@ -385,8 +385,10 @@ async function factory (pkgName) {
         const matchPath = outmatch(item.path)
         for (const path of paths) {
           if (matchPath(path)) {
-            if (includes(teamIds, item.teamIds)) return item
-            if (teamIds.length === 0) return item
+            if (item.methods.includes(req.method)) {
+              if (includes(teamIds, item.teamIds)) return item
+              if (teamIds.length === 0) return item
+            }
           }
         }
       }

package/lib/create-new-site.js

@@ -61,9 +61,10 @@ export async function createRefs (site, data, options, verbose) {
     const fixtures = data[m]
     for (const f of fixtures) {
       f.siteId = site.id
+      const lv = {}
       for (const key in f) {
         const val = f[key]
-        if (isString(val) && val.slice(0, 2) === '?:') f[key] = await mdl._simpleLookup(val.slice(2), options)
+        if (isString(val) && val.slice(0, 2) === '?:') f[key] = await mdl._simpleLookup(val.slice(2), lv, options)
       }
       await mdl.createRecord(f, options)
     }

package/lib/util.js

@@ -122,28 +122,28 @@ export async function checkUserId (req, reply, source) {
   const globalGuards = guards.global.filter(item => item.siteIds.includes(req.site.id + ''))
   const localGuards = guards.local.filter(item => item.siteIds.includes(req.site.id + ''))
   // find anonymousPath
-  anonymousPath = await this.checkPathsByRoute({ paths, guards: localGuards.filter(item => item.anonymous && !item.negation) })
+  anonymousPath = await this.checkPathsByRoute({ req, paths, guards: localGuards.filter(item => item.anonymous && !item.negation) })
   if (anonymousPath) {
-    const neg = await this.checkPathsByRoute({ paths, guards: localGuards.filter(item => item.anonymous && item.negation) })
+    const neg = await this.checkPathsByRoute({ req, paths, guards: localGuards.filter(item => item.anonymous && item.negation) })
     if (neg) anonymousPath = undefined
   }
   if (!anonymousPath) {
-    anonymousPath = await this.checkPathsByRoute({ paths, guards: globalGuards.filter(item => item.anonymous && !item.negation) })
+    anonymousPath = await this.checkPathsByRoute({ req, paths, guards: globalGuards.filter(item => item.anonymous && !item.negation) })
     if (anonymousPath) {
-      const neg = await this.checkPathsByRoute({ paths, guards: globalGuards.filter(item => item.anonymous && item.negation) })
+      const neg = await this.checkPathsByRoute({ req, paths, guards: globalGuards.filter(item => item.anonymous && item.negation) })
       if (neg) anonymousPath = undefined
     }
   }
   // find securePath
-  securePath = await this.checkPathsByRoute({ paths, guards: localGuards.filter(item => !item.anonymous && !item.negation) })
+  securePath = await this.checkPathsByRoute({ req, paths, guards: localGuards.filter(item => !item.anonymous && !item.negation) })
   if (securePath) {
-    const neg = await this.checkPathsByRoute({ paths, guards: localGuards.filter(item => !item.anonymous && item.negation) })
+    const neg = await this.checkPathsByRoute({ req, paths, guards: localGuards.filter(item => !item.anonymous && item.negation) })
     if (neg) securePath = undefined
   }
   if (!securePath) {
-    securePath = await this.checkPathsByRoute({ paths, guards: globalGuards.filter(item => !item.anonymous && !item.negation) })
+    securePath = await this.checkPathsByRoute({ req, paths, guards: globalGuards.filter(item => !item.anonymous && !item.negation) })
     if (securePath) {
-      const neg = await this.checkPathsByRoute({ paths, guards: globalGuards.filter(item => !item.anonymous && item.negation) })
+      const neg = await this.checkPathsByRoute({ req, paths, guards: globalGuards.filter(item => !item.anonymous && item.negation) })
       if (neg) securePath = undefined
     }
   }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 2026-05-30
+
+- [2.27.0] Move all ```sumbaUser``` hooks to model hooks
+- [2.27.0] Bug fix in ```model.js```
+- [2.27.0] Bug fix in ```create-new-site.js```
+- [2.27.0] Bug fix in ```team-user.json``` fixture
+
+## 2026-05-29
+
+- [2.26.1] Bug fix in ```util.js```
+- [2.26.1] Bug fix in ```checkPathsByRoute()```
+
 ## 2026-05-28
 
 - [2.26.0] Change hooks to be written in one ```hook.js``` file