sumba 2.36.0 → 2.37.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/extend/bajo/hook.js +4 -4
- package/index.js +4 -4
- package/package.json +1 -1
- package/wiki/CHANGES.md +4 -0
package/extend/bajo/hook.js
CHANGED
|
@@ -156,13 +156,13 @@ async function hook () {
|
|
|
156
156
|
}
|
|
157
157
|
}, {
|
|
158
158
|
level: 1000,
|
|
159
|
-
name: 'dobo.
|
|
159
|
+
name: 'dobo.adapter:beforeAny',
|
|
160
160
|
handler: async function (model, options) {
|
|
161
161
|
await this.applyActionHook({ model, options })
|
|
162
162
|
}
|
|
163
163
|
}, {
|
|
164
164
|
level: 1000,
|
|
165
|
-
name: 'dobo.
|
|
165
|
+
name: 'dobo.adapter:beforeCreateRecord',
|
|
166
166
|
handler: async function (model, body, options = {}) {
|
|
167
167
|
const { get } = this.app.lib._
|
|
168
168
|
const { isSet } = this.app.lib.aneka
|
|
@@ -177,7 +177,7 @@ async function hook () {
|
|
|
177
177
|
}
|
|
178
178
|
}, {
|
|
179
179
|
level: 1000,
|
|
180
|
-
name: ['dobo.
|
|
180
|
+
name: ['dobo.adapter:beforeFindRecord', 'dobo.adapter:beforeFindAllRecord', 'dobo.adapter:beforeCountRecord'],
|
|
181
181
|
handler: async function handler (model, filter, options = {}) {
|
|
182
182
|
const { isEmpty } = this.app.lib._
|
|
183
183
|
const { req = {} } = options
|
|
@@ -186,7 +186,7 @@ async function hook () {
|
|
|
186
186
|
}
|
|
187
187
|
}, {
|
|
188
188
|
level: 1000,
|
|
189
|
-
name: ['dobo.
|
|
189
|
+
name: ['dobo.adapter:beforeGetRecord', 'dobo.adapter:beforeRemoveRecord', 'dobo.adapter:beforeUpdateRecord'],
|
|
190
190
|
handler: async function (model, id, options) {
|
|
191
191
|
await this.applyQueryHook(model, id, options)
|
|
192
192
|
}
|
package/index.js
CHANGED
|
@@ -681,7 +681,7 @@ async function factory (pkgName) {
|
|
|
681
681
|
*/
|
|
682
682
|
_fetchGuards = async (type) => {
|
|
683
683
|
const { getModel } = this.app.dobo
|
|
684
|
-
const options = { noMagic: true, noCache: true,
|
|
684
|
+
const options = { noMagic: true, noCache: true, noAdapterHook: true, dataOnly: true }
|
|
685
685
|
const filter = { query: { status: 'ACTIVE' } }
|
|
686
686
|
const results = await getModel(`Sumba${type}Guard`).findAllRecord(filter, options)
|
|
687
687
|
return results.map(result => {
|
|
@@ -1360,7 +1360,7 @@ async function factory (pkgName) {
|
|
|
1360
1360
|
user = await getCache({ key })
|
|
1361
1361
|
if (user) return JSON.parse(user)
|
|
1362
1362
|
}
|
|
1363
|
-
user = await getModel('SumbaUser').getRecord(id, { noHook: true,
|
|
1363
|
+
user = await getModel('SumbaUser').getRecord(id, { noHook: true, noAdapterHook: true, throwNotFound: false, req })
|
|
1364
1364
|
if (!user) return
|
|
1365
1365
|
await this.mergeTeam(user, req)
|
|
1366
1366
|
if (setCache) {
|
|
@@ -1387,7 +1387,7 @@ async function factory (pkgName) {
|
|
|
1387
1387
|
user = await getCache({ key })
|
|
1388
1388
|
if (user) return JSON.parse(user)
|
|
1389
1389
|
}
|
|
1390
|
-
user = await getModel('SumbaUser').findOneRecord({ query: { token } }, { noHook: true,
|
|
1390
|
+
user = await getModel('SumbaUser').findOneRecord({ query: { token } }, { noHook: true, noAdapterHook: true, throwNotFound: false, req })
|
|
1391
1391
|
if (!user) return
|
|
1392
1392
|
await this.mergeTeam(user, req)
|
|
1393
1393
|
if (setCache) {
|
|
@@ -1404,7 +1404,7 @@ async function factory (pkgName) {
|
|
|
1404
1404
|
const bcrypt = await importPkg('bajoExtra:bcrypt')
|
|
1405
1405
|
|
|
1406
1406
|
const query = { username, provider: 'local', siteId: req.site.id + '' }
|
|
1407
|
-
const user = await model.findOneRecord({ query }, { req, forceNoHidden: true, noHook: true,
|
|
1407
|
+
const user = await model.findOneRecord({ query }, { req, forceNoHidden: true, noHook: true, noAdapterHook: true })
|
|
1408
1408
|
if (!user) throw this.error('validationError', { details: [{ field: 'username', error: 'Unknown username' }], statusCode: 401 })
|
|
1409
1409
|
if (user.status !== 'ACTIVE') throw this.error('validationError', { details: ['User is inactive or temporarily disabled'], statusCode: 401 })
|
|
1410
1410
|
const verified = await bcrypt.compare(password, user.password)
|
package/package.json
CHANGED