sumba 1.0.13 → 1.0.15

package/bajo/config.json

@@ -52,8 +52,9 @@
   },
   "redirect": {
     "signin": "sumba:/signin",
+    "afterSignin": "/",
     "signout": "sumba:/signout",
-    "home": "sumba:/"
+    "afterSignout": "/"
   },
   "userPassword": {
     "minUppercase": 1,

package/dobo/fixture/user.json

@@ -4,6 +4,11 @@
   "email": "admin@domain.com",
   "firstName": "Site",
   "lastName": "Admin",
+  "address1": "Address Line 1",
+  "address2": "Address Line 2",
+  "city": "City Name",
+  "zipCode": "12345",
+  "provinceState": "State",
   "country": "US",
   "siteId": "?:SumbaSite::alias:default",
   "status": "ACTIVE"

package/lib/check-site-id.js

@@ -1,21 +1,27 @@
 async function mergeSetting (req) {
-  const { trim } = this.app.bajo.lib._
+  const { defaultsDeep } = this.app.bajo
+  const { trim, get, filter } = this.app.bajo.lib._
   const { recordFind } = this.app.dobo
-  const setting = {}
+  const defSetting = {}
+  const nsSetting = {}
   const query = {
     ns: { $in: this.app.bajo.pluginNames },
     siteId: req.site.id
   }
-  const items = await recordFind('SumbaSiteSetting', { query, limit: 200 })
-  for (const item of items) {
-    setting[item.ns] = setting[item.ns] ?? {}
-    let value = trim([item.value] ?? '')
-    if (['[', '{'].includes(value[0])) value = JSON.parse(value)
-    else if (Number(value)) value = Number(value)
-    else if (['true', 'false'].includes(value)) value = value === 'true'
-    setting[item.ns][item.key] = value
+  const all = await recordFind('SumbaSiteSetting', { query, limit: -1 })
+  for (const ns of this.app.bajo.pluginNames) {
+    nsSetting[ns] = {}
+    defSetting[ns] = get(this, `app.${ns}.config.siteSetting`, {})
+    const items = filter(all, { ns })
+    for (const item of items) {
+      let value = trim([item.value] ?? '')
+      if (['[', '{'].includes(value[0])) value = JSON.parse(value)
+      else if (Number(value)) value = Number(value)
+      else if (['true', 'false'].includes(value)) value = value === 'true'
+      nsSetting[ns][item.key] = value
+    }
   }
-  req.site.setting = setting
+  req.site.setting = defaultsDeep({}, nsSetting, defSetting)
 }
 
 const omitted = ['status']

package/lib/check-user-id.js

@@ -24,7 +24,7 @@ async function checker (req, container) {
 }
 
 async function anonymous (req) {
-  const { pick } = this.app.bajo.lib._
+  const { omit } = this.app.bajo.lib._
   const { getUser } = this
   const { routePath } = this.app.waibu
 
@@ -36,7 +36,7 @@ async function anonymous (req) {
       req.session.ref = req.url
       throw this.error('redirect', { redirect: redir })
     }
-    req.user = pick(await getUser(req.session.user.id), ['id', 'username', 'email', 'firstName', 'lastName'])
+    req.user = omit(await getUser(req.session.user.id), ['password', 'token'])
   }
 }
 

package/package.json

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

package/waibuMpa/partial/list-item/member-links.html

@@ -1,7 +1,9 @@
 <% if (_meta.user) { %>
 <c:list-item href="sumba:/my-stuff/profile" t:content="Your Profile" />
 <c:list-item href="sumba:/my-stuff/change-password" t:content="Change Password" />
-<c:list-item href="sumba:/signout" t:content="Signout" />
+  <% if (attr.withSignout) { %>
+  <c:list-item href="sumba:/signout" t:content="Signout" />
+  <% } %>
 <% } else { %>
 <c:list-item href="sumba:/signin" t:content="Signin" />
 <c:list-item href="sumba:/user/signup" t:content="New User Signup" />

package/waibuMpa/partial/signin.html

@@ -0,0 +1,11 @@
+<c:form button reset-validation referer>
+  <c:form-input name="username" label-floating wrapper-margin="bottom-2" />
+  <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
+</c:form>
+<% if (!page.noLinks) { %>
+<c:list type="unstyled" margin="start-3">
+  <c:include resource="sumba.partial:/list-item/forgot-password.html" />
+  <c:include resource="sumba.partial:/list-item/user-signup.html" />
+  <c:include resource="sumba.partial:/list-item/goto-home.html" />
+</c:list>
+<% } %>

package/waibuMpa/partial/signout.html

@@ -0,0 +1,7 @@
+<c:p t:content="signoutWarning" />
+<c:form method="POST" action="sumba:/signout" referer>
+  <c:btn color="primary" t:content="Yes, sign me out now!" type="submit" />
+  <% if (!page.noLinks) { %>
+  <c:btn color="link" icon="house" t:content="Goto Home" href="/" />
+  <% } %>
+</c:form>

package/waibuMpa/route/signin.js

@@ -3,7 +3,7 @@ const signin = {
   handler: async function (req, reply) {
     const { getUserFromUsernamePassword } = this
     const { runHook } = this.app.bajo
-    const { isEmpty, pick } = this.app.bajo.lib._
+    const { isEmpty, omit } = this.app.bajo.lib._
     const { getSessionId } = this.app.waibuMpa
 
     let { username, password, referer } = req.body || {}
@@ -12,13 +12,13 @@ const signin = {
     let error
     if (req.method === 'POST') {
       try {
-        const user = pick(await getUserFromUsernamePassword(username, password, req), ['id', 'username', 'email', 'siteId'])
+        const user = omit(await getUserFromUsernamePassword(username, password, req), ['password', 'token'])
         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
+        const url = !isEmpty(referer) ? referer : this.config.redirect.afterSignin
         req.flash('notify', req.t('You\'ve successfully signed in!'))
         return reply.redirectTo(url, { query, params })
       } catch (err) {

package/waibuMpa/route/signout.js

@@ -2,7 +2,7 @@ const signout = {
   method: ['GET', 'POST'],
   handler: async function (req, reply) {
     const { runHook } = this.app.bajo
-    const { isEmpty } = this.app.bajo.lib._
+    // const { isEmpty } = this.app.bajo.lib._
     const { getSessionId } = this.app.waibuMpa
 
     let { referer } = req.body || {}
@@ -15,7 +15,8 @@ const signout = {
       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
+      // const url = !isEmpty(referer) ? referer : this.config.redirect.home
+      const url = this.config.redirect.afterSignout
       req.flash('notify', req.t('You\'ve successfully signed out!'))
       return reply.redirectTo(url, { query, params })
     }

package/waibuMpa/template/signin.html

@@ -1,14 +1,3 @@
 ---
 t:title: Signin
 ---
-<c:form button reset-validation referer>
-  <c:form-input name="username" label-floating wrapper-margin="bottom-2" />
-  <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
-</c:form>
-<% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
-  <c:include resource="sumba.partial:/list-item/forgot-password.html" />
-  <c:include resource="sumba.partial:/list-item/user-signup.html" />
-  <c:include resource="sumba.partial:/list-item/goto-home.html" />
-</c:list>
-<% } %>

package/waibuMpa/template/signout.html

@@ -1,10 +1,3 @@
 ---
 t:title: Signout
 ---
-<c:p t:content="signoutWarning" />
-<c:form method="POST" action="sumba:/signout" referer>
-  <c:btn color="primary" t:content="Yes, sign me out now!" type="submit" />
-  <% if (!page.noLinks) { %>
-  <c:btn color="link" icon="house" t:content="Goto Home" href="/" />
-  <% } %>
-</c:form>