sumba 2.29.0 → 2.31.0

package/extend/bajo/hook.js

@@ -1,4 +1,3 @@
-import { checkUserId, checkTeam, checkXSite, checkTheme, checkIconset } from '../../lib/util.js'
 import { removeRefs } from '../../lib/remove-site.js'
 import { getAllFixtures, createRefs } from '../../lib/create-new-site.js'
 import path from 'path'
@@ -22,45 +21,30 @@ async function clearCacheUser (id, result) {
 }
 
 async function applyModelGuard ({ model, q, teamIds, options }) {
-  const { get, set, orderBy, intersection, without } = this.app.lib._
+  const { get, set, orderBy, without } = this.app.lib._
   const { includes } = this.app.lib.aneka
   const { req } = options
   const results = []
 
   const guards = await this.getModelGuards()
-  const columns = model.getNonVirtualProperties().map(prop => prop.name)
+  const fields = model.getNonVirtualProperties().map(prop => prop.name)
   const filterFn = item => {
-    const bySiteId = item.siteIds ? item.siteIds.includes(req.site.id + '') : true
+    const bySiteId = item.siteId === req.site.id + ''
     const byModel = item.models.includes(model.name)
-    const byTeamId = item.teamIds ? includes(item.teamIds, teamIds) : true
-    const byColumn = columns.includes(item.column)
-    return bySiteId && byModel && byTeamId && byColumn
+    const byTeamId = includes(item.teamIds, teamIds)
+    const byFields = fields.includes(item.field)
+    return bySiteId && byModel && byTeamId && byFields
   }
 
-  guards.global = orderBy(guards.global.filter(filterFn), ['column'])
-  guards.local = orderBy(guards.local.filter(filterFn), ['column'])
-  for (const col of columns) {
+  const rules = orderBy(guards.filter(filterFn), ['field'])
+  for (const field of fields) {
     let values = []
-    let items = guards.global.filter(item => item.column === col && !item.negation)
+    const items = rules.filter(item => item.field === field)
     for (const item of items) {
-      values.push(...item.value)
+      if (item.behavior === 'NIN') values = without(values, ...item.value)
+      else if (item.behavior === 'IN') values.push(...item.value)
     }
-    items = guards.global.filter(item => item.column === col && item.negation)
-    for (const item of items) {
-      values = without(values, ...item.value)
-    }
-    items = guards.local.filter(item => item.column === col && !item.negation)
-    const newValues = []
-    for (const item of items) {
-      newValues.push(...item.value)
-    }
-    if (values.length === 0) values = newValues
-    else if (newValues.length > 0) values = intersection(values, newValues)
-    items = guards.local.filter(item => item.column === col && item.negation)
-    for (const item of items) {
-      values = without(values, ...item.value)
-    }
-    if (values.length) results.push(set({}, col, { $in: values }))
+    if (values.length) results.push(set({}, field, { $in: values }))
   }
 
   const allowEmpty = get(this, `config.dobo.model.${model.name}.allowEmptyQuery`, true)
@@ -76,16 +60,14 @@ export async function applyAttribGuard ({ model, teamIds, options }) {
 
   const guards = await this.getAttribGuards()
   const filterFn = item => {
-    const bySiteId = item.siteIds ? item.siteIds.includes(req.site.id + '') : true
+    const bySiteId = item.siteId === req.site.id + ''
     const byModel = item.models.includes(model.name)
-    const byTeamId = item.teamIds ? includes(item.teamIds, teamIds) : true
+    const byTeamId = includes(item.teamIds, teamIds)
     return bySiteId && byModel && byTeamId
   }
 
-  let item = guards.global.filter(filterFn)[0]
-  if (item) results.push(...item.hiddenCols)
-  item = guards.local.filter(filterFn)[0]
-  if (item) results.push(...item.hiddenCols)
+  const item = guards.filter(filterFn)[0]
+  if (item) results.push(...item.hiddenFields)
   options.hidden = options.hidden ?? []
   if (results.length > 0) options.hidden.push(...results)
   options.hidden = uniq(options.hidden)
@@ -168,7 +150,7 @@ async function hook () {
       }
     }
   }, {
-    name: ['dobo.sumbaAttribGuard:afterTransaction', 'dobo.sumbaXAttribGuard:afterTransaction'],
+    name: ['dobo.sumbaAttribGuard:afterTransaction'],
     handler: async function (action, ...args) {
       if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
       await this.getAttribGuards(true)
@@ -205,16 +187,22 @@ async function hook () {
       options.checksumId = true
     }
   }, {
-    name: ['dobo.sumbaModelGuard:afterTransaction', 'dobo.sumbaXModelGuard:afterTransaction'],
+    name: ['dobo.sumbaModelGuard:afterTransaction'],
     handler: async function (action, ...args) {
       if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
       await this.getModelGuards(true)
     }
   }, {
-    name: ['dobo.sumbaRouteGuard:afterTransaction', 'dobo.sumbaXRouteGuard:afterTransaction'],
+    name: ['dobo.sumbaSecureGuard:afterTransaction'],
     handler: async function (action, ...args) {
       if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
-      await this.getRouteGuards(true)
+      await this.getSecureGuards(true)
+    }
+  }, {
+    name: ['dobo.sumbaAnonymousGuard:afterTransaction'],
+    handler: async function (action, ...args) {
+      if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
+      await this.getAnonymousGuards(true)
     }
   }, {
     name: 'dobo.sumbaSite:afterCreateRecord',
@@ -237,7 +225,7 @@ async function hook () {
     name: ['dobo.sumbaTeam:afterTransaction', 'dobo.sumbaSite:afterTransaction'],
     handler: async function (action, ...args) {
       if (!['createRecord', 'updateRecord', 'removeRecord'].includes(action)) return
-      await this.getRouteGuards(true)
+      await this.getSecureGuards(true)
       await this.getModelGuards(true)
       await this.getAttribGuards(true)
     }
@@ -349,35 +337,36 @@ async function hook () {
     level: 10,
     name: 'waibuMpa:preParsing',
     handler: async function (req, reply) {
-      await checkTheme.call(this, req, reply)
-      await checkIconset.call(this, req, reply)
-      const secure = await checkUserId.call(this, req, reply, 'waibuMpa')
+      await this.checkTheme(req, reply)
+      await this.checkIconset(req, reply)
+      const secure = await this.checkUser(req, reply, 'waibuMpa')
       if (!secure) return
-      await checkTeam.call(this, req, reply, secure)
-      await checkXSite.call(this, req, reply)
+      await this.checkTeam(req, reply)
+      await this.checkXSite(req, reply)
     }
   }, {
     level: 10,
     name: 'waibuRestApi:preParsing',
     handler: async function (req, reply) {
-      const secure = await checkUserId.call(this, req, reply, 'waibuRestApi')
+      const secure = await this.checkUser(req, reply, 'waibuRestApi')
       if (!secure) return
-      await checkTeam.call(this, req, reply, secure)
-      await checkXSite.call(this, req, reply)
+      await this.checkTeam(req, reply)
+      await this.checkXSite(req, reply)
     }
   }, {
     level: 10,
     name: 'waibuStatic:preParsing',
     handler: async function (req, reply) {
-      const secure = await checkUserId.call(this, req, reply, 'waibuStatic')
+      const secure = await this.checkUser(req, reply, 'waibuStatic')
       if (!secure) return
-      await checkTeam.call(this, req, reply, secure)
-      await checkXSite.call(this, req, reply)
+      await this.checkTeam(req, reply)
+      await this.checkXSite(req, reply)
     }
   }, {
     name: 'waibu:afterAppBoot',
     handler: async function () {
-      await this.getRouteGuards(true)
+      await this.getAnonymousGuards(true)
+      await this.getSecureGuards(true)
       await this.getModelGuards(true)
       await this.getAttribGuards(true)
     }
@@ -392,6 +381,14 @@ async function hook () {
     handler: async function (req, reply) {
       const { getHostname } = this.app.waibu
       req.site = await this.getSite(getHostname(req))
+      req.user = {}
+    }
+  }, {
+    name: 'waibu:beforeStart',
+    handler: async function () {
+      if (this.app.sumba.config.multiSite.enabled) return
+      const routes = ['waibuAdmin:/site/x/site/*']
+      this.app.waibu.config.route.disabled.push(...routes)
     }
   }]
 }

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

@@ -132,15 +132,14 @@
   "statusClosed": "Closed",
   "allSites": "All Sites",
   "permission": "Permission",
-  "routeGuard": "Route Guard",
+  "anonymousGuard": "Anonymous Guard",
+  "secureGuard": "Secure Guard",
   "modelGuard": "Model Guard",
   "attribGuard": "Attribute Guard",
-  "xRouteGuard": "Route Guard",
-  "xModelGuard": "Model Guard",
-  "xAttribGuard": "Attribute Guard",
   "xSite": "Cross-Site",
   "xSiteAdminArea": "Cross-Site Admin Area",
   "x": "Cross-Site",
+  "misc": "Miscellaneous",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",
@@ -173,7 +172,8 @@
     "column": "Column",
     "hiddenCols": "Hidden Columns",
     "models": "Models",
-    "siteIds": "Sites"
+    "siteIds": "Sites",
+    "allTeams": "All Teams?"
   },
   "validation": {
     "password": {

package/extend/bajo/intl/id.json

@@ -138,15 +138,14 @@
   "statusClosed": "Tertutup",
   "allSites": "Semua Situs",
   "permission": "Permisi",
-  "routeGuard": "Pelindung Rute",
+  "anonymousGuard": "Pelindung Rute Anonim",
+  "secureGuard": "Pelindung Rute Aman",
   "modelGuard": "Pelindung Model",
   "attribGuard": "Pelindung Atribut",
-  "xRouteGuard": "Pelindung Rute",
-  "xModelGuard": "Pelindung Model",
-  "xAttribGuard": "Pelindung Atribut",
   "xSite": "Antar Situs",
   "xSiteAdminArea": "Area Admin Antar Situs",
   "x": "Antar Situs",
+  "misc": "Lain-lain",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",
@@ -179,7 +178,8 @@
     "column": "Kolom",
     "hiddenCols": "Kolom Tersembunyi",
     "models": "Model",
-    "siteIds": "Situs"
+    "siteIds": "Situs",
+    "allTeams": "Semua Tim?"
   },
   "validation": {
     "password": {

package/extend/dobo/feature/lat-lng.js

@@ -1,4 +1,9 @@
-import { latLngHook } from '../../../lib/util.js'
+export async function latLngHook (body, options) {
+  const { isSet } = this.app.lib.aneka
+  const { round } = this.app.lib.aneka
+  if (!isSet(body[options.field])) return
+  body[options.field] = round(body[options.field], options.scale)
+}
 
 async function latLng (opts = {}) {
   const { merge } = this.app.lib._

package/extend/dobo/feature/lat.js

@@ -1,4 +1,4 @@
-import { latLngHook } from '../../../lib/util.js'
+import { latLngHook } from './lat-lng.js'
 
 async function lat (opts = {}) {
   opts.field = opts.field ?? 'lat'

package/extend/dobo/feature/lng.js

@@ -1,4 +1,4 @@
-import { latLngHook } from '../../../lib/util.js'
+import { latLngHook } from './lat-lng.js'
 
 async function lng (opts = {}) {
   opts.field = opts.field ?? 'lng'

package/extend/dobo/feature/status.js

@@ -1,13 +1,15 @@
 async function status (opts = {}) {
   opts.field = opts.field ?? 'status'
   opts.required = opts.required ?? true
-  opts.values = opts.values ?? ['UNVERIFIED', 'ACTIVE', 'INACTIVE']
+  opts.default = opts.default ?? 'ACTIVE'
+  opts.values = opts.values ?? ['ACTIVE', 'INACTIVE']
   return {
     properties: [{
       name: opts.field ?? 'status',
       type: 'string',
       maxLength: 50,
       index: true,
+      default: opts.default,
       required: opts.required,
       values: opts.values
     }],

package/extend/dobo/fixture/site.json

@@ -14,5 +14,5 @@
   "phone": "+001-000000001",
   "waPhone": "+001-111111111",
   "status": "ACTIVE",
-  "_immutable": true
+  "_immutable": ["*"]
 }]

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

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

package/extend/dobo/fixture/team.json

@@ -2,6 +2,6 @@
   "alias": "administrator",
   "name": "Administrator",
   "siteId": "?:SumbaSite::alias:default",
-  "status": "ENABLED",
-  "_immutable": true
+  "status": "ACTIVE",
+  "_immutable": ["*"]
 }]

package/extend/dobo/fixture/user.json

@@ -13,5 +13,5 @@
   "provider": "local",
   "siteId": "?:SumbaSite::alias:default",
   "status": "ACTIVE",
-  "_immutable": true
+  "_immutable": ["*"]
 }]

package/extend/dobo/model.js

@@ -3,142 +3,102 @@ const buildEnd = async function (model) {
   if (prop) prop.values = this.getModelNames(true)
 }
 
-const mgProperties = [
-  {
-    name: 'models',
-    type: 'array',
-    required: true
-  },
-  'column,,50,true,true',
-  {
-    name: 'negation',
-    type: 'boolean',
-    required: true,
-    default: false
-  },
-  {
-    name: 'status',
-    type: 'sumba:status',
-    values: ['ACTIVE', 'INACTIVE'],
-    default: 'ACTIVE'
-  },
-  'value,array,,,true',
-  'siteId,sumba:siteId',
-  'teamIds,sumba:teamIds'
-]
-
 const options = {
   attachment: false,
   cache: { ttlDur: 0 }
 }
 
-const mgFeatures = [
-  'dobo:updatedAt'
-]
-
-const agProperties = [
-  {
-    name: 'models',
-    type: 'array',
-    required: true
-  },
-  'hiddenCols,array',
-  'siteId,sumba:siteId',
-  'teamIds,sumba:teamIds'
-]
-
-const agFeatures = [
-  {
-    name: 'sumba:status',
-    values: ['ACTIVE', 'INACTIVE'],
-    default: 'ACTIVE'
-  },
-  'dobo:updatedAt'
-]
-
-export const rgProperties = [
-  'path,,255,true,true',
-  {
-    name: 'methods',
-    type: 'array',
-    required: true,
-    default: ['GET', 'POST', 'UPDATE', 'DELETE'],
-    values: ['GET', 'POST', 'UPDATE', 'DELETE']
-  },
-  {
-    name: 'weight',
-    type: 'smallint',
-    default: 0
-  }, {
-    name: 'negation',
-    type: 'boolean',
-    required: true,
-    default: false
-  }, {
-    name: 'anonymous',
-    type: 'boolean',
-    required: true,
-    default: false
-  },
-  'siteId,sumba:siteId',
-  'teamIds,sumba:teamIds'
-]
+const allTeams = {
+  name: 'allTeams',
+  type: 'boolean',
+  default: true,
+  required: true
+}
 
-export const rgFeatures = [
-  {
-    name: 'sumba:status',
-    values: ['ACTIVE', 'INACTIVE'],
-    default: 'ACTIVE'
-  },
-  'dobo:updatedAt'
-]
+const routeGuard = {
+  properties: [
+    {
+      name: 'path',
+      maxLength: 255,
+      required: true
+    },
+    allTeams,
+    'teamIds,sumba:teamIds',
+    {
+      name: 'weight',
+      type: 'smallint',
+      index: true,
+      default: 0
+    },
+    'siteId,sumba:siteId'
+  ],
+  features: [
+    'sumba:status',
+    'dobo:updatedAt',
+    'dobo:immutable'
+  ],
+  indexes: [{
+    type: 'unique',
+    fields: ['siteId', 'path']
+  }],
+  options: { ...options }
+}
 
 async function model () {
-  const { isString } = this.app.lib._
+  const { merge, cloneDeep } = this.app.lib._
   return [{
-    baseName: 'route-guard',
-    properties: rgProperties,
-    features: rgFeatures,
-    options
-  }, {
-    baseName: 'x-route-guard',
-    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',
-    properties: agProperties,
-    features: agFeatures,
-    options,
-    buildEnd
-  }, {
-    baseName: 'x-attrib-guard',
-    properties: agProperties.filter(prop => {
-      if (!isString(prop)) return true
-      return !(prop.startsWith('teamIds') || prop.startsWith('siteId'))
-    }).concat('siteIds,sumba:siteIds'),
-    features: agFeatures,
-    options,
+    properties: [
+      {
+        name: 'models',
+        type: 'array',
+        required: true
+      },
+      'hiddenFields,array',
+      allTeams,
+      'teamIds,sumba:teamIds',
+      'siteId,sumba:siteId'
+    ],
+    features: [
+      'sumba:status',
+      'dobo:updatedAt',
+      'dobo:immutable'
+    ],
+    options: { ...options },
     buildEnd
   }, {
     baseName: 'model-guard',
-    properties: mgProperties,
-    features: mgFeatures,
-    options,
-    buildEnd
-  }, {
-    baseName: 'x-model-guard',
-    properties: mgProperties.filter(prop => {
-      if (!isString(prop)) return true
-      return !(prop.startsWith('teamIds') || prop.startsWith('siteId'))
-    }).concat('siteIds,sumba:siteIds'),
-    features: mgFeatures,
-    options,
+    properties: [
+      {
+        name: 'models',
+        type: 'array',
+        required: true
+      },
+      'field,,50,true,true',
+      {
+        name: 'behavior',
+        type: 'string',
+        maxLength: 20,
+        required: true,
+        values: ['IN', 'NIN'],
+        default: 'IN'
+      },
+      'value,array,,,true',
+      allTeams,
+      'teamIds,sumba:teamIds',
+      'siteId,sumba:siteId'
+    ],
+    features: [
+      'sumba:status',
+      'dobo:updatedAt',
+      'dobo:immutable'
+    ],
+    options: { ...options },
     buildEnd
-  }, {
+  },
+  merge(cloneDeep(routeGuard), { baseName: 'anonymous-guard' }),
+  merge(cloneDeep(routeGuard), { baseName: 'secure-guard' }),
+  {
     buildLevel: 2,
     baseName: 'user',
     properties: [{

package/extend/dobo/model.json

@@ -88,10 +88,7 @@
     "sumba:personInCharge",
     "sumba:address",
     "sumba:social",
-    {
-      "name": "sumba:status",
-      "default": "ACTIVE"
-    },
+    "sumba:status",
     "dobo:createdAt",
     "dobo:updatedAt",
     "dobo:immutable"
@@ -128,6 +125,7 @@
     "sumba:siteId",
     "sumba:userId",
     "sumba:teamId",
+    "sumba:status",
     "dobo:immutable"
   ]
 }, {
@@ -146,11 +144,7 @@
     "dobo:updatedAt",
     "dobo:immutable",
     "sumba:siteId",
-    {
-      "name": "sumba:status",
-      "default": "ENABLED",
-      "values": ["ENABLED", "DISABLED"]
-    },
+    "sumba:status",
     "dobo:immutable"
   ]
 }, {

package/extend/sumba/route/anonymous.json

@@ -0,0 +1,5 @@
+[
+  "/user/**/*",
+  "/signin",
+  "restapi:/user/access-token/**/*"
+]

package/extend/sumba/route/secure.json

@@ -0,0 +1,8 @@
+[
+  "/your-stuff/**/*",
+  "/signout",
+  "/help/trouble-tickets/**/*",
+  "restapi:/user/api-key",
+  "restapi:/your-stuff/**/*",
+  "restapi:/manage/**/*"
+]

package/extend/waibuDb/schema/anonymous-guard.js

@@ -0,0 +1,15 @@
+async function anonymousGuard () {
+  return {
+    common: {
+      widget: {
+        teamIds: {
+          attr: {
+            refUrl: 'waibuAdmin:/{prefix}/team/details?id={id}'
+          }
+        }
+      }
+    }
+  }
+}
+
+export default anonymousGuard

package/extend/waibuDb/schema/{route-guard.js → secure-guard.js}

@@ -1,4 +1,4 @@
-async function routeGuard () {
+async function secureGuard () {
   return {
     common: {
       widget: {
@@ -12,4 +12,4 @@ async function routeGuard () {
   }
 }
 
-export default routeGuard
+export default secureGuard

package/extend/waibuDb/schema/team-user.js

@@ -2,7 +2,7 @@ async function teamUser () {
   return {
     common: {
       layout: [
-        { name: 'meta', fields: ['id', 'createdAt', 'updatedAt'] },
+        { name: 'meta', fields: ['id:3-md', 'createdAt:3-md', 'updatedAt:3-md', 'status:3-md'] },
         { name: 'general', fields: ['userId:6-md', 'teamId:6-md'] }
       ],
       widget: {
@@ -20,7 +20,7 @@ async function teamUser () {
     },
     view: {
       list: {
-        fields: ['userId', 'teamId', 'createdAt', 'updatedAt'],
+        fields: ['userId', 'teamId', 'status', 'createdAt', 'updatedAt'],
         stat: {
           aggregate: [
             { fields: ['userId'], group: 'userId', aggregate: ['count'] },

package/extend/waibuDb/schema/team.json

@@ -21,7 +21,7 @@
     "details": {
     },
     "add": {
-      "hidden": ["id", "createdAt", "updatedAt", "status"]
+      "hidden": ["id", "createdAt", "updatedAt"]
     },
     "edit": {
       "readonly": ["id", "createdAt", "updatedAt"]