@kalisio/kdk 2.0.1 → 2.1.1

package/core/api/hooks/hooks.users.js

@@ -12,6 +12,20 @@ const verifyHooks = authManagement.hooks
 
 const debug = makeDebug('kdk:core:users:hooks')
 
+// Helper functions to be used in iff hooks
+export function disallowRegistration (hook) {
+  return _.get(hook.app.get('authentication'), 'disallowRegistration')
+}
+export function allowLocalAuthentication (hook) {
+  return _.get(hook.app.get('authentication'), 'authStrategies', []).includes('local')
+}
+export function isNotMe (hook) {
+  const userId = _.get(hook.params, 'user._id', '')
+  const item = getItems(hook)
+  const targetId = _.get(item, '_id', '')
+  return userId.toString() !== targetId.toString()
+}
+
 export function enforcePasswordPolicy (options = {}) {
   return async function (hook) {
     if (hook.type !== 'before') {
@@ -138,7 +152,7 @@ export function preventRemoveUser (hook) {
       throw new Forbidden('You are not allowed to delete the user ' + user.name, {
         translation: {
           key: 'CANNOT_REMOVE_USER',
-          params: { user: user.name }
+          params: { user: _.get(user, 'profile.name') }
         }
       })
     }
@@ -245,24 +259,3 @@ export function addVerification (hook) {
 export function removeVerification (hook) {
   return verifyHooks.removeVerification()(hook)
 }
-
-export function unregisterDevices (hook) {
-  debug('Unregistering devices for user ', hook.params.user)
-  const pusherService = hook.app.getService('pusher')
-  const user = hook.params.user
-  // Process with each registered device
-  const unregisterPromises = []
-  if (user.devices) {
-    user.devices.forEach(device => {
-      unregisterPromises.push(
-        pusherService.remove(device.registrationId,
-          {
-            query: { action: 'device' },
-            user: hook.params.user
-          })
-      )
-    })
-  }
-  return Promise.all(unregisterPromises)
-    .then(results => hook)
-}

package/core/api/hooks/index.js

@@ -1,15 +1,12 @@
-export * from './hooks.account.js'
 export * from './hooks.authentication.js'
 export * from './hooks.authorisations.js'
-export * from './hooks.devices.js'
 export * from './hooks.groups.js'
 export * from './hooks.logger.js'
 export * from './hooks.model.js'
 export * from './hooks.organisations.js'
-export * from './hooks.pusher.js'
 export * from './hooks.query.js'
 export * from './hooks.schemas.js'
 export * from './hooks.service.js'
 export * from './hooks.storage.js'
-export * from './hooks.tags.js'
 export * from './hooks.users.js'
+export * from './hooks.push.js'

package/core/api/services/account/account.hooks.js

@@ -1,5 +1,5 @@
 import common from 'feathers-hooks-common'
-import { populateAccountUser, enforcePasswordPolicy } from '../../hooks/index.js'
+import { enforcePasswordPolicy } from '../../hooks/index.js'
 
 const { when } = common
 
@@ -8,8 +8,8 @@ export default {
     all: [],
     find: [],
     get: [],
-    create: [when(hook => hook.data.action === 'resetPwdLong' || hook.data.action === 'passwordChange',
-      populateAccountUser, enforcePasswordPolicy({ userAsItem: false, passwordField: 'value.password' }))],
+    create: [when(hook => hook.data.action === 'resetPwdShort' || hook.data.action === 'passwordChange',
+      enforcePasswordPolicy({ userAsItem: false, passwordField: 'value.password' }))],
     update: [],
     patch: [],
     remove: []

package/core/api/services/account/account.service.js

@@ -41,16 +41,15 @@ export default function (name, app, options) {
     // Build the subject & link to the app to perform the different actions
     let emailTemplateDir = type
     switch (type) {
-      case 'resendVerifySignup': // send another email with link for verifying user's email addr
+      case 'resendVerifySignup': // send another email with token for verifying user's email addr
         email.subject = 'Confirm your signup'
-        email.link = domainPath + 'verify-signup/' + user.verifyToken
         break
       case 'verifySignup': // inform that user's email is now confirmed
         email.subject = 'Thank you, your email has been verified'
         break
-      case 'sendResetPwd': // send email with link to reset password
+      case 'sendResetPwd': // send email with token to reset password
         email.subject = 'Reset your password'
-        email.link = domainPath + 'reset-password/' + user.resetToken
+        email.link = domainPath + 'reset-password/' + user.email
         break
       case 'resetPwd': // inform that user's password is now reset
         email.subject = 'Your password was reset'
@@ -60,7 +59,6 @@ export default function (name, app, options) {
         break
       case 'identityChange': // inform that user's email has now changed
         email.subject = 'Your account information was changed'
-        email.link = domainPath + 'change-identity/' + user.verifyToken
         break
       case 'sendInvitation':
         if (_.has(user, 'sponsor.name')) {
@@ -68,7 +66,7 @@ export default function (name, app, options) {
         } else if (_.has(user, 'sponsor.id')) {
           try {
             const sponsor = await userService.get(user.sponsor.id)
-            email.sponsor = sponsor.name
+            email.sponsor = _.get(sponsor, 'profile.name')
           } catch (error) {
             // We will not send the sponsor name in this case
           }
@@ -116,6 +114,7 @@ export default function (name, app, options) {
     skipIsVerifiedCheck: true,
     service: userService.getPath(true),
     path: servicePath,
-    notifier: options.notifier
+    notifier: options.notifier,
+    reuseResetToken: true
   })
 }

package/core/api/services/groups/groups.hooks.js

@@ -1,5 +1,3 @@
-import { updateOrganisationResource } from '../../hooks/index.js'
-
 export default {
   before: {
     all: [],
@@ -16,8 +14,8 @@ export default {
     find: [],
     get: [],
     create: [],
-    update: [updateOrganisationResource('groups')],
-    patch: [updateOrganisationResource('groups')],
+    update: [],
+    patch: [],
     remove: []
   },
 

package/core/api/services/index.js

@@ -1,3 +1,4 @@
+import _ from 'lodash'
 import path from 'path'
 import makeDebug from 'debug'
 import { fileURLToPath } from 'url'
@@ -41,7 +42,7 @@ export function createDatabasesService (options = {}) {
   const app = this
 
   return app.createService('databases', Object.assign({
-    servicesPath, events: ['created', 'updated', 'removed', 'patched'] // Internal use only, no events
+    servicesPath
   }, options))
 }
 
@@ -55,7 +56,7 @@ export async function createOrganisationService (options = {}) {
 
   // Create services to manage MongoDB databases, organisations, etc.
   await createDatabasesService.call(app)
-  const orgsService = await app.createService('organisations', { modelsPath, servicesPath, perspectives: ['billing'] })
+  const orgsService = await app.createService('organisations', { modelsPath, servicesPath })
 
   // Replication management
   const usersService = app.getService('users')
@@ -64,7 +65,8 @@ export async function createOrganisationService (options = {}) {
   usersService.on('patched', user => {
     // Patching profile should not trigger abilities update since
     // it is a perspective and permissions are not available in this case
-    if (user.organisations || user.groups) authorisationsService.updateAbilities(user)
+    // Updating abilities in this case will result in loosing permissions for orgs/groups as none are available
+    if (_.has(user, 'organisations') || _.has(user, 'groups')) authorisationsService.updateAbilities(user)
   })
   // Ensure org services are correctly distributed when replicated
   orgsService.on('created', organisation => {
@@ -90,12 +92,7 @@ export default async function () {
 
   const authConfig = app.get('authentication')
   if (authConfig) {
-    await app.createService('users', {
-      modelsPath,
-      servicesPath,
-      // Add required OAuth2 provider perspectives
-      perspectives: ['profile'].concat(app.authenticationProviders)
-    })
+    await app.createService('users', { modelsPath, servicesPath })
     debug('\'users\' service created')
     await app.createService('authorisations', { servicesPath })
     debug('\'authorisations\' service created')
@@ -115,17 +112,15 @@ export default async function () {
 
   const mailerConfig = app.get('mailer')
   if (mailerConfig) {
-    await app.createService('mailer', { servicesPath, events: ['created', 'updated', 'removed', 'patched'] }) // Internal use only, no events
+    await app.createService('mailer', { servicesPath })
     debug('\'mailer\' service created')
     await app.createService('account', { servicesPath })
     debug('\'account\' service created')
   }
 
-  const pusherConfig = app.get('pusher')
-  if (pusherConfig) {
-    await app.createService('pusher', { servicesPath, events: ['created', 'updated', 'removed', 'patched'] }) // Internal use only, no events
-    debug('\'pusher\' service created')
-    await app.createService('devices', { servicesPath })
-    debug('\'devices\' service created')
+  const pushConfig = app.get('push')
+  if (pushConfig) {
+    await app.createService('push', { servicesPath })
+    debug('\'push\' service created')
   }
 }

package/core/api/services/{devices/devices.hooks.js → push/push.hooks.js}

@@ -1,13 +1,13 @@
-import common from 'feathers-hooks-common'
-
-const { disallow } = common
+import { deleteExpiredSubscriptions } from '@kalisio/feathers-webpush'
+import commonHooks from 'feathers-hooks-common'
+import { disallowExternalPush } from '../../hooks/index.js'
 
 export default {
   before: {
     all: [],
     find: [],
     get: [],
-    create: [disallow('external')],
+    create: [commonHooks.when(disallowExternalPush, commonHooks.disallow('external'))],
     update: [],
     patch: [],
     remove: []
@@ -17,7 +17,7 @@ export default {
     all: [],
     find: [],
     get: [],
-    create: [],
+    create: [deleteExpiredSubscriptions],
     update: [],
     patch: [],
     remove: []

package/core/api/services/push/push.service.js

@@ -0,0 +1,12 @@
+import { Service } from '@kalisio/feathers-webpush'
+import makeDebug from 'debug'
+
+const debug = makeDebug('kdk:push:service')
+
+export default function (name, app, options) {
+  const config = app.get('push')
+  debug('Creating push service with config ', config)
+  const service = new Service(Object.assign({ app }, config))
+
+  return service
+}

package/core/api/services/tags/tags.hooks.js

@@ -1,36 +1,22 @@
-import _ from 'lodash'
-import {
-  populateTagResource, addTagIfNew, removeTagIfUnused,
-  tagResource, untagResource, updateOrganisationResource
-} from '../../hooks/index.js'
-import common from 'feathers-hooks-common'
-
-const { iff } = common
-
 export default {
   before: {
     all: [],
     find: [],
     get: [],
-    create: [populateTagResource, iff(hook => _.has(hook.data, 'value') && _.has(hook.data, 'scope'), addTagIfNew)],
+    create: [],
     update: [],
     patch: [],
-    // Let the removal of the actual tag object by ID pass without running these hooks
-    // Indeed the initial call is used to remove the tag from the resource with the ID of the resource given, not the tag one
-    remove: [populateTagResource, iff(hook => _.has(hook.params, 'query.value') && _.has(hook.params, 'query.scope'), removeTagIfUnused)]
+    remove: []
   },
 
   after: {
     all: [],
     find: [],
     get: [],
-    // Let the tagging of the resource object occur only when resource has been found
-    create: [iff(hook => hook.params.resource, tagResource)],
-    // Tags are patched internally for reference counting, update only if value is changed
-    update: [iff(hook => _.has(hook.data, 'value'), updateOrganisationResource('tags'))],
-    patch: [iff(hook => _.has(hook.data, 'value'), updateOrganisationResource('tags'))],
-    // Let the untagging of the resource object occur only when resource has been found
-    remove: [iff(hook => hook.params.resource, untagResource)]
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
   },
 
   error: {

package/core/api/services/users/users.hooks.js

@@ -1,14 +1,10 @@
 import _ from 'lodash'
 import {
-  serialize, updateAbilities, populatePreviousObject, hashPassword,
-  enforcePasswordPolicy, storePreviousPassword
+  serialize, updateAbilities, populatePreviousObject, hashPassword, disallowRegistration, allowLocalAuthentication,
+  discardAuthenticationProviders, enforcePasswordPolicy, storePreviousPassword, sendNewSubscriptionEmail
 } from '../../hooks/index.js'
 import commonHooks from 'feathers-hooks-common'
 
-// Helper functions
-const disallowRegistration = (hook) => _.get(hook.app.get('authentication'), 'disallowRegistration')
-const allowLocalAuthentication = (hook) => _.get(hook.app.get('authentication'), 'authStrategies', []).includes('local')
-
 export default {
   before: {
     all: [],
@@ -16,6 +12,7 @@ export default {
     get: [],
     create: [
       commonHooks.when(disallowRegistration, commonHooks.disallow('external')),
+      // Initialize a profile from base user information
       serialize([
         { source: 'name', target: 'profile.name', delete: true },
         { source: 'email', target: 'profile.description' }
@@ -49,18 +46,20 @@ export default {
 
   after: {
     all: [
-      commonHooks.when(hook => hook.params.provider, commonHooks.discard('password'), commonHooks.discard('previousPasswords')),
-      serialize([
-        { source: 'profile.name', target: 'name' },
-        { source: 'profile.avatar', target: 'avatar' },
-        { source: 'profile.description', target: 'description' }
-      ])
+      commonHooks.when(hook => hook.params.provider,
+        commonHooks.discard('password'),
+        commonHooks.discard('previousPasswords'),
+        discardAuthenticationProviders),
+      // Hide profile for external user as it may contain personal information
+      // However, this causes an issue: https://github.com/feathersjs-ecosystem/feathers-reactive/issues/214
+      // So let the application decide what to do
+      //commonHooks.when(isNotMe, commonHooks.discard('profile'))
     ],
     find: [],
     get: [],
     create: [updateAbilities()],
     update: [],
-    patch: [],
+    patch: [sendNewSubscriptionEmail],
     remove: []
   },
 

package/core/api/utils.js

@@ -0,0 +1,11 @@
+export function isTagEqual (tag1, tag2) {
+  // If tags already exists in DB directly use IDs for comparison
+  if (tag1._id && tag2._id) return (tag1._id.toString() === tag2._id.toString())
+
+  let equal = (tag1.value === tag2.value && tag1.scope === tag2.scope)
+  // when context is provided use it as well
+  if (tag1.context && tag2.context) {
+    equal = equal && (tag1.context.toString() === tag2.context.toString())
+  }
+  return equal
+}

package/core/client/api.js

@@ -272,6 +272,12 @@ export function createClient (config) {
   }
   // Object used to store configuration options for services
   api.serviceOptions = {}
+  // Override Feathers configure that do not manage async operations,
+  // here we also simply call the function given as parameter but await for it
+  api.configure = async function (fn) {
+    await fn.call(this, this)
+    return this
+  }
 
   return api
 }

package/core/client/capabilities.js

@@ -6,18 +6,14 @@ import { Store } from './store.js'
 
 // Export singleton
 export const Capabilities = {
-  initialize () {
-    window.fetch(api.getBaseUrl() + _.get(config, 'apiPath') + '/capabilities')
-      .then(capabilities => {
-        capabilities.json()
-          .then(content => {
-            logger.debug('[KDK] fetched capabilities:', JSON.stringify(content, null, 4))
-            this.content = content
-            // Used to ensure backward compatibility
-            Store.set('capabilities.api', content)
-            Store.set('capabilities.client', _.pick(config, ['version', 'buildNumber']))
-          })
-      })
+  async initialize () {
+    const capabilities = await window.fetch(api.getBaseUrl() + _.get(config, 'apiPath') + '/capabilities')
+    const content = await capabilities.json()
+    logger.debug('[KDK] fetched capabilities:', JSON.stringify(content, null, 4))
+    this.content = content
+    // Used to ensure backward compatibility
+    Store.set('capabilities.api', content)
+    Store.set('capabilities.client', _.pick(config, ['version', 'buildNumber']))
   },
   get (key) {
     if (!this.content) logger.error(new Error('Capabilities must be initialized first'))

package/core/client/components/KAction.vue

@@ -16,6 +16,7 @@
     :stack="stack"
     :dense="dense"
     :disable="computedDisabled"
+    v-close-popup="closePopup"
     @click="onClicked">
     <!-- label -->
     <div v-if="computedLabel" :class="{ 'ellipsis q-pr-md': iconRight, 'ellipsis q-pl-md': !iconRight }">
@@ -42,9 +43,9 @@
     color="primary"
     :outline="outline"
     :size="size"
-    :dense="dense"
     :disable="computedDisabled"
     :loading="loading"
+    v-close-popup="closePopup"
     @click="onClicked">
     <div class="ellipsis">
       {{ computedLabel }}
@@ -59,6 +60,7 @@
     clickable
     :dense="dense"
     :disable="computedDisabled"
+    v-close-popup="closePopup"
     @click="onClicked">
     <q-item-section v-if="computedIcon || badge" avatar>
       <q-icon v-if="computedIcon" :name="computedIcon" :color="computedColor" :dense="dense" />
@@ -222,6 +224,10 @@ export default {
       type: Function,
       default: null
     },
+    closePopup: {
+      type: [Boolean, Number, String],
+      default: false
+    },
     dialog: {
       type: Object,
       default: null
@@ -299,8 +305,9 @@ export default {
       // We bind the target params object to both possible context.
       const currentParams = _.get(route, path, {})
       const targetParams = _.get(props.route, path, {})
-      const params = bindParams(targetParams, currentParams)
-      return bindParams(params, props.context)
+      const routeParams = bindParams(targetParams, currentParams)
+      const contextParams = bindParams(targetParams, props.context)
+      return _.merge(routeParams, contextParams)
     }
     async function onClicked (event) {
       if (!props.propagate) event.stopPropagation()

package/core/client/components/KAvatar.vue

@@ -1,24 +1,21 @@
 <template>
-  <div>
-    <q-skeleton v-if="skeleton" type="QAvatar" :size="size" />
-    <q-avatar v-if="avatar" :size="size">
-      <img :src="avatar">
-      <q-tooltip v-if="name">
-        {{ name }}
-      </q-tooltip>
-    </q-avatar>
-    <q-avatar v-else-if="icon" :size="size" :color="color" text-color="white" :icon="icon">
-      <q-tooltip v-if="name">
-        {{ name }}
-      </q-tooltip>
-    </q-avatar>
-    <q-avatar v-else-if="initials" :size="size" color="primary" text-color="white">
-      {{ initials }}
-      <q-tooltip v-if="name">
-        {{ name }}
-      </q-tooltip>
-    </q-avatar>
-  </div>
+  <q-avatar v-if="avatar" :size="size">
+    <q-img :src="avatar" />
+    <q-tooltip v-if="tooltip">
+      {{ name }}
+    </q-tooltip>
+  </q-avatar>
+  <q-avatar v-else-if="icon" :size="size" :color="color" text-color="white" :icon="icon">
+    <q-tooltip v-if="tooltip">
+      {{ name }}
+    </q-tooltip>
+  </q-avatar>
+  <q-avatar v-else-if="initials" :size="size" color="primary" text-color="white">
+    {{ initials }}
+    <q-tooltip v-if="tooltip">
+      {{ name }}
+    </q-tooltip>
+  </q-avatar>
 </template>
 
 <script>
@@ -28,7 +25,7 @@ import { getIconName, getInitials } from '../utils/index.js'
 
 export default {
   props: {
-    object: {
+    subject: {
       type: Object,
       required: true
     },
@@ -40,6 +37,10 @@ export default {
       type: String,
       default: 'md'
     },
+    tooltip: {
+      type: Boolean,
+      default: false
+    },
     options: {
       type: Object,
       default: () => null
@@ -47,7 +48,6 @@ export default {
   },
   data () {
     return {
-      skeleton: true,
       name: null,
       avatar: null,
       icon: null,
@@ -56,7 +56,7 @@ export default {
     }
   },
   watch: {
-    object: {
+    subject: {
       immediate: true,
       async handler () {
         this.name = this.getName()
@@ -65,7 +65,6 @@ export default {
         if (avatar) {
           if (avatar.uri) {
             this.avatar = avatar.uri
-            this.skeleton = false
             return
           }
           // Backward compatibility as avatar key was previously stored under _id
@@ -81,14 +80,14 @@ export default {
             avatar.uri = data.uri
             this.avatar = avatar.uri
             */
-            const url = await Storage.getObjectUrl({
+            this.avatar = await Storage.getObjectUrl({
               file: _.get(avatar, 'name'),
               key: avatarId,
-              context: this.contextId
+              context: this.contextId,
+              query: {
+                timestamp: Date.now()
+              }
             })
-            avatar.url = url
-            this.avatar = url
-            this.skeleton = false
             return
           }
           this.avatar = null
@@ -99,7 +98,6 @@ export default {
         if (icon) {
           this.icon = getIconName(icon, 'name')
           this.color = _.get(icon, 'color', 'primary')
-          this.skeleton = false
           return
         }
         this.icon = null
@@ -107,26 +105,24 @@ export default {
         const name = this.getName()
         if (name) {
           this.initials = getInitials(name)
-          this.skeleton = false
           return
         }
         this.initials = null
-        this.skeleton = false
       }
     }
   },
   methods: {
     getAvatar () {
       const avatarField = _.get(this.options, 'avatarField', 'avatar')
-      return _.get(this.object, avatarField)
+      return _.get(this.subject, avatarField)
     },
     getIcon () {
       const iconField = _.get(this.options, 'iconField', 'icon')
-      return _.get(this.object, iconField)
+      return _.get(this.subject, iconField)
     },
     getName () {
       const nameField = _.get(this.options, 'nameField', 'name')
-      return _.get(this.object, nameField)
+      return _.get(this.subject, nameField)
     }
   }
 }

package/core/client/components/KChipsPane.vue

@@ -6,6 +6,9 @@
         :key="getValue(chip)"
         :color="getColor(chip)"
         text-color="white"
+        :removable="canRemoveTag()"
+        @remove="onRemove(chip)"
+        :id="getID(chip)"
         dense
         outline
         square>
@@ -24,6 +27,7 @@
 import _ from 'lodash'
 import KPanel from './KPanel.vue'
 import { getIconName } from '../utils/index.js'
+import { Roles, getRoleForOrganisation, findGroupsWithRole } from '../../common/permissions'
 
 export default {
   components: {
@@ -37,6 +41,10 @@ export default {
     valuePath: {
       type: [String, Array],
       default: 'value'
+    },
+    removable: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -65,6 +73,21 @@ export default {
     },
     getIcon (chip) {
       return getIconName(chip)
+    },
+    getID (chip) {
+      return `${_.kebabCase(chip.value)}-pane`
+    },
+    canRemoveTag () {
+      if (!this.removable) return false
+      const user = this.$store.get('user')
+      const contextId = this.$store.get('context')
+      const role = getRoleForOrganisation(user, contextId._id)
+      if (Roles[role] >= Roles.manager) return true
+      const groups = findGroupsWithRole(user, contextId._id, Roles.manager)
+      return groups.length > 0
+    },
+    onRemove (chip) {
+      this.$emit('chip-removed', chip)
     }
   },
   mounted () {