sumba 1.1.12 → 1.1.13

package/bajo/hook/waibu-mpa.sumba@after-build-locals.js

@@ -2,8 +2,8 @@ async function afterBuildLocals (locals, req) {
   const { routePath } = this.app.waibu
   const items = []
   if (req.user) {
-    items.push({ icon: 'person', 't:tooltip': 'yourProfile', href: routePath('sumba:/my-stuff/profile') })
-    items.push({ icon: 'key', 't:tooltip': 'changePassword', href: routePath('sumba:/my-stuff/change-password') })
+    items.push({ icon: 'person', 't:tooltip': 'yourProfile', href: routePath('sumba:/your-stuff/profile') })
+    items.push({ icon: 'key', 't:tooltip': 'changePassword', href: routePath('sumba:/your-stuff/change-password') })
     items.push({ component: 'navItemSignout', 't:tooltip': 'signout', bottom: true })
   } else {
     items.push({ icon: 'signin', 't:tooltip': 'signin', href: routePath('sumba:/signin') })

package/bajo/hook/waibu@on-request.js

@@ -1,9 +1,8 @@
-import checkSiteId from '../../lib/check-site-id.js'
-
 const onRequest = {
   level: 10,
   handler: async function (req, reply) {
-    await checkSiteId.call(this, req, reply)
+    const hostname = req.hostname.split(':')[0]
+    req.site = await this.getSite(hostname)
   }
 }
 

package/bajo/intl/en-US.json

@@ -50,9 +50,9 @@
   "personInCharge": "Person In Charge",
   "contactForm": "Contact Form",
   "terms": "Terms",
-  "cookie": "Cookie Policy",
+  "cookie": "Cookie",
   "cookiePolicy": "Cookie Policy",
-  "privacy": "Privacy Statement",
+  "privacy": "Privacy",
   "termsConditions": "Terms and Conditions",
   "privacyStatement": "Privacy Statement",
   "legalInfo": "Legal Info",
@@ -88,6 +88,8 @@
   "catMisc": "Misc",
   "catTechnical": "Technical Problem",
   "activation": "Activation",
+  "addTroubleTickets": "Create New Ticket",
+  "ourAddress": "Our Address",
   "field": {
     "currentPassword": "Current Password",
     "newPassword": "New Password",

package/bajo/intl/id.json

@@ -89,6 +89,8 @@
   "catMisc": "Lain-lain",
   "catTechnical": "Masalah Teknis",
   "activation": "Aktivasi",
+  "addTroubleTickets": "Buat Ticket Baru",
+  "ourAddress": "Alamat Kami",
   "field": {
     "currentPassword": "Kata Sandi Saat Ini",
     "newPassword": "Kata Sandi Baru",

package/bajoTemplate/layout/centered.html

@@ -0,0 +1,15 @@
+<c:page-start />
+<c:container>
+  <c:div flex="align-items:center justify-content:center" dim="height:viewport">
+    <c:grid-row dim="width:100">
+      <c:grid-col col="4-lg 3-md"></c:grid-col>
+      <c:grid-col col="4-lg 6-md">
+        <c:app-launcher trigger />
+        <c:heading margin="bottom-4" text="align:center" type="3-display" content="<%= page.title %>" />
+        <!-- body -->
+        <!-- include sumba.partial:/layout/footer.html -->
+      </c:grid-col>
+      <c:grid-col col="4-lg 3-md"></c:grid-col>
+    </c:grid-row>
+</c:container>
+<c:page-end />

package/bajoTemplate/layout/default.html

@@ -1,14 +1,15 @@
 <c:page-start />
-<c:container flex="align-items:center" dim="height:viewport">
-  <c:grid-row dim="width:100">
-    <c:grid-col col="4-md"></c:grid-col>
-    <c:grid-col col="4-md">
-      <c:app-launcher trigger />
-      <c:heading margin="bottom-4" text="align:center" type="3-display" content="<%= page.title %>" />
-      <!-- body -->
-      <!-- include sumba.partial:/layout/footer.html -->
-    </c:grid-col>
-    <c:grid-col col="4-md"></c:grid-col>
-  </c:grid-row>
-</c:container>
-<c:page-end />
+<c:main flex>
+  <!-- include sumba.partial:/layout/sidebar.html -->
+  <c:div flex="fill column">
+    <!-- include sumba.partial:/layout/navbar.html -->
+    <!-- include sumba.partial:/layout/breadcrumb.html -->
+    <c:container margin="start-0 bottom-5" padding="x-3">
+      <c:div style="max-width: 992px;">
+        <!-- body -->
+        <!-- include sumba.partial:/layout/footer.html -->
+      </c:div>
+    </c:container>
+  </c:div>
+</c:main>
+<c:page-end back-to-top/>

package/bajoTemplate/partial/api-key-modal.html

@@ -2,7 +2,7 @@
   <c:modal-body>
     <pre><code id="api-key"><%= form.token %></code></pre>
     <c:div flex="justify-content:between align-items:center" margin="top-3">
-      <c:a icon="arrowsRepeat" href="sumba:/my-stuff/reset-api-key" t:content="reset" />
+      <c:a icon="arrowsRepeat" href="sumba:/your-stuff/reset-api-key" t:content="reset" />
       <div>
         <c:btn color="primary" x-data @click="await wbs.copyToClipboard('#api-key', true)" t:content="copyClipboard" />
         <c:btn margin="start-1" color="secondary" dismiss t:content="close" />

package/bajoTemplate/partial/help/contact-form/form.html

@@ -1,12 +1,20 @@
-<c:form button reset-validation referer grid-gutter="2">
-  <c:form-input name="firstName" col="6-lg" label-floating <%= _meta.user ? 'readonly' : '' %> />
-  <c:form-input name="lastName" col="6-lg" label-floating <%= _meta.user ? 'readonly' : '' %> />
-  <c:form-input type="email" col="6-lg" name="email" label-floating <%= _meta.user ? 'readonly' : '' %> />
-  <c:form-select name="cat" col="6-lg" label-floating>
-    <% for (const cat of cats) { %>
-    <c:option value="<%= cat.name %>" t:content="<%= _.camelCase('cat ' + cat.name) %>" />
-    <% } %>
-  </c:form-select>
-  <c:form-input name="subject" label-floating />
-  <c:form-textarea name="message" label-floating style="height:10em"/>
-</c:form>
+<c:grid-row>
+  <c:grid-col col="8-md">
+    <c:form button reset-validation referer grid-gutter="2">
+      <c:form-input name="firstName" col="6-lg" label-floating <%= _meta.user ? 'readonly' : '' %> />
+      <c:form-input name="lastName" col="6-lg" label-floating <%= _meta.user ? 'readonly' : '' %> />
+      <c:form-input type="email" col="6-lg" name="email" label-floating <%= _meta.user ? 'readonly' : '' %> />
+      <c:form-select name="cat" col="6-lg" label-floating>
+        <% for (const cat of cats) { %>
+        <c:option value="<%= cat.name %>" t:content="<%= _.camelCase('cat ' + cat.name) %>" />
+        <% } %>
+      </c:form-select>
+      <c:form-input name="subject" label-floating />
+      <c:form-textarea name="message" label-floating style="height:10em"/>
+    </c:form>
+  </c:grid-col>
+  <c:grid-col col="4-md">
+    <c:heading t:content="ourAddress" type="6-display" />
+    <!-- include waibuMpa.partial:/address.html -->
+  </c:grid-col>
+</c:grid-row>

package/bajoTemplate/partial/layout/footer.html

@@ -1,17 +1,16 @@
 <c:footer margin="top-5">
+  <c:div id="footer">test</c:div>
   <small>
-    <c:nav flex="justify-content:center">
-      <c:nav-item href="/" icon-end="house"/>
-      <c:nav-item t:content="cookie" href="sumba:/info/cookie-policy"/>
-      <c:nav-item t:content="privacy" href="sumba:/info/privacy"/>
-      <c:nav-item t:content="terms" href="sumba:/info/terms-conditions"/>
-    </c:nav>
+    <c:nav flex="justify-content:center"  tag="ul">
     <% if (!(_meta.routeOpts.pathSrc.startsWith('/my-profile') || _meta.routeOpts.pathSrc.startsWith('/info') ||
     _meta.routeOpts.pathSrc.startsWith('/help'))) { %>
-    <c:nav flex="justify-content:center">
-      <c:nav-dropdown-darkmode />
-      <c:nav-dropdown-language />
-    </c:nav>
+      <c:nav-dropdown-darkmode padding="x-2"/>
+      <c:nav-dropdown-language padding="x-2"/>
+      <c:nav-divider />
     <% } %>
+      <c:nav-item t:content="cookie" href="sumba:/info/cookie-policy" padding="x-1"/>
+      <c:nav-item t:content="privacy" href="sumba:/info/privacy" padding="x-1"/>
+      <c:nav-item t:content="terms" href="sumba:/info/terms-conditions" padding="x-2"/>
+    </c:nav>
   </small>
 </c:footer>

package/bajoTemplate/partial/list-item/change-password.html

@@ -1 +1 @@
-<c:list-item t:content="Change Password" href="sumba:/my-stuff/change-password" icon="key"/>
+<c:nav-item t:content="changePassword" href="sumba:/your-stuff/change-password"/>

package/bajoTemplate/partial/list-item/forgot-password.html

@@ -1 +1 @@
-<c:list-item t:content="Forgot Password" href="sumba:/user/forgot-password" icon="key"/>
+<c:nav-item t:content="forgotPassword" href="sumba:/user/forgot-password"/>

package/bajoTemplate/partial/list-item/goto-home.html

@@ -1 +1 @@
-<c:list-item href="/" t:content="Goto Home" icon="house" />
+<c:nav-item href="/" t:content="gotoHome" />

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

@@ -1,14 +1,14 @@
 <% if (_meta.user) { %>
-<c:list-item href="sumba:/my-stuff/profile" t:content="yourProfile" />
-<c:list-item href="sumba:/my-stuff/change-password" t:content="changePassword" />
+<c:nav-item href="sumba:/your-stuff/profile" t:content="yourProfile" />
+<c:nav-item href="sumba:/your-stuff/change-password" t:content="changePassword" />
   <% if (attr.withSignout) { %>
-  <c:list-item href="sumba:/signout" t:content="signout" />
+  <c:nav-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="signup" />
-<c:list-item href="sumba:/user/forgot-password" t:content="forgotPassword" />
+<c:nav-item href="sumba:/signin" t:content="signin" />
+<c:nav-item href="sumba:/user/signup" t:content="signup" />
+<c:nav-item href="sumba:/user/forgot-password" t:content="forgotPassword" />
   <% if (_hasPlugin('masohi') && _hasPlugin('masohiMail')) { %>
-  <c:list-item href="sumba:/user/activation" t:content="userActivation" />
+  <c:nav-item href="sumba:/user/activation" t:content="userActivation" />
   <% } %>
 <% } %>

package/bajoTemplate/partial/list-item/signin.html

@@ -1 +1 @@
-<c:list-item t:content="Signin" href="sumba:/signin" icon="signin"/>
+<c:nav-item t:content="signin" href="sumba:/signin" />

package/bajoTemplate/partial/list-item/signout.html

@@ -1 +1 @@
-<c:list-item t:content="Signout" href="sumba:/signout" icon="signout"/>
+<c:nav-item t:content="signout" href="sumba:/signout" />

package/bajoTemplate/partial/list-item/user-signup.html

@@ -1 +1 @@
-<c:list-item t:content="New User Signup" href="sumba:/user/signup" icon="personAdd"/>
+<c:nav-item t:content="newUserSignup" href="sumba:/user/signup" />

package/bajoTemplate/partial/list-item/your-profile.html

@@ -1 +1 @@
-<c:list-item t:content="yourProfile" href="sumba:/my-stuff/profile" icon="person"/>
+<c:nav-item t:content="yourProfile" href="sumba:/your-stuff/profile" />

package/bajoTemplate/partial/signin.html

@@ -3,9 +3,11 @@
   <c:form-password name="password" label-floating wrapper-margin="bottom-3" />
 </c:form>
 <% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
-  <!-- include sumba.partial:/list-item/forgot-password.html -->
-  <!-- include sumba.partial:/list-item/user-signup.html -->
-  <!-- include sumba.partial:/list-item/goto-home.html -->
-</c:list>
+<c:div move-to="#footer" flex="justify-content:center">
+  <c:nav type="inline">
+    <!-- include sumba.partial:/list-item/forgot-password.html -->
+    <!-- include sumba.partial:/list-item/user-signup.html -->
+    <!-- include sumba.partial:/list-item/goto-home.html -->
+  </c:nav>
+</c:div>
 <% } %>

package/bajoTemplate/partial/signout.html

@@ -1,7 +1,11 @@
 <c:p t:content="signoutWarning" />
 <c:form method="POST" action="sumba:/signout" referer>
   <c:btn color="primary" t:content="signoutNow" type="submit" />
-  <% if (!page.noLinks) { %>
-  <c:btn color="link" icon="house" t:content="gotoHome" href="/" />
-  <% } %>
 </c:form>
+<% if (!page.noLinks) { %>
+<c:div move-to="#footer" flex="justify-content:center">
+  <c:nav type="inline">
+    <!-- include sumba.partial:/list-item/goto-home.html -->
+  </c:nav>
+</c:div>
+<% } %>

package/bajoTemplate/partial/user/activation.html

@@ -2,9 +2,11 @@
   <c:form-input name="key" label-floating />
 </c:form>
 <% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
+<c:div move-to="#footer" flex="justify-content:center">
+  <c:nav type="inline">
   <!-- include sumba.partial:/list-item/signin.html -->
   <!-- include sumba.partial:/list-item/forgot-password.html -->
   <!-- include sumba.partial:/list-item/goto-home.html -->
-</c:list>
+  </c:nav>
+</c:div>
 <% } %>

package/bajoTemplate/partial/user/forgot-password.html

@@ -6,9 +6,11 @@
 <!-- include sumba.partial:/user/forgot-password-nomail.md -->
 <% } %>
 <% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
+<c:div move-to="#footer" flex="justify-content:center">
+  <c:nav type="inline">
   <!-- include sumba.partial:/list-item/signin.html -->
   <!-- include sumba.partial:/list-item/user-signup.html -->
   <!-- include sumba.partial:/list-item/goto-home.html -->
-</c:list>
+  </c:nav>
+</c:div>
 <% } %>

package/bajoTemplate/partial/user/signup/form.html

@@ -8,9 +8,11 @@
   <c:form-check name="agree" col="12" value="true" t:label="agreeToTerm%s%s|<%= _routePath('sumba:/info/terms-conditions') %>|termsConditions" />
 </c:form>
 <% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
+<c:div move-to="#footer" flex="justify-content:center">
+  <c:nav type="inline">
   <!-- include sumba.partial:/list-item/forgot-password.html -->
   <!-- include sumba.partial:/list-item/signin.html -->
   <!-- include sumba.partial:/list-item/goto-home.html -->
-</c:list>
+  </c:nav>
+</c:div>
 <% } %>

package/bajoTemplate/partial/user/signup/success.html

@@ -4,7 +4,9 @@
 <!-- include sumba.partial:/user/signup/success-nomail.md -->
 <% } %>
 <% if (!page.noLinks) { %>
-<c:list type="unstyled" margin="start-3">
-  <c:list-item t:content="gotoHome" href="/" icon="house"/>
-</c:list>
+<c:div move-to="#footer" flex="justify-content:center">
+  <c:nav type="inline">
+    <c:nav-item t:content="gotoHome" href="/" icon="house"/>
+  </c:nav>
+</c:div>
 <% } %>

package/bajoTemplate/partial/{my-stuff → your-stuff}/change-password.html

@@ -1,12 +1,12 @@
 <c:grid-row>
-  <c:grid-col col="6-md">
+  <c:grid-col col="5-md">
     <c:form button reset-validation referer>
       <c:form-password name="currentPassword" label-floating wrapper-margin="bottom-2" />
       <c:form-password name="newPassword" label-floating wrapper-margin="bottom-2" />
       <c:form-password name="verifyNewPassword" label-floating wrapper-margin="bottom-3" />
     </c:form>
   </c:grid-col>
-  <c:grid-col col="6-md">
+  <c:grid-col col="7-md">
 
   </c:grid-col>
 </c:grid-row>

package/bajoTemplate/partial/{my-stuff → your-stuff}/profile/edit.html

@@ -40,11 +40,11 @@
       <hr />
       <c:heading type="5" t:content="more" margin="top-3" />
       <c:list type="group" hover>
-        <c:list-item href="sumba:/my-stuff/change-password" t:content="changePassword" />
+        <c:list-item href="sumba:/your-stuff/change-password" t:content="changePassword" />
         <c:list-item t:content="displayApiKey" target="api-key-modal"/>
       </c:list>
       <c:list type="unstyled" margin="top-3">
-        <c:list-item href="sumba:/my-stuff/profile" t:content="backToProfile" icon="arrowStart" />
+        <c:list-item href="sumba:/your-stuff/profile" t:content="backToProfile" icon="arrowStart" />
       </c:list>
       <!-- include sumba.partial:/api-key-modal.html -->
     </c:grid-col>

package/bajoTemplate/partial/{my-stuff → your-stuff}/profile/view.html

@@ -28,7 +28,7 @@
     </c:div>
     <c:heading type="5" t:content="more" margin="top-3" />
     <c:list type="group" hover>
-      <c:list-item href="sumba:/my-stuff/profile/edit" t:content="updateProfile" />
+      <c:list-item href="sumba:/your-stuff/profile/edit" t:content="updateProfile" />
       <c:list-item t:content="displayApiKey" target="api-key-modal"/>
     </c:list>
     <!-- include sumba.partial:/api-key-modal.html -->

package/bajoTemplate/template/help/contact-form/form.html

@@ -1,4 +1,3 @@
 ---
 t:title: contactForm
-layout: sumba.layout:/wide.html
 ---

package/bajoTemplate/template/help/contact-form/success.html

@@ -1,4 +1,3 @@
 ---
 t:title: contactForm
-layout: sumba.layout:/wide.html
 ---

package/bajoTemplate/template/help/trouble-tickets/add.html

@@ -1,4 +1,3 @@
 ---
 t:title: addTroubleTickets
-layout: sumba.layout:/wide.html
 ---

package/bajoTemplate/template/help/trouble-tickets/details.html

@@ -1,4 +1,3 @@
 ---
 t:title: troubleTicketsDetails
-layout: sumba.layout:/wide.html
 ---

package/bajoTemplate/template/help/trouble-tickets/list.html

@@ -1,4 +1,3 @@
 ---
 t:title: troubleTickets
-layout: sumba.layout:/wide.html
 ---

package/bajoTemplate/template/signin.html

@@ -1,3 +1,4 @@
 ---
 t:title: signin
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/signout.html

@@ -1,3 +1,4 @@
 ---
 t:title: signout
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/user/activation.html

@@ -1,3 +1,4 @@
 ---
 t:title: userActivation
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/user/forgot-password.html

@@ -1,3 +1,4 @@
 ---
 t:title: forgotPassword
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/user/fpl-invalid.html

@@ -1,3 +1,4 @@
 ---
 t:title: forgotPassword
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/user/fpl.html

@@ -1,3 +1,4 @@
 ---
 t:title: forgotPassword
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/user/signup/form.html

@@ -1,3 +1,4 @@
 ---
 t:title: newUserSignup
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/user/signup/success.html

@@ -1,3 +1,4 @@
 ---
 t:title: newUserSignup
+layout: sumba.layout:/centered.html
 ---

package/bajoTemplate/template/your-stuff/change-password.html

@@ -0,0 +1,3 @@
+---
+t:title: changePassword
+---

package/bajoTemplate/template/your-stuff/profile/edit.html

@@ -0,0 +1,3 @@
+---
+t:title: editYourProfile
+---

package/bajoTemplate/template/your-stuff/profile/view.html

@@ -0,0 +1,3 @@
+---
+t:title: yourProfile
+---

package/bajoTemplate/template/your-stuff/reset-api-key.html

@@ -0,0 +1,3 @@
+---
+t:title: resetApiKey
+---

package/lib/check-iconset.js

@@ -3,7 +3,7 @@ async function checkIconset (req, reply) {
   const mpa = this.app.waibuMpa
 
   if (!req.site) return
-  if (mpa.iconsets.length === 1) req.iconset = mpa.iconsets[0]
+  if (mpa.iconsets.length === 1) req.iconset = mpa.iconsets[0].name
   else {
     const siteIconset = get(req, 'site.setting.waibuMpa.iconset')
     req.iconset = get(mpa, 'config.iconset.default', siteIconset)

package/lib/check-team.js

@@ -1,22 +1,9 @@
 import { pathsToCheck } from './check-user-id.js'
 
-async function mergeTeam (req) {
-  const { map, pick } = this.lib._
-  const { recordFindAll } = this.app.dobo
-  req.user.teams = []
-  const query = { userId: req.user.id, siteId: req.site.id }
-  const userTeam = await recordFindAll('SumbaTeamUser', { query })
-  if (userTeam.length === 0) return
-  delete query.userId
-  query.id = { $in: map(userTeam, 'id'), status: 'ENABLED' }
-  const team = await recordFindAll('SumbaTeam', { query })
-  if (team.length > 0) req.user.teams.push(...map(team, t => pick(t, ['id', 'alias'])))
-}
-
 async function checkTeam (req, reply, source) {
   if (!req.user) return
   const { map } = this.lib._
-  await mergeTeam.call(this, req)
+  await this.mergeTeam(req.user, req.site)
   const paths = pathsToCheck.call(this, req, true)
   const teams = map(req.user.teams, 'alias')
   const match = this.checkPathsByTeam({ paths, method: req.method, teams, guards: this.teamRoutes })

package/lib/check-theme.js

@@ -3,11 +3,11 @@ async function checkTheme (req, reply) {
   const mpa = this.app.waibuMpa
 
   if (!req.site) return
-  if (mpa.themes.length === 1) req.theme = mpa.themes[0]
+  if (mpa.themes.length === 1) req.theme = mpa.themes[0].name
   else {
     const siteTheme = get(req, 'site.setting.waibuMpa.theme')
     req.theme = get(mpa, 'config.theme.set', siteTheme)
-    req.theme = req.theme ?? mpa.themes[0]
+    req.theme = req.theme ?? mpa.themes[0].name
   }
 }
 

package/lib/check-user-id.js

@@ -13,24 +13,22 @@ export function pathsToCheck (req, withHome) {
 
 async function setUser (req) {
   const { get } = this.lib._
-  const id = get(req, 'session.user.id')
+  const id = get(req, 'session.userId')
   if (!id) return
   try {
     const user = await this.getUser(id)
     if (user) req.user = user
-    else req.session.user = null
+    else req.session.userId = null
   } catch (err) {
-    req.session.user = null
+    req.session.userId = null
   }
 }
 
-async function mergeSetting (req) {
-  req.user.setting = {}
-}
-
 async function checkUserId (req, reply, source) {
   const { merge, isEmpty, camelCase, get } = this.lib._
   const { routePath } = this.app.waibu
+  const userId = get(req, 'session.userId')
+  if (req.session) req.session.siteId = req.site.id
 
   const webApp = get(req, 'routeOptions.config.webApp', 'waibu')
   if (!req.routeOptions.url) {
@@ -51,17 +49,16 @@ async function checkUserId (req, reply, source) {
     if (neg) anonymousPath = undefined
   }
   if (!securePath && !anonymousPath) {
-    if (req.session && req.session.user) await setUser.call(this, req)
+    if (userId) await setUser.call(this, req)
     return
   }
   if (anonymousPath) {
-    if (!req.session) return // can't check, so don't care
-    if (!req.session.user) return // not authenticated, why bother
+    if (!userId) return
     req.session.ref = req.url
     return reply.redirectTo(routePath(this.config.redirect.signout))
   }
   if (securePath) {
-    if (req.session && req.session.user) {
+    if (userId) {
       await setUser.call(this, req)
       return
     }
@@ -80,7 +77,6 @@ async function checkUserId (req, reply, source) {
       }
     }
     if (!success) throw this.error('accessDeniedNoAuth', merge({ statusCode: 403 }, payload))
-    await mergeSetting.call(this, req)
   }
 }
 

package/masohiSocketIo/middleware/server/auth.js

@@ -0,0 +1,25 @@
+const auth = {
+  level: 5,
+  handler: async function (socket) {
+    const { camelCase } = this.lib._
+    const { req } = socket
+    const { session } = req
+    const site = await this.getSite(session.siteId)
+    socket.join(camelCase(`site ${site.alias}`))
+    let user
+    if (session.userId) {
+      user = await this.getUser(session.userId)
+      if (user) {
+        socket.join(camelCase(`user ${user.username}`))
+        await this.mergeTeam(user, site)
+        for (const team of user.teams) {
+          socket.join(camelCase(`team ${team.alias}`))
+        }
+      }
+    }
+    socket.req.site = site
+    socket.req.user = user
+  }
+}
+
+export default auth

package/package.json

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

package/plugin/factory.js

@@ -28,7 +28,7 @@ async function factory (pkgName) {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'sumba'
-      this.dependencies = ['bajo-extra', 'bajo-common-db']
+      this.dependencies = ['bajo-extra', 'bajo-common-db', 'bajo-config']
       this.config = {
         multiSite: false,
         waibu: {
@@ -36,17 +36,45 @@ async function factory (pkgName) {
           prefix: 'site'
         },
         waibuMpa: {
-          home: 'sumba:/my-stuff/profile',
+          home: 'sumba:/your-stuff/profile',
           icon: 'globe',
           redirect: {
-            '/': 'sumba:/my-stuff/profile',
-            '/my-stuff': 'sumba:/my-stuff/profile',
+            '/': 'sumba:/your-stuff/profile',
+            '/your-stuff': 'sumba:/your-stuff/profile',
             '/info': 'sumba:/info/about-us',
-            '/user': 'sumba:/my-stuff/profile',
+            '/user': 'sumba:/your-stuff/profile',
             '/db/export': 'sumba:/db/export/list',
             '/help': 'sumba:/help/contact-form',
             '/help/trouble-tickets': 'sumba:/help/trouble-tickets/list'
-          }
+          },
+          pages: [{
+            title: 'account',
+            level: 80,
+            children: [
+              // anonymous only
+              { title: 'signin', href: 'sumba:/signin', visible: 'anon' },
+              { title: 'forgotPassword', href: 'sumba:/forgot-password', visible: 'anon' },
+              { title: 'newUserSignup', href: 'sumba:/user/signup', visible: 'anon' },
+              { title: '-', visible: 'anon' },
+              { title: 'activation', href: 'sumba:/user/activation', visible: 'anon' },
+              // authenticated only
+              { title: 'yourProfile', href: 'sumba:/your-stuff/profile', visible: 'auth' },
+              { title: 'changePassword', href: 'sumba:/your-stuff/change-password', visible: 'auth' },
+              { title: '-', visible: 'auth' },
+              { title: 'signout', href: 'sumba:/signout', visible: 'auth' }
+            ]
+          }, {
+            title: 'help',
+            level: 90,
+            children: [
+              { title: 'contactForm', href: 'sumba:/help/contact-form' },
+              { title: 'troubleTickets', href: 'sumba:/help/trouble-tickets' },
+              { title: '-', visible: 'auth' },
+              { title: 'cookiePolicy', href: 'sumba:/info/cookie-policy' },
+              { title: 'privacy', href: 'sumba:/info/privacy' },
+              { title: 'termsConditions', href: 'sumba:/info/terms-conditions' }
+            ]
+          }]
         },
         waibuAdmin: {
           modelDisabled: 'all'
@@ -126,13 +154,26 @@ async function factory (pkgName) {
     getUser = async (rec, safe = true) => {
       const { recordGet } = this.app.dobo
       const { omit, isPlainObject } = this.lib._
-
       let user
       if (isPlainObject(rec)) user = rec
       else user = await recordGet('SumbaUser', rec, { noHook: true })
       return safe ? omit(user, this.unsafeUserFields) : user
     }
 
+    mergeTeam = async (user, site) => {
+      if (!user) return
+      const { map, pick } = this.lib._
+      const { recordFindAll } = this.app.dobo
+      user.teams = []
+      const query = { userId: user.id, siteId: site.id }
+      const userTeam = await recordFindAll('SumbaTeamUser', { query })
+      if (userTeam.length === 0) return
+      delete query.userId
+      query.id = { $in: map(userTeam, 'id'), status: 'ENABLED' }
+      const team = await recordFindAll('SumbaTeam', { query })
+      if (team.length > 0) user.teams.push(...map(team, t => pick(t, ['id', 'alias'])))
+    }
+
     getUserFromUsernamePassword = async (username = '', password = '', req) => {
       const { importPkg } = this.app.bajo
       const { recordFind, validate } = this.app.dobo
@@ -174,8 +215,8 @@ async function factory (pkgName) {
       const { routePath } = this.app.waibu
 
       if (!req.session) return false
-      if (req.session.user) {
-        req.user = await getUser(req.session.user.id)
+      if (req.session.userId) {
+        req.user = await getUser(req.session.userId)
         return true
       }
       const redir = routePath(this.config.redirect.signin, req)
@@ -312,6 +353,68 @@ async function factory (pkgName) {
       }
       return guarded
     }
+
+    getSite = async (hostname, useId) => {
+      const { omit } = this.lib._
+      const { recordFind } = this.app.dobo
+      const omitted = ['status']
+
+      const mergeSetting = async (site) => {
+        const { defaultsDeep, parseObject } = this.app.bajo
+        const { trim, get, filter } = this.lib._
+        const { recordFind, recordGet } = this.app.dobo
+        const defSetting = {}
+        const nsSetting = {}
+        const query = {
+          ns: { $in: this.app.bajo.pluginNames },
+          siteId: site.id
+        }
+        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
+          }
+        }
+        site.setting = parseObject(defaultsDeep({}, nsSetting, defSetting))
+        // additional fields
+        const country = await recordGet('CdbCountry', site.country, { noHook: true })
+        site.countryName = (country ?? {}).name ?? site.country
+      }
+
+      let site = {}
+
+      if (!this.config.multiSite) {
+        const resp = await recordFind('SumbaSite', { query: { alias: 'default' } }, { noHook: true })
+        site = omit(resp[0], omitted)
+        await mergeSetting(site)
+        return site
+      }
+      let query
+      if (useId) query = { id: hostname }
+      else {
+        query = {
+          $or: [
+            { hostname },
+            { alias: hostname }
+          ]
+        }
+      }
+      const filter = { query, limit: 1 }
+      const rows = await recordFind('SumbaSite', filter, { noHook: true })
+      if (rows.length === 0) throw this.error('unknownSite')
+      const row = omit(rows[0], omitted)
+      if (row.status !== 'ACTIVE') throw this.error('siteInactiveInfo')
+      site = row
+      await mergeSetting(site)
+      return site
+    }
   }
 }
 

package/sumba/route/secure.json

@@ -1,11 +1,11 @@
 [
-  "/my-stuff/**/*",
+  "/your-stuff/**/*",
   "/signout",
   "/help/trouble-tickets/**/*",
 {
   "path": "/user/api-key",
   "routeHandler": "restapi"
 }, {
-  "path": "/my-stuff/**/*",
+  "path": "/your-stuff/**/*",
   "routeHandler": "restapi"
 }]

package/waibuMpa/route/signin.js

@@ -13,7 +13,7 @@ const signin = {
     if (req.method === 'POST') {
       try {
         const user = omit(await getUserFromUsernamePassword(username, password, req), ['password', 'token'])
-        req.session.user = user
+        req.session.userId = user.id
         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)

package/waibuMpa/route/signout.js

@@ -10,10 +10,8 @@ const signout = {
     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}.signout`, user, sid)
-      await runHook(`${this.name}:afterSignout`, user, sid, req)
+      req.session.userId = null
+      await runHook(`${this.name}:afterSignout`, sid, req)
       const { query, params } = req
       // const url = !isEmpty(referer) ? referer : this.config.redirect.home
       const url = this.config.redirect.afterSignout

package/waibuMpa/route/{my-stuff → your-stuff}/change-password.js

@@ -35,7 +35,7 @@ const profile = {
         error = err
       }
     }
-    return reply.view('sumba.template:/my-stuff/change-password.html', { form, error })
+    return reply.view('sumba.template:/your-stuff/change-password.html', { form, error })
   }
 }
 

package/waibuMpa/route/{my-stuff → your-stuff}/profile/edit.js

@@ -17,12 +17,12 @@ const profile = {
         const resp = await recordUpdate({ req, reply, model: 'SumbaUser', id: req.user.id, body, options })
         form = resp.data
         req.flash('notify', req.t('profileUpdated'))
-        return reply.redirectTo('sumba:/my-stuff/profile')
+        return reply.redirectTo('sumba:/your-stuff/profile')
       } catch (err) {
         error = err
       }
     }
-    return reply.view('sumba.template:/my-stuff/profile/edit.html', { form, error })
+    return reply.view('sumba.template:/your-stuff/profile/edit.html', { form, error })
   }
 }
 

package/waibuMpa/route/{my-stuff → your-stuff}/profile.js

@@ -7,7 +7,7 @@ const profile = {
     const resp = await recordGet({ model: 'SumbaUser', req, id: req.user.id, options })
     const form = resp.data
     form.token = await hash(form.salt)
-    return reply.view('sumba.template:/my-stuff/profile/view.html', { form })
+    return reply.view('sumba.template:/your-stuff/profile/view.html', { form })
   }
 }
 

package/waibuMpa/route/{my-stuff → your-stuff}/reset-api-key.js

@@ -27,12 +27,12 @@ const resetApiKey = {
         await recordUpdate(model, req.user.id, { salt: generateId() }, { req, reply, noFlash: true })
         await delay(2000) // ensure req.user cache is expired
         req.flash('notify', req.t('resetApiKeySuccessfull'))
-        return reply.redirectTo('sumba:/my-stuff/profile')
+        return reply.redirectTo('sumba:/your-stuff/profile')
       } catch (err) {
         error = err
       }
     }
-    return reply.view('sumba.template:/my-stuff/reset-api-key.html', { form, error })
+    return reply.view('sumba.template:/your-stuff/reset-api-key.html', { form, error })
   }
 }
 

package/bajo/hook/waibu-socket-io@on-server-connect.js

@@ -1,5 +0,0 @@
-async function onServerConnect (socket) {
-  socket.emit('session', socket.session)
-}
-
-export default onServerConnect

package/bajoTemplate/layout/wide.html

@@ -1,15 +0,0 @@
-<c:page-start />
-<c:main flex>
-  <!-- include sumba.partial:/layout/sidebar.html -->
-  <c:div flex="fill column">
-    <!-- include sumba.partial:/layout/navbar.html -->
-    <!-- include sumba.partial:/layout/breadcrumb.html -->
-    <c:container margin="start-0 bottom-5" padding="x-3">
-      <c:div style="max-width: 992px;">
-        <!-- body -->
-        <!-- include sumba.partial:/layout/footer.html -->
-      </c:div>
-    </c:container>
-  </c:div>
-</c:main>
-<c:page-end back-to-top/>

package/bajoTemplate/template/my-stuff/change-password.html

@@ -1,4 +0,0 @@
----
-t:title: changePassword
-layout: sumba.layout:/wide.html
----

package/bajoTemplate/template/my-stuff/profile/edit.html

@@ -1,6 +0,0 @@
----
-t:title: editYourProfile
-layout: sumba.layout:/wide.html
-scripts:
-  - waibuExtra.virtual:/holderjs/holder.min.js
----

package/bajoTemplate/template/my-stuff/profile/view.html

@@ -1,6 +0,0 @@
----
-t:title: yourProfile
-layout: sumba.layout:/wide.html
-scripts:
-  - waibuExtra.virtual:/holderjs/holder.min.js
----

package/bajoTemplate/template/my-stuff/reset-api-key.html

@@ -1,4 +0,0 @@
----
-t:title: resetApiKey
-layout: sumba.layout:/wide.html
----

package/lib/check-site-id.js

@@ -1,57 +0,0 @@
-async function mergeSetting (req) {
-  const { defaultsDeep, parseObject } = this.app.bajo
-  const { trim, get, filter } = this.lib._
-  const { recordFind, recordGet } = this.app.dobo
-  const defSetting = {}
-  const nsSetting = {}
-  const query = {
-    ns: { $in: this.app.bajo.pluginNames },
-    siteId: req.site.id
-  }
-  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 = parseObject(defaultsDeep({}, nsSetting, defSetting))
-  // additional fields
-  const country = await recordGet('CdbCountry', req.site.country, { noHook: true })
-  req.site.countryName = (country ?? {}).name ?? req.site.country
-}
-
-const omitted = ['status']
-
-async function checkSiteId (req, reply) {
-  const { omit } = this.lib._
-  const { recordFind } = this.app.dobo
-
-  if (!this.config.multiSite) {
-    const resp = await recordFind('SumbaSite', { query: { alias: 'default' } }, { noHook: true })
-    req.site = omit(resp[0], omitted)
-    await mergeSetting.call(this, req)
-    return
-  }
-  const hostname = req.hostname.split(':')[0]
-  const query = {
-    $or: [
-      { hostname },
-      { alias: hostname }
-    ]
-  }
-  const filter = { query, limit: 1 }
-  const rows = await recordFind('SumbaSite', filter, { noHook: true })
-  if (rows.length === 0) throw this.error('unknownSite')
-  const row = omit(rows[0], omitted)
-  if (row.status !== 'ACTIVE') throw this.error('siteInactiveInfo')
-  await mergeSetting.call(this, req)
-}
-
-export default checkSiteId