@kalisio/kdk 2.1.7 → 2.1.9

package/core/api/marshall.js

@@ -1,90 +1,90 @@
-import moment from 'moment'
-import _ from 'lodash'
-
-// Helper function to convert comparison operator values to numbers or dates
-export function marshallComparisonFields (queryObject) {
-  _.forOwn(queryObject, (value, key) => {
-    // Process current attributes or  recurse
-    if (typeof value === 'object') {
-      marshallComparisonFields(value)
-    } else if ((key === '$lt') || (key === '$lte') || (key === '$gt') || (key === '$gte')) {
-      const number = _.toNumber(value)
-      // Update from query string to number if required
-      if (!Number.isNaN(number)) {
-        queryObject[key] = number
-      } else {
-        // try for dates as well
-        const date = moment.utc(value)
-        if (date.isValid()) {
-          queryObject[key] = date.toDate()
-        }
-      }
-    }
-  })
-}
-
-// Helper function to convert sort operator values to numbers
-export function marshallSortFields (queryObject) {
-  _.forOwn(queryObject, (value, key) => {
-    // Process current attributes or  recurse
-    if (typeof value === 'object') {
-      marshallSortFields(value)
-    } else {
-      const number = _.toNumber(value)
-      // Update from query string to number if required
-      if (!Number.isNaN(number)) {
-        queryObject[key] = number
-      }
-    }
-  })
-}
-
-// Helper function to convert time objects or array of time objects
-export function marshallTime (item, property) {
-  if (!item) return
-  const time = _.get(item, property)
-  if (!time) return
-  if (Array.isArray(time)) {
-    _.set(item, property, time.map(t => {
-      if (moment.isMoment(t)) return t.toDate()
-      else if (typeof t === 'string') return new Date(t)
-      else return t
-    }))
-  } else if (moment.isMoment(time)) {
-    _.set(item, property, time.toDate())
-  } else if (typeof time === 'string') {
-    _.set(item, property, new Date(time))
-  } else if (typeof time === 'object') { // Check if complex object such as comparison operator
-    // If so this will recurse
-    _.keys(time).forEach(key => marshallTime(time, key))
-  }
-}
-
-// Helper function to convert time objects or array of time objects for a fixed set of properties on a given object
-export function marshallTimes (object, properties) {
-  properties.forEach(property => marshallTime(object, property))
-}
-
-// Helper function to convert time objects or array of time objects
-export function unmarshallTime (item, property) {
-  if (!item) return
-  const time = _.get(item, property)
-  if (!time) return
-  if (Array.isArray(time)) {
-    _.set(item, property, time.map(t => {
-      if (typeof t === 'string') return moment.utc(t)
-      else if (typeof t.toISOString === 'function') return moment.utc(t)
-      else return t
-    }))
-  } else if (!moment.isMoment(time)) {
-    if (typeof time === 'string') _.set(item, property, moment.utc(time))
-    else if (typeof time.toISOString === 'function') _.set(item, property, moment.utc(time))
-    // Recurse on complex object such as comparison operator
-    else if (typeof time === 'object') _.keys(time).forEach(key => unmarshallTime(time, key))
-  }
-}
-
-// Helper function to convert time objects or array of time objects for a fixed set of properties on a given object
-export function unmarshallTimes (object, properties) {
-  properties.forEach(property => unmarshallTime(object, property))
-}
+import moment from 'moment'
+import _ from 'lodash'
+
+// Helper function to convert comparison operator values to numbers or dates
+export function marshallComparisonFields (queryObject) {
+  _.forOwn(queryObject, (value, key) => {
+    // Process current attributes or  recurse
+    if (typeof value === 'object') {
+      marshallComparisonFields(value)
+    } else if ((key === '$lt') || (key === '$lte') || (key === '$gt') || (key === '$gte')) {
+      const number = _.toNumber(value)
+      // Update from query string to number if required
+      if (!Number.isNaN(number)) {
+        queryObject[key] = number
+      } else {
+        // try for dates as well
+        const date = moment.utc(value)
+        if (date.isValid()) {
+          queryObject[key] = date.toDate()
+        }
+      }
+    }
+  })
+}
+
+// Helper function to convert sort operator values to numbers
+export function marshallSortFields (queryObject) {
+  _.forOwn(queryObject, (value, key) => {
+    // Process current attributes or  recurse
+    if (typeof value === 'object') {
+      marshallSortFields(value)
+    } else {
+      const number = _.toNumber(value)
+      // Update from query string to number if required
+      if (!Number.isNaN(number)) {
+        queryObject[key] = number
+      }
+    }
+  })
+}
+
+// Helper function to convert time objects or array of time objects
+export function marshallTime (item, property) {
+  if (!item) return
+  const time = _.get(item, property)
+  if (!time) return
+  if (Array.isArray(time)) {
+    _.set(item, property, time.map(t => {
+      if (moment.isMoment(t)) return t.toDate()
+      else if (typeof t === 'string') return new Date(t)
+      else return t
+    }))
+  } else if (moment.isMoment(time)) {
+    _.set(item, property, time.toDate())
+  } else if (typeof time === 'string') {
+    _.set(item, property, new Date(time))
+  } else if (typeof time === 'object') { // Check if complex object such as comparison operator
+    // If so this will recurse
+    _.keys(time).forEach(key => marshallTime(time, key))
+  }
+}
+
+// Helper function to convert time objects or array of time objects for a fixed set of properties on a given object
+export function marshallTimes (object, properties) {
+  properties.forEach(property => marshallTime(object, property))
+}
+
+// Helper function to convert time objects or array of time objects
+export function unmarshallTime (item, property) {
+  if (!item) return
+  const time = _.get(item, property)
+  if (!time) return
+  if (Array.isArray(time)) {
+    _.set(item, property, time.map(t => {
+      if (typeof t === 'string') return moment.utc(t)
+      else if (typeof t.toISOString === 'function') return moment.utc(t)
+      else return t
+    }))
+  } else if (!moment.isMoment(time)) {
+    if (typeof time === 'string') _.set(item, property, moment.utc(time))
+    else if (typeof time.toISOString === 'function') _.set(item, property, moment.utc(time))
+    // Recurse on complex object such as comparison operator
+    else if (typeof time === 'object') _.keys(time).forEach(key => unmarshallTime(time, key))
+  }
+}
+
+// Helper function to convert time objects or array of time objects for a fixed set of properties on a given object
+export function unmarshallTimes (object, properties) {
+  properties.forEach(property => unmarshallTime(object, property))
+}

package/core/api/models/groups.model.mongodb.js

@@ -1,8 +1,8 @@
-export default function (app, options) {
-  const db = options.db || app.db
-  options.Model = db.collection('groups')
-  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language
-  // We built indices with collation to cover the most used languages, it requires different naming...
-  options.Model.createIndex({ name: 1 }, { name: 'name-en', collation: { locale: 'en', strength: 1 } })
-  options.Model.createIndex({ name: 1 }, { name: 'name-fr', collation: { locale: 'fr', strength: 1 } })
-}
+export default function (app, options) {
+  const db = options.db || app.db
+  options.Model = db.collection('groups')
+  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language
+  // We built indices with collation to cover the most used languages, it requires different naming...
+  options.Model.createIndex({ name: 1 }, { name: 'name-en', collation: { locale: 'en', strength: 1 } })
+  options.Model.createIndex({ name: 1 }, { name: 'name-fr', collation: { locale: 'fr', strength: 1 } })
+}

package/core/api/models/organisations.model.mongodb.js

@@ -1,3 +1,3 @@
-export default function (app, options) {
-  options.Model = app.db.collection('organisations')
-}
+export default function (app, options) {
+  options.Model = app.db.collection('organisations')
+}

package/core/api/models/tags.model.mongodb.js

@@ -1,10 +1,10 @@
-export default function (app, options) {
-  const db = options.db || app.db
-  options.Model = db.collection('tags')
-  // Use compound index to have unique pairs scope/value
-  options.Model.createIndex({ scope: 1, value: 1 }, { unique: true })
-  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language
-  // We built indices with collation to cover the most used languages, it requires different naming...
-  options.Model.createIndex({ value: 1 }, { name: 'value-en', collation: { locale: 'en', strength: 1 } })
-  options.Model.createIndex({ value: 1 }, { name: 'value-fr', collation: { locale: 'fr', strength: 1 } })
-}
+export default function (app, options) {
+  const db = options.db || app.db
+  options.Model = db.collection('tags')
+  // Use compound index to have unique pairs scope/value
+  options.Model.createIndex({ scope: 1, value: 1 }, { unique: true })
+  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language
+  // We built indices with collation to cover the most used languages, it requires different naming...
+  options.Model.createIndex({ value: 1 }, { name: 'value-en', collation: { locale: 'en', strength: 1 } })
+  options.Model.createIndex({ value: 1 }, { name: 'value-fr', collation: { locale: 'fr', strength: 1 } })
+}

package/core/api/models/users.model.mongodb.js

@@ -1,10 +1,10 @@
-export default function (app, options) {
-  options.Model = app.db.collection('users')
-  options.Model.createIndex({ email: 1 }, { unique: true })
-  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language
-  // We built indices with collation to cover the most used languages, it requires different naming...
-  options.Model.createIndex({ 'profile.name': 1 }, { name: 'name-en', collation: { locale: 'en', strength: 1 } })
-  options.Model.createIndex({ 'profile.name': 1 }, { name: 'name-fr', collation: { locale: 'fr', strength: 1 } })
-  // Inactive user account might expire at a given date
-  options.Model.createIndex({ expireAt: 1 }, { expireAfterSeconds: 0 })
-}
+export default function (app, options) {
+  options.Model = app.db.collection('users')
+  options.Model.createIndex({ email: 1 }, { unique: true })
+  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language
+  // We built indices with collation to cover the most used languages, it requires different naming...
+  options.Model.createIndex({ 'profile.name': 1 }, { name: 'name-en', collation: { locale: 'en', strength: 1 } })
+  options.Model.createIndex({ 'profile.name': 1 }, { name: 'name-fr', collation: { locale: 'fr', strength: 1 } })
+  // Inactive user account might expire at a given date
+  options.Model.createIndex({ expireAt: 1 }, { expireAfterSeconds: 0 })
+}

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

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

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

@@ -1,117 +1,117 @@
-import { AuthenticationManagementService } from 'feathers-authentication-management'
-import errors from '@feathersjs/errors'
-import emails from 'email-templates'
-import path from 'path'
-import makeDebug from 'debug'
-import _ from 'lodash'
-
-const { BadRequest } = errors
-const debug = makeDebug('kdk:core:account:service')
-
-class AccountService extends AuthenticationManagementService {
-  // add a method to verify whether en email exist or not
-  async verifyEmail (params) {
-    const usersService = this.app.getService('users')
-    const response = await usersService.find({ query: { email: params.email } })
-    return { status: response.total === 1 ? 200 : 404 }
-  }
-}
-
-export default function (name, app, options) {
-  // Keep track of notifier in service options
-  options.notifier = async function (type, user, notifierOptions) {
-    const userService = app.getService('users')
-    // Using OAuth2 providers disallow some operations
-    let identityProvider
-    for (const provider of app.authenticationProviders) {
-      if (user[provider + 'Id']) identityProvider = _.startCase(provider)
-    }
-    // Password/Identity change is already filtered by the fact the user does not have an old password to be provided
-    if (identityProvider && (type === 'resendVerifySignup')) {
-      const userWithPassword = await userService.get(user._id.toString())
-      if (!userWithPassword.password) {
-        return Promise.reject(new BadRequest(`You cannot update your account because it is managed by ${identityProvider}`, {
-          translation: {
-            key: 'OAUTH2_PROVIDER',
-            params: { provider: identityProvider }
-          }
-        }))
-      }
-    }
-
-    const mailerService = app.getService('mailer')
-    const domainPath = app.get('domain') + '/#/'
-    const email = {
-      from: mailerService.options.auth.user,
-      // When changing email send to the new one so that it can be verified
-      to: (type === 'identityChange' ? user.verifyChanges.email : user.email),
-      domainPath
-    }
-    // Build the subject & link to the app to perform the different actions
-    let emailTemplateDir = type
-    switch (type) {
-      case 'resendVerifySignup': // send another email with token for verifying user's email addr
-        email.subject = 'Confirm your signup'
-        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 token to reset password
-        email.subject = 'Reset your password'
-        email.link = domainPath + 'reset-password/' + user.email
-        break
-      case 'resetPwd': // inform that user's password is now reset
-        email.subject = 'Your password was reset'
-        break
-      case 'passwordChange': // inform that user's password is now changed
-        email.subject = 'Your password was changed'
-        break
-      case 'identityChange': // inform that user's email has now changed
-        email.subject = 'Your account information was changed'
-        break
-      case 'sendInvitation':
-        if (_.has(user, 'sponsor.name')) {
-          email.sponsor = _.get(user, 'sponsor.name')
-        } else if (_.has(user, 'sponsor.id')) {
-          try {
-            const sponsor = await userService.get(user.sponsor.id)
-            email.sponsor = _.get(sponsor, 'profile.name')
-          } catch (error) {
-            // We will not send the sponsor name in this case
-          }
-        }
-        email.subject = 'Welcome'
-        email.link = domainPath + 'login'
-        emailTemplateDir = 'confirmInvitation'
-        break
-    }
-    const templateDir = path.join(mailerService.options.templateDir, emailTemplateDir)
-    const template = new emails.EmailTemplate(templateDir)
-    // Errors does not seem to be correctly catched by the caller
-    // so we catch them here to avoid any problem
-    try {
-      const emailContent = await template.render({ email, user }, user.locale || 'en-us')
-      // Update compiled content
-      email.html = emailContent.html
-      debug('Sending email ', email)
-      return mailerService.create(email)
-    } catch (error) {
-      debug('Sending email failed', error)
-      app.logger.error(error)
-    }
-  }
-
-  const servicePath = app.get('apiPath') + '/account'
-  const userService = app.getService('users')
-  
-  return new AccountService(app, {
-    // By default it is impossible to reset password if email is not verified
-    // The problem is that if you loose your password before validating your email you are blocked,
-    // as a consequence we release this constraint
-    skipIsVerifiedCheck: true,
-    service: userService.getPath(true),
-    path: servicePath,
-    notifier: options.notifier,
-    reuseResetToken: true
-  })
-}
+import { AuthenticationManagementService } from 'feathers-authentication-management'
+import errors from '@feathersjs/errors'
+import emails from 'email-templates'
+import path from 'path'
+import makeDebug from 'debug'
+import _ from 'lodash'
+
+const { BadRequest } = errors
+const debug = makeDebug('kdk:core:account:service')
+
+class AccountService extends AuthenticationManagementService {
+  // add a method to verify whether en email exist or not
+  async verifyEmail (params) {
+    const usersService = this.app.getService('users')
+    const response = await usersService.find({ query: { email: params.email } })
+    return { status: response.total === 1 ? 200 : 404 }
+  }
+}
+
+export default function (name, app, options) {
+  // Keep track of notifier in service options
+  options.notifier = async function (type, user, notifierOptions) {
+    const userService = app.getService('users')
+    // Using OAuth2 providers disallow some operations
+    let identityProvider
+    for (const provider of app.authenticationProviders) {
+      if (user[provider + 'Id']) identityProvider = _.startCase(provider)
+    }
+    // Password/Identity change is already filtered by the fact the user does not have an old password to be provided
+    if (identityProvider && (type === 'resendVerifySignup')) {
+      const userWithPassword = await userService.get(user._id.toString())
+      if (!userWithPassword.password) {
+        return Promise.reject(new BadRequest(`You cannot update your account because it is managed by ${identityProvider}`, {
+          translation: {
+            key: 'OAUTH2_PROVIDER',
+            params: { provider: identityProvider }
+          }
+        }))
+      }
+    }
+
+    const mailerService = app.getService('mailer')
+    const domainPath = app.get('domain') + '/#/'
+    const email = {
+      from: mailerService.options.auth.user,
+      // When changing email send to the new one so that it can be verified
+      to: (type === 'identityChange' ? user.verifyChanges.email : user.email),
+      domainPath
+    }
+    // Build the subject & link to the app to perform the different actions
+    let emailTemplateDir = type
+    switch (type) {
+      case 'resendVerifySignup': // send another email with token for verifying user's email addr
+        email.subject = 'Confirm your signup'
+        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 token to reset password
+        email.subject = 'Reset your password'
+        email.link = domainPath + 'reset-password/' + user.email
+        break
+      case 'resetPwd': // inform that user's password is now reset
+        email.subject = 'Your password was reset'
+        break
+      case 'passwordChange': // inform that user's password is now changed
+        email.subject = 'Your password was changed'
+        break
+      case 'identityChange': // inform that user's email has now changed
+        email.subject = 'Your account information was changed'
+        break
+      case 'sendInvitation':
+        if (_.has(user, 'sponsor.name')) {
+          email.sponsor = _.get(user, 'sponsor.name')
+        } else if (_.has(user, 'sponsor.id')) {
+          try {
+            const sponsor = await userService.get(user.sponsor.id)
+            email.sponsor = _.get(sponsor, 'profile.name')
+          } catch (error) {
+            // We will not send the sponsor name in this case
+          }
+        }
+        email.subject = 'Welcome'
+        email.link = domainPath + 'login'
+        emailTemplateDir = 'confirmInvitation'
+        break
+    }
+    const templateDir = path.join(mailerService.options.templateDir, emailTemplateDir)
+    const template = new emails.EmailTemplate(templateDir)
+    // Errors does not seem to be correctly catched by the caller
+    // so we catch them here to avoid any problem
+    try {
+      const emailContent = await template.render({ email, user }, user.locale || 'en-us')
+      // Update compiled content
+      email.html = emailContent.html
+      debug('Sending email ', email)
+      return mailerService.create(email)
+    } catch (error) {
+      debug('Sending email failed', error)
+      app.logger.error(error)
+    }
+  }
+
+  const servicePath = app.get('apiPath') + '/account'
+  const userService = app.getService('users')
+  
+  return new AccountService(app, {
+    // By default it is impossible to reset password if email is not verified
+    // The problem is that if you loose your password before validating your email you are blocked,
+    // as a consequence we release this constraint
+    skipIsVerifiedCheck: true,
+    service: userService.getPath(true),
+    path: servicePath,
+    notifier: options.notifier,
+    reuseResetToken: true
+  })
+}

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

@@ -1,33 +1,33 @@
-import { populateSubjects, populateResource } from '../../hooks/index.js'
-
-export default {
-  before: {
-    all: [],
-    find: [],
-    get: [],
-    create: [populateSubjects, populateResource],
-    update: [],
-    patch: [],
-    remove: [populateSubjects, populateResource]
-  },
-
-  after: {
-    all: [],
-    find: [],
-    get: [],
-    create: [],
-    update: [],
-    patch: [],
-    remove: []
-  },
-
-  error: {
-    all: [],
-    find: [],
-    get: [],
-    create: [],
-    update: [],
-    patch: [],
-    remove: []
-  }
-}
+import { populateSubjects, populateResource } from '../../hooks/index.js'
+
+export default {
+  before: {
+    all: [],
+    find: [],
+    get: [],
+    create: [populateSubjects, populateResource],
+    update: [],
+    patch: [],
+    remove: [populateSubjects, populateResource]
+  },
+
+  after: {
+    all: [],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  },
+
+  error: {
+    all: [],
+    find: [],
+    get: [],
+    create: [],
+    update: [],
+    patch: [],
+    remove: []
+  }
+}