@kalisio/kdk 2.0.1 → 2.1.1

package/core/client/utils/utils.account.js

@@ -0,0 +1,47 @@
+import { api } from '../api.js'
+
+export function resendVerifySignup (email) {
+  return api.getService('account').create({
+    action: 'resendVerifySignup',
+    value: { email }
+  })
+}
+
+export function verifySignup (token, email) {
+  return api.getService('account').create({
+    action: 'verifySignupShort',
+    value: { user: { email }, token }
+  })
+}
+
+export function sendResetPassword (email) {
+  return api.getService('account').create({
+    action: 'sendResetPwd',
+    value: { email }
+  })
+}
+
+export function resetPassword (email, token, password) {
+  return api.getService('account').create({
+    action: 'resetPwdShort',
+    value: { user: { email }, token, password }
+  })
+}
+
+export function changePassword (email, oldPassword, password) {
+  return api.getService('account').create({
+    action: 'passwordChange',
+    value: { user: { email }, oldPassword, password }
+  })
+}
+
+export function sendChangeIdentity (oldEmail, email, password) {
+  return api.getService('account').create({
+    action: 'identityChange',
+    value: { user: { email: oldEmail }, changes: { email }, password }
+  })
+}
+
+export function changeIdentity (token) {
+  return verifySignup(token)
+}

package/core/client/utils/utils.colors.js

@@ -24,9 +24,13 @@ export const Colors = {
 }
 
 export function getPaletteFromColor (color) {
-  return _.findKey(Colors, item => item === color)
+  // Check if already a color of the palette
+  if (Colors[color]) return color
+  else return _.findKey(Colors, item => item === color) || 'white'
 }
 
 export function getColorFromPalette (color) {
-  return Colors[color]
+  // Check if already a RGB color
+  if (color.startsWith('#')) return color
+  else return Colors[color] || '#ffffff'
 }

package/core/client/utils/utils.content.js

@@ -55,7 +55,7 @@ export function filterContent (content, filter) {
 }
 
 // Perform binding between a configuration object and a given context object
-export function bindContent (content, context) {
+export function bindContent (content, context, omit = []) {
   const components = _.flatMapDeep(content)
   _.forEach(components, (component) => {
     // Process component handlers
@@ -63,14 +63,14 @@ export function bindContent (content, context) {
     // Then process component props
     // It allows to write any property like { label: ':xxx' } and bind it
     // to a component property from the context like we do for handler
-    bindProperties(component, context)
+    bindProperties(component, context, omit)
     // Recursively bind the props/handlers on the sub content object
-    if (component.content) bindContent(component.content, context)
+    if (component.content) bindContent(component.content, context, omit)
   })
   return content
 }
 
-export function bindProperties (item, context) {
+export function bindProperties (item, context, omit = []) {
   if (Array.isArray(item)) {
     for (let i = 0; i < item.length; i++) {
       item[i] = bindProperties(item[i], context)
@@ -78,7 +78,7 @@ export function bindProperties (item, context) {
   } else if (typeof item === 'object') {
     _.forOwn(item, (value, key) => {
       // Bind required properties only
-      if (!ReservedBindings.includes(key)) {
+      if (!ReservedBindings.includes(key) && !omit.includes(key)) {
         if (typeof value === 'string') {
           item[key] = getBoundValue(value, context)
         } else {
@@ -178,6 +178,8 @@ export function getBoundValue (value, context) {
       // const result = _.get(context, path)
       // if (!_.isNil(result)) return result
     }
+    // Bound value not found
+    return undefined
   }
   return value
 }

package/core/client/utils/utils.platform.js

@@ -1,5 +1,4 @@
-import { Platform, Notify } from 'quasar'
-import { i18n } from '../i18n.js'
+import { Platform } from 'quasar'
 
 export function getPlatform () {
   return Object.assign(Platform.is, {
@@ -10,21 +9,3 @@ export function getPlatform () {
   })
 }
 
-export function updatePwa (registration) {
-  // Refresh the page once the update has been applied
-  registration.waiting.addEventListener('statechange', (event) => {
-    if (event.target.state === 'activated') {
-      window.location.reload()
-    }
-  })
-  // Notify when a new version is available
-  Notify.create({
-    type: 'warning',
-    timeout: 0,
-    message: i18n.t('pwa.VERSION_MISMATCH'),
-    actions: [
-      { label: i18n.t('pwa.BUTTON_REFRESH'), color: 'white', handler: () => registration.waiting.postMessage({ type: 'SKIP_WAITING' }) },
-      { label: i18n.t('pwa.BUTTON_DISMISS'), color: 'white' }
-    ]
-  })
-}

package/core/client/utils/utils.push.js

@@ -0,0 +1,53 @@
+import {
+  checkPrerequisites,
+  getPushSubscription,
+  subscribePushNotifications,
+  requestNotificationPermission,
+  addSubscription
+} from '@kalisio/feathers-webpush/client.js'
+import { Notify } from 'quasar'
+import logger from 'loglevel'
+import _ from 'lodash'
+import moment from 'moment'
+import { i18n } from '../i18n.js'
+import { Store } from '../store.js'
+import { api } from '../api.js'
+import { getPlatform } from './utils.platform.js'
+
+export async function subscribeToPushNotifications () {
+  // Check prerequisites & notification permission
+  try {
+    await checkPrerequisites()
+    await requestNotificationPermission()
+  } catch (error) {
+    Notify.create({ type: 'negative', message: i18n.t(`errors.${error.code}`) })
+    return
+  }
+  // Data
+  const userService = api.service('api/users')
+  const platform = getPlatform()
+  const date = moment.utc().toISOString()
+  const currentSubscription = await getPushSubscription()
+  const user = Store.get('user')
+  // Check if user is already subscribed
+  if (currentSubscription && _.find(_.get(user, 'subscriptions', []), subscription => subscription.endpoint === currentSubscription.endpoint)) {
+    // Patch subscription connection date
+    const subscriptions = _.map(user.subscriptions, subscription => {
+      if (subscription.endpoint === currentSubscription.endpoint) subscription.lastActivity = date
+      return subscription
+    })
+    userService.patch(Store.user._id, { subscriptions: subscriptions })
+    logger.debug(`New connection date registered on ${date} with subscription endpoint: ${currentSubscription.endpoint}`)
+    return
+  }
+  // Subscribe to web webpush notifications
+  const subscription = await subscribePushNotifications(Store.get('capabilities.api.vapidPublicKey'))
+  // Set platform informations
+  subscription.browser = { name: platform.name, version: platform.version }
+  subscription.platform = platform.platform
+  subscription.lastActivity = date
+  // Patch user subscriptions
+  await addSubscription(user, subscription, 'subscriptions')
+  userService.patch(Store.user._id, { subscriptions: user.subscriptions })
+  logger.debug(`New webpush subscription registered with endpoint: ${subscription.endpoint}`)
+}

package/core/client/utils/utils.pwa.js

@@ -0,0 +1,63 @@
+import { useQuasar } from 'quasar'
+import { i18n } from '../i18n.js'
+
+export let InstallPwaPrompt = null
+
+window.addEventListener('beforeinstallprompt', (e) => {
+  e.preventDefault()
+  // Stash the event so it can be triggered later
+  InstallPwaPrompt = e 
+})
+
+export function installDefaultPrompt () {
+  useQuasar().dialog({
+    title: i18n.t('composables.pwa.INSTALL_TITLE'),
+    message: i18n.t('composables.pwa.INSTALL_MESSAGE'),
+    cancel: {
+      id: 'ignore-button',
+      label: i18n.t('composables.pwa.IGNORE'),
+      color: 'primary',
+      outline: true
+    },
+    ok: {
+      id: 'install-button',
+      label: i18n.t('composables.pwa.INSTALL'),
+      color: 'primary'
+    },
+    persistent: true,
+    position: 'bottom',
+    html: true
+  }).onOk(async () => {
+    InstallPwaPrompt.prompt()
+    // Wait for the user to respond to the prompt
+    const { outcome } = await InstallPwaPrompt.userChoice
+    // Refresh page
+    if (outcome === 'accepted') location.reload()
+  })
+}
+
+export function installSafariPrompt () {
+  useQuasar().dialog({
+    title: i18n.t('composables.pwa.INSTALL_TITLE'),
+    message: i18n.t('composables.pwa.IOS_INSTALL_MESSAGE'),
+    ok: {
+      color: 'primary'
+    },
+    persistent: true,
+    position: 'bottom',
+    html: true
+  })
+}
+
+export function installFFDesktopPrompt () {
+  useQuasar().dialog({
+    title: i18n.t('composables.pwa.INSTALL_TITLE'),
+    message: i18n.t('composables.pwa.FIREFOX_DESKTOP_INSTALL_MESSAGE'),
+    ok: {
+      color: 'primary'
+    },
+    persistent: true,
+    position: 'bottom',
+    html: true
+  })
+}

package/core/client/utils/utils.session.js

@@ -14,6 +14,7 @@ export async function login (email, password) {
   // Anonymous user or service account ?
   const user = response.user ? response.user : { name: i18n.t('composables.ANONYMOUS'), anonymous: true }
   Store.set('user', user)
+  await updateAbilities()
 }
 
 export async function register (user) {
@@ -23,8 +24,17 @@ export async function register (user) {
 }
 
 export async function logout () {
-  await api.logout()
-  Store.set('user', null)
+  try {
+    await api.logout()
+    Store.set('user', null)
+  } catch (error) {
+    // This ensure user is unset and an old token is not kept e.g. when the user has been deleted
+    Store.set('user', null)
+    await api.authentication.removeAccessToken()
+    // Rethrow for caller to handle
+    throw error
+  }
+  
 }
 
 export async function restoreSession () {
@@ -32,12 +42,13 @@ export async function restoreSession () {
     const response = await api.reAuthenticate()
     const user = response.user ? response.user : { name: i18n.t('composables.ANONYMOUS'), anonymous: true }
     Store.set('user', user)
+    await updateAbilities()
   } catch (error) {
-    // This ensure an old token is not kept when the user has been deleted
-    if (error.code === 404) {
-      await api.authentication.removeAccessToken()
-      await logout()
-    }
+    // This ensure an old token is not kept e.g. when the user has been deleted
+    // await logout()
+    // It actually causes a call to the remove method on the authentication service, which fails due to missing access token
+    // See https://github.com/kalisio/kdk/issues/757, as a consequence we prefer to clean the token manually instead
+    await api.authentication.removeAccessToken()
     // Rethrow for caller to handle
     throw error
   }
@@ -46,18 +57,22 @@ export async function restoreSession () {
 export async function updateAbilities () {
   const user = Store.get('user')
   if (!user) return
-  if (user.abilities) return
   const abilities = await defineAbilities(user, api)
-  Store.set('user.abilities', abilities)
-  if (abilities) {
-    logger.debug('New user abilities: ', abilities.rules)
+  const previousAbilities = Store.get('user.abilities')
+  const rules = _.get(abilities, 'rules')
+  const previousRules = _.get(previousAbilities, 'rules')
+  // Update only whenever required, eg updating user profile should not change abilities
+  if (!_.isEqual(rules, previousRules)) {
+    Store.set('user.abilities', abilities)
+    logger.debug('[KDK] New user abilities: ', abilities.rules)
   }
 }
 
-function updateUser (user) {
+export async function updateUser (user) {
   // Check whether we need to update the current user
   if (user._id === Store.get('user._id')) {
     Store.patch('user', user)
+    await updateAbilities()
   }
 }
 

package/core/common/permissions.js

@@ -52,10 +52,9 @@ export function defineUserAbilities (subject, can, cannot) {
   // Verification email, reset password, etc.
   can('service', 'account')
   can('create', 'account')
-  can('service', 'devices')
-  can('update', 'devices')
-  can('remove', 'devices')
-
+  // Allow push registration
+  can('service', 'push')
+  can('create', 'push')
   if (subject && subject._id) {
     // Read user profiles for authorizing
     can('read', 'users')
@@ -273,6 +272,15 @@ export function countMembersOfGroup (membersService, groupId, role) {
   return countSubjectsForResource(membersService, 'groups', groupId, role)
 }
 
+// Helper functions to find the members with a given tag
+export function findMembersWithTag (membersService, tagId) {
+  return findSubjectsForResource(membersService, 'tags', tagId)
+}
+
+export function countMembersWithTag (membersService, tagId) {
+  return countSubjectsForResource(membersService, 'tags', tagId)
+}
+
 export function getRoleForOrganisation (user, organisationId) {
   const result = _.find(user.organisations, { _id: organisationId })
   if (!_.isUndefined(result)) return result.permissions

package/core/common/schemas/tags.create.json

@@ -0,0 +1,35 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "$id": "http://www.kalisio.xyz/schemas/tags.create.json#",
+  "title": "schemas.TAGS_CREATE_TITLE",
+  "description": "Tag creation schema",
+  "type": "object",
+  "properties": {
+    "value": {
+      "type": "string", 
+      "maxLength": 128,
+      "field": {
+        "component": "form/KTextField",
+        "label": "schemas.TAGS_NAME_FIELD_LABEL"
+      }
+    },
+    "icon": {
+      "type": "object", 
+      "default": { "name": "", "color": "" },
+      "field": {
+        "component": "form/KIconField",
+        "label": "schemas.TAGS_ICON_FIELD_LABEL"
+      }
+    },
+    "description": {
+      "type": "string", 
+      "maxLength": 2048,
+      "field": {
+        "component": "form/KTextField",
+        "label": "schemas.TAGS_DESCRIPTION_FIELD_LABEL"
+      }
+    }
+  },
+  "required": ["value"]
+}
+

package/core/common/schemas/users.update-profile.json

@@ -2,7 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "$id": "http://kalisio.xyz/schemas/users.update-profile.json#",
   "title": "schemas.OBJECT_NAME",
-  "description": "User profile perspective",
+  "description": "User profile",
   "type": "object",
   "properties": {
     "name": {

package/coverage/base.css

@@ -0,0 +1,224 @@
+body, html {
+  margin:0; padding: 0;
+  height: 100%;
+}
+body {
+    font-family: Helvetica Neue, Helvetica, Arial;
+    font-size: 14px;
+    color:#333;
+}
+.small { font-size: 12px; }
+*, *:after, *:before {
+  -webkit-box-sizing:border-box;
+     -moz-box-sizing:border-box;
+          box-sizing:border-box;
+  }
+h1 { font-size: 20px; margin: 0;}
+h2 { font-size: 14px; }
+pre {
+    font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    margin: 0;
+    padding: 0;
+    -moz-tab-size: 2;
+    -o-tab-size:  2;
+    tab-size: 2;
+}
+a { color:#0074D9; text-decoration:none; }
+a:hover { text-decoration:underline; }
+.strong { font-weight: bold; }
+.space-top1 { padding: 10px 0 0 0; }
+.pad2y { padding: 20px 0; }
+.pad1y { padding: 10px 0; }
+.pad2x { padding: 0 20px; }
+.pad2 { padding: 20px; }
+.pad1 { padding: 10px; }
+.space-left2 { padding-left:55px; }
+.space-right2 { padding-right:20px; }
+.center { text-align:center; }
+.clearfix { display:block; }
+.clearfix:after {
+  content:'';
+  display:block;
+  height:0;
+  clear:both;
+  visibility:hidden;
+  }
+.fl { float: left; }
+@media only screen and (max-width:640px) {
+  .col3 { width:100%; max-width:100%; }
+  .hide-mobile { display:none!important; }
+}
+
+.quiet {
+  color: #7f7f7f;
+  color: rgba(0,0,0,0.5);
+}
+.quiet a { opacity: 0.7; }
+
+.fraction {
+  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-size: 10px;
+  color: #555;
+  background: #E8E8E8;
+  padding: 4px 5px;
+  border-radius: 3px;
+  vertical-align: middle;
+}
+
+div.path a:link, div.path a:visited { color: #333; }
+table.coverage {
+  border-collapse: collapse;
+  margin: 10px 0 0 0;
+  padding: 0;
+}
+
+table.coverage td {
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+}
+table.coverage td.line-count {
+    text-align: right;
+    padding: 0 5px 0 20px;
+}
+table.coverage td.line-coverage {
+    text-align: right;
+    padding-right: 10px;
+    min-width:20px;
+}
+
+table.coverage td span.cline-any {
+    display: inline-block;
+    padding: 0 5px;
+    width: 100%;
+}
+.missing-if-branch {
+    display: inline-block;
+    margin-right: 5px;
+    border-radius: 3px;
+    position: relative;
+    padding: 0 4px;
+    background: #333;
+    color: yellow;
+}
+
+.skip-if-branch {
+    display: none;
+    margin-right: 10px;
+    position: relative;
+    padding: 0 4px;
+    background: #ccc;
+    color: white;
+}
+.missing-if-branch .typ, .skip-if-branch .typ {
+    color: inherit !important;
+}
+.coverage-summary {
+  border-collapse: collapse;
+  width: 100%;
+}
+.coverage-summary tr { border-bottom: 1px solid #bbb; }
+.keyline-all { border: 1px solid #ddd; }
+.coverage-summary td, .coverage-summary th { padding: 10px; }
+.coverage-summary tbody { border: 1px solid #bbb; }
+.coverage-summary td { border-right: 1px solid #bbb; }
+.coverage-summary td:last-child { border-right: none; }
+.coverage-summary th {
+  text-align: left;
+  font-weight: normal;
+  white-space: nowrap;
+}
+.coverage-summary th.file { border-right: none !important; }
+.coverage-summary th.pct { }
+.coverage-summary th.pic,
+.coverage-summary th.abs,
+.coverage-summary td.pct,
+.coverage-summary td.abs { text-align: right; }
+.coverage-summary td.file { white-space: nowrap;  }
+.coverage-summary td.pic { min-width: 120px !important;  }
+.coverage-summary tfoot td { }
+
+.coverage-summary .sorter {
+    height: 10px;
+    width: 7px;
+    display: inline-block;
+    margin-left: 0.5em;
+    background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
+}
+.coverage-summary .sorted .sorter {
+    background-position: 0 -20px;
+}
+.coverage-summary .sorted-desc .sorter {
+    background-position: 0 -10px;
+}
+.status-line {  height: 10px; }
+/* yellow */
+.cbranch-no { background: yellow !important; color: #111; }
+/* dark red */
+.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
+.low .chart { border:1px solid #C21F39 }
+.highlighted,
+.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{
+  background: #C21F39 !important;
+}
+/* medium red */
+.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
+/* light red */
+.low, .cline-no { background:#FCE1E5 }
+/* light green */
+.high, .cline-yes { background:rgb(230,245,208) }
+/* medium green */
+.cstat-yes { background:rgb(161,215,106) }
+/* dark green */
+.status-line.high, .high .cover-fill { background:rgb(77,146,33) }
+.high .chart { border:1px solid rgb(77,146,33) }
+/* dark yellow (gold) */
+.status-line.medium, .medium .cover-fill { background: #f9cd0b; }
+.medium .chart { border:1px solid #f9cd0b; }
+/* light yellow */
+.medium { background: #fff4c2; }
+
+.cstat-skip { background: #ddd; color: #111; }
+.fstat-skip { background: #ddd; color: #111 !important; }
+.cbranch-skip { background: #ddd !important; color: #111; }
+
+span.cline-neutral { background: #eaeaea; }
+
+.coverage-summary td.empty {
+    opacity: .5;
+    padding-top: 4px;
+    padding-bottom: 4px;
+    line-height: 1;
+    color: #888;
+}
+
+.cover-fill, .cover-empty {
+  display:inline-block;
+  height: 12px;
+}
+.chart {
+  line-height: 0;
+}
+.cover-empty {
+    background: white;
+}
+.cover-full {
+    border-right: none !important;
+}
+pre.prettyprint {
+    border: none !important;
+    padding: 0 !important;
+    margin: 0 !important;
+}
+.com { color: #999 !important; }
+.ignore-none { color: #999; font-weight: normal; }
+
+.wrapper {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin: 0 auto -48px;
+}
+.footer, .push {
+  height: 48px;
+}