sumba 0.1.2 → 0.1.4

package/bajo/helper/get-user-from-username-password.js

@@ -6,7 +6,7 @@ async function getUserByUsernamePassword (username = '', password = '', req) {
   await validate({ username, password }, 'SumbaUser', { ns: ['sumba', 'bajoDb'], fields: ['username', 'password'] })
   const bcrypt = await importPkg('bajo-extra:bcrypt')
   const query = { username }
-  const rows = await recordFind(coll, { query }, { req, ignoreHidden: true })
+  const rows = await recordFind(coll, { query }, { req, ignoreHidden: true, skipHook: true })
   if (rows.length === 0) throw error('Unknown username', { details: [{ field: 'username', error: 'Unknown username' }], statusCode: 401 })
   const rec = rows[0]
   if (rec.status !== 'ACTIVE') throw error('User is inactive or temporary disabled', { details: ['User is inactive or temporary disabled'], statusCode: 401 })

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

@@ -30,7 +30,7 @@ async function verifyApiKey (ctx, req, reply, source) {
   if (!isMd5(token)) return false
   token = await hash(token)
   const query = { token }
-  const rows = await recordFind('SumbaUser', { query }, { req })
+  const rows = await recordFind('SumbaUser', { query }, { req, skipHook: true })
   if (rows.length === 0) throw error('Invalid api key provided', { statusCode: 401 })
   if (rows[0].status !== 'ACTIVE') throw error('User is inactive or temporary disabled', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
   req.user = await getUser(rows[0])

package/bajo/helper/verify/jwt.js

@@ -17,7 +17,7 @@ async function verifyJwt (ctx, req, reply, source) {
   const decoded = await verifier(token)
   const id = decoded.payload.uid
   try {
-    const rec = await recordGet('SumbaUser', id, { req })
+    const rec = await recordGet('SumbaUser', id, { req, skipHook: true })
     if (!rec) throw error('Invalid token or token is expired', { statusCode: 401 })
     if (rec.status !== 'ACTIVE') throw error('User is inactive or temporary disabled', { details: [{ field: 'status', error: 'inactive' }], statusCode: 401 })
     req.user = await getUser(rec)

package/bajoDb/fixture/site-setting.json

@@ -1,4 +1,4 @@
 [{
   "theme": "bootstrap5",
-  "siteId": "DEFAULT"
+  "siteId": "?:SumbaSite::alias:default"
 }]

package/bajoDb/fixture/site.json

@@ -1,5 +1,5 @@
 [{
-  "id": "DEFAULT",
+  "alias": "default",
   "hostname": "localhost",
   "title": "Default Site",
   "orgName": "Default Organization",

package/bajoDb/fixture/user-setting.json

@@ -1,5 +1,5 @@
 [{
   "theme": "bootstrap5",
-  "userId": "admin",
-  "siteId": "DEFAULT"
+  "userId": "?:SumbaUser::username:admin",
+  "siteId": "?:SumbaSite::alias:default"
 }]

package/bajoDb/fixture/user.json

@@ -1,11 +1,10 @@
 [{
-  "id": "admin",
   "username": "admin",
   "password": "Sumb44dm!n",
   "email": "admin@domain.com",
   "firstName": "Site",
   "lastName": "Admin",
   "country": "US",
-  "siteId": "DEFAULT",
+  "siteId": "?:SumbaSite::alias:default",
   "status": "ACTIVE"
 }]

package/bajoDb/schema/site.json

@@ -4,12 +4,12 @@
     "type": "string",
     "minLength": 5,
     "maxLength": 100,
-    "unique": true
+    "index": "unique"
   }, {
     "name": "alias",
     "type": "string",
     "maxLength": 100,
-    "unique": true
+    "index": "unique"
   }, {
     "name": "title",
     "type": "string",

package/lib/check-site-id.js

@@ -11,7 +11,8 @@ async function checkSiteId (req, reply) {
   const { recordFind, recordGet } = this.bajoDb.helper
   const cfg = getConfig('sumba')
   if (!cfg.multiSite) {
-    req.site = await recordGet('SumbaSite', 'DEFAULT')
+    const resp = await recordFind('SumbaSite', { query: { alias: 'default' } }, { skipHook: true })
+    req.site = resp[0]
     await mergeSetting.call(this, req)
     return
   }
@@ -23,7 +24,7 @@ async function checkSiteId (req, reply) {
     ]
   }
   const filter = { query }
-  const rows = await recordFind('SumbaSite', filter)
+  const rows = await recordFind('SumbaSite', filter, { skipHook: true })
   if (rows.length === 0) throw error('Unknown site or site is not configured yet')
   const row = rows[0]
   if (row.status !== 'ACTIVE') throw error('This site is currently inactive or disabled. Please contact your admin, thanks!')

package/lib/check-user-id.js

@@ -44,7 +44,7 @@ async function mergeSetting (req) {
   const { getConfig } = this.bajo.helper
   const { recordFind } = this.bajoDb.helper
   const filter = { query: { siteId: req.site.id, userId: req.user.id }, limit: 1 }
-  const settings = await recordFind('SumbaUserSetting', filter)
+  const settings = await recordFind('SumbaUserSetting', filter, { skipHook: true })
   req.user.setting = settings[0] ?? { theme: getConfig('bajoWebMpa').theme ?? '' }
 }
 

package/package.json

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

package/bajoDb/feature/dt.js

@@ -1,13 +0,0 @@
-async function dt (opts = {}) {
-  opts.fieldName = opts.fieldName ?? 'dt'
-  return {
-    properties: [{
-      name: opts.fieldName ?? 'dt',
-      type: 'datetime',
-      required: opts.required ?? true,
-      index: opts.index ?? true
-    }]
-  }
-}
-
-export default dt