sumba 1.0.12 → 1.0.13

package/bajo/hook/dobo@before-record-count.js

@@ -0,0 +1,8 @@
+import { handler } from './dobo@before-record-find.js'
+
+const doboBeforeRecordCount = {
+  level: 1000,
+  handler
+}
+
+export default doboBeforeRecordCount

package/package.json

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

package/waibuMpa/route/signin.js

@@ -2,7 +2,9 @@ const signin = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { getUserFromUsernamePassword } = this
+    const { runHook } = this.app.bajo
     const { isEmpty, pick } = this.app.bajo.lib._
+    const { getSessionId } = this.app.waibuMpa
 
     let { username, password, referer } = req.body || {}
     if (req.session.ref) referer = req.session.ref
@@ -11,8 +13,10 @@ const signin = {
     if (req.method === 'POST') {
       try {
         const user = pick(await getUserFromUsernamePassword(username, password, req), ['id', 'username', 'email', 'siteId'])
-        if (this.bajoEmitter) await this.app.bajoEmitter.emit('sumba.signin', user)
         req.session.user = user
+        const sid = await getSessionId(req.headers.cookie)
+        if (this.bajoEmitter) await this.app.bajoEmitter.emit(`${this.name}.signin`, user, sid)
+        await runHook(`${this.name}:afterSignin`, user, sid, req)
         const { query, params } = req
         const url = !isEmpty(referer) ? referer : this.config.redirect.home
         req.flash('notify', req.t('You\'ve successfully signed in!'))

package/waibuMpa/route/signout.js

@@ -1,13 +1,19 @@
 const signout = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
+    const { runHook } = this.app.bajo
     const { isEmpty } = this.app.bajo.lib._
+    const { getSessionId } = this.app.waibuMpa
 
     let { referer } = req.body || {}
     if (req.session.ref) referer = req.session.ref
     req.session.ref = null
     if (req.method === 'POST') {
+      const sid = await getSessionId(req.headers.cookie)
+      const user = req.session.user
       req.session.user = null
+      if (this.bajoEmitter) await this.app.bajoEmitter.emit(`${this.name}.sigout`, user, sid)
+      await runHook(`${this.name}:afterSignout`, user, sid, req)
       const { query, params } = req
       const url = !isEmpty(referer) ? referer : this.config.redirect.home
       req.flash('notify', req.t('You\'ve successfully signed out!'))