@kalisio/kdk 2.1.6 → 2.1.7

package/core/api/db.js

@@ -1,226 +1,226 @@
-import _ from 'lodash'
-import moment from 'moment'
-import makeDebug from 'debug'
-import mongodb from 'mongodb'
-import errors from '@feathersjs/errors'
-
-const { MongoClient, ObjectID } = mongodb
-const debug = makeDebug('kdk:core:db')
-
-// This ensure moment objects are correctly serialized in MongoDB
-Object.getPrototypeOf(moment()).toBSON = function () {
-  return this.toDate()
-}
-
-export function isObjectID (id) {
-  return id && (typeof id.toHexString === 'function') && (typeof id.getTimestamp === 'function')
-}
-
-export function idToString (id) {
-  return (typeof id === 'object'
-    ? (ObjectID.isValid(id)
-        ? id.toString()
-        : idToString(id._id))
-    : id)
-}
-
-export function createObjectID (id) {
-  // This ensure it works even if id is already an ObjectID
-  if (isObjectID(id)) return id
-  // Take care that numbers could be a valid object ID
-  else if ((typeof id === 'number') || !ObjectID.isValid(id)) return null
-  else return new ObjectID(id)
-}
-
-// Utility function used to convert from string to MongoDB IDs as required eg by queries
-// It only processes _id properties or operators (eg $ne, $in) to be converted
-// If you have others properties to be converted use toObjectIDs
-export function objectifyIDs (object) {
-  // Avoid destructuring already transformed Date, ObjectID or arrays
-  if (_.isPlainObject(object)) {
-    _.forOwn(object, (value, key) => {
-      // Process current attributes or recurse
-      // Take care to nested fields like 'field._id'
-      if (key === '_id' || key.endsWith('._id') || key === '$ne') {
-        if (typeof value === 'string') {
-          const id = createObjectID(value)
-          if (id) {
-            object[key] = id
-          }
-          debug('Objectify ID ' + key, id)
-        } else if (Array.isArray(value)) {
-          debug('Objectify ID array ' + key)
-          object[key] = value.map(id => createObjectID(id)).filter(id => id)
-        } else objectifyIDs(value)
-      } else if (['$in', '$nin'].includes(key)) {
-        debug('Objectify ID array ' + key)
-        const ids = value.map(id => createObjectID(id)).filter(id => id)
-        // Take care that $in/$nin can be used for others types than Object IDs so conversion might fail
-        if (ids.length > 0) object[key] = ids
-      } else if ((key === '$or') || (key === '$and')) {
-        value.forEach(entry => objectifyIDs(entry))
-      } else {
-        if (!Array.isArray(value)) objectifyIDs(value)
-        else value.forEach(entry => objectifyIDs(entry))
-      }
-    })
-  }
-  return object
-}
-
-// Utility function used to convert a fixed set of properties on a given object from string to MongoDB IDs
-export function toObjectIDs (object, properties) {
-  properties.forEach(property => {
-    const value = _.get(object, property)
-    const id = createObjectID(value)
-    if (id) _.set(object, property, id)
-  })
-}
-
-export class Database {
-  constructor (app) {
-    try {
-      this.app = app
-      this._adapter = app.get('db').adapter
-    } catch (error) {
-      throw new errors.GeneralError('Cannot find database adapter configuration in application')
-    }
-    this._collections = new Map()
-  }
-
-  get adapter () {
-    return this._adapter
-  }
-
-  async connect () {
-    // Default implementation
-    return null
-  }
-
-  async disconnect () {
-    // Default implementation
-  }
-
-  async healthcheck () {
-    // Default implementation
-    return false
-  }
-
-  static create (app) {
-    switch (this.adapter) {
-      case 'mongodb':
-      default:
-        return new MongoDatabase(app)
-    }
-  }
-}
-
-export class MongoDatabase extends Database {
-  constructor (app) {
-    super(app)
-    try {
-      // Primary DB
-      this._dbUrl = app.get('db').url
-      // Secondaries if any
-      this._secondaries = app.get('db').secondaries || {}
-    } catch (error) {
-      throw new errors.GeneralError('Cannot find database connection settings in application')
-    }
-  }
-
-  connectionDb (url) {
-    // Extract database name from url. Need to remove the connections options if any
-    let dbName
-    const indexOfDBName = url.lastIndexOf('/') + 1
-    const indexOfOptions = url.indexOf('?')
-    if (indexOfOptions === -1) dbName = url.substring(indexOfDBName)
-    else dbName = url.substring(indexOfDBName, indexOfOptions)
-
-    return dbName
-  }
-
-  async connect () {
-    try {
-      // Connect to primary
-      this._client = await MongoClient.connect(this._dbUrl)
-      this._db = await this._client.db(this.connectionDb(this._dbUrl))
-      debug('Connected to primary DB ' + this.adapter)
-      // Then secondaries if any
-      this._clients = {}
-      this._dbs = {}
-      if (this._secondaries) {
-        const dbNames = _.keys(this._secondaries)
-        for (let i = 0; i < dbNames.length; i++) {
-          const dbName = dbNames[i]
-          const dbUrl = this._secondaries[dbName]
-          this._clients[dbName] = await MongoClient.connect(dbUrl)
-          this._dbs[dbName] = await this._clients[dbName].db(this.connectionDb(dbUrl))
-        }
-        if (dbNames.length > 0) debug('Connected to secondaries DB ' + this.adapter)
-      }
-      return this._db
-    } catch (error) {
-      this.app.logger.error('Could not connect to ' + this.adapter + ' database(s), please check your configuration', error)
-      throw error
-    }
-  }
-
-  async disconnect () {
-    try {
-      await this._client.close()
-      debug('Disconnected from primary DB ' + this.adapter)
-      this._client = null
-      this._db = null
-      if (this._secondaries) {
-        const dbNames = _.keys(this._secondaries)
-        const clients = _.values(this._clients)
-        for (let i = 0; i < clients.length; i++) {
-          await clients[i].close()
-        }
-        this._clients = {}
-        this._dbs = {}
-        if (dbNames.length > 0) debug('Disconnected from secondaries DB ' + this.adapter)
-      }
-    } catch (error) {
-      this.app.logger.error('Could not disconnect from ' + this.adapter + ' database(s)', error)
-      throw error
-    }
-  }
-
-  async healthcheck () {
-    try {
-      await this.instance.admin().ping()
-      if (this._secondaries) {
-        const dbNames = _.keys(this._secondaries)
-        for (let i = 0; i < dbNames.length; i++) {
-          const dbName = dbNames[i]
-          await this._dbs[dbName].admin().ping()
-        }
-      }
-      return true
-    } catch (error) {
-      this.app.logger.error('Healthcheck from ' + this.adapter + ' database(s) failed', error)
-      return false
-    }
-  }
-
-  get client () {
-    return this._client
-  }
-
-  get instance () {
-    return this._db
-  }
-
-  db (dbName) {
-    return (dbName ? this._dbs[dbName] : this._db)
-  }
-
-  collection (name, dbName) {
-    if (!this._collections.has(name)) {
-      // Get collection from secondary or primary DB
-      this._collections.set(name, this.db(dbName).collection(name))
-    }
-    return this._collections.get(name)
-  }
-}
+import _ from 'lodash'
+import moment from 'moment'
+import makeDebug from 'debug'
+import mongodb from 'mongodb'
+import errors from '@feathersjs/errors'
+
+const { MongoClient, ObjectID } = mongodb
+const debug = makeDebug('kdk:core:db')
+
+// This ensure moment objects are correctly serialized in MongoDB
+Object.getPrototypeOf(moment()).toBSON = function () {
+  return this.toDate()
+}
+
+export function isObjectID (id) {
+  return id && (typeof id.toHexString === 'function') && (typeof id.getTimestamp === 'function')
+}
+
+export function idToString (id) {
+  return (typeof id === 'object'
+    ? (ObjectID.isValid(id)
+        ? id.toString()
+        : idToString(id._id))
+    : id)
+}
+
+export function createObjectID (id) {
+  // This ensure it works even if id is already an ObjectID
+  if (isObjectID(id)) return id
+  // Take care that numbers could be a valid object ID
+  else if ((typeof id === 'number') || !ObjectID.isValid(id)) return null
+  else return new ObjectID(id)
+}
+
+// Utility function used to convert from string to MongoDB IDs as required eg by queries
+// It only processes _id properties or operators (eg $ne, $in) to be converted
+// If you have others properties to be converted use toObjectIDs
+export function objectifyIDs (object) {
+  // Avoid destructuring already transformed Date, ObjectID or arrays
+  if (_.isPlainObject(object)) {
+    _.forOwn(object, (value, key) => {
+      // Process current attributes or recurse
+      // Take care to nested fields like 'field._id'
+      if (key === '_id' || key.endsWith('._id') || key === '$ne') {
+        if (typeof value === 'string') {
+          const id = createObjectID(value)
+          if (id) {
+            object[key] = id
+          }
+          debug('Objectify ID ' + key, id)
+        } else if (Array.isArray(value)) {
+          debug('Objectify ID array ' + key)
+          object[key] = value.map(id => createObjectID(id)).filter(id => id)
+        } else objectifyIDs(value)
+      } else if (['$in', '$nin'].includes(key)) {
+        debug('Objectify ID array ' + key)
+        const ids = value.map(id => createObjectID(id)).filter(id => id)
+        // Take care that $in/$nin can be used for others types than Object IDs so conversion might fail
+        if (ids.length > 0) object[key] = ids
+      } else if ((key === '$or') || (key === '$and')) {
+        value.forEach(entry => objectifyIDs(entry))
+      } else {
+        if (!Array.isArray(value)) objectifyIDs(value)
+        else value.forEach(entry => objectifyIDs(entry))
+      }
+    })
+  }
+  return object
+}
+
+// Utility function used to convert a fixed set of properties on a given object from string to MongoDB IDs
+export function toObjectIDs (object, properties) {
+  properties.forEach(property => {
+    const value = _.get(object, property)
+    const id = createObjectID(value)
+    if (id) _.set(object, property, id)
+  })
+}
+
+export class Database {
+  constructor (app) {
+    try {
+      this.app = app
+      this._adapter = app.get('db').adapter
+    } catch (error) {
+      throw new errors.GeneralError('Cannot find database adapter configuration in application')
+    }
+    this._collections = new Map()
+  }
+
+  get adapter () {
+    return this._adapter
+  }
+
+  async connect () {
+    // Default implementation
+    return null
+  }
+
+  async disconnect () {
+    // Default implementation
+  }
+
+  async healthcheck () {
+    // Default implementation
+    return false
+  }
+
+  static create (app) {
+    switch (this.adapter) {
+      case 'mongodb':
+      default:
+        return new MongoDatabase(app)
+    }
+  }
+}
+
+export class MongoDatabase extends Database {
+  constructor (app) {
+    super(app)
+    try {
+      // Primary DB
+      this._dbUrl = app.get('db').url
+      // Secondaries if any
+      this._secondaries = app.get('db').secondaries || {}
+    } catch (error) {
+      throw new errors.GeneralError('Cannot find database connection settings in application')
+    }
+  }
+
+  connectionDb (url) {
+    // Extract database name from url. Need to remove the connections options if any
+    let dbName
+    const indexOfDBName = url.lastIndexOf('/') + 1
+    const indexOfOptions = url.indexOf('?')
+    if (indexOfOptions === -1) dbName = url.substring(indexOfDBName)
+    else dbName = url.substring(indexOfDBName, indexOfOptions)
+
+    return dbName
+  }
+
+  async connect () {
+    try {
+      // Connect to primary
+      this._client = await MongoClient.connect(this._dbUrl)
+      this._db = await this._client.db(this.connectionDb(this._dbUrl))
+      debug('Connected to primary DB ' + this.adapter)
+      // Then secondaries if any
+      this._clients = {}
+      this._dbs = {}
+      if (this._secondaries) {
+        const dbNames = _.keys(this._secondaries)
+        for (let i = 0; i < dbNames.length; i++) {
+          const dbName = dbNames[i]
+          const dbUrl = this._secondaries[dbName]
+          this._clients[dbName] = await MongoClient.connect(dbUrl)
+          this._dbs[dbName] = await this._clients[dbName].db(this.connectionDb(dbUrl))
+        }
+        if (dbNames.length > 0) debug('Connected to secondaries DB ' + this.adapter)
+      }
+      return this._db
+    } catch (error) {
+      this.app.logger.error('Could not connect to ' + this.adapter + ' database(s), please check your configuration', error)
+      throw error
+    }
+  }
+
+  async disconnect () {
+    try {
+      await this._client.close()
+      debug('Disconnected from primary DB ' + this.adapter)
+      this._client = null
+      this._db = null
+      if (this._secondaries) {
+        const dbNames = _.keys(this._secondaries)
+        const clients = _.values(this._clients)
+        for (let i = 0; i < clients.length; i++) {
+          await clients[i].close()
+        }
+        this._clients = {}
+        this._dbs = {}
+        if (dbNames.length > 0) debug('Disconnected from secondaries DB ' + this.adapter)
+      }
+    } catch (error) {
+      this.app.logger.error('Could not disconnect from ' + this.adapter + ' database(s)', error)
+      throw error
+    }
+  }
+
+  async healthcheck () {
+    try {
+      await this.instance.admin().ping()
+      if (this._secondaries) {
+        const dbNames = _.keys(this._secondaries)
+        for (let i = 0; i < dbNames.length; i++) {
+          const dbName = dbNames[i]
+          await this._dbs[dbName].admin().ping()
+        }
+      }
+      return true
+    } catch (error) {
+      this.app.logger.error('Healthcheck from ' + this.adapter + ' database(s) failed', error)
+      return false
+    }
+  }
+
+  get client () {
+    return this._client
+  }
+
+  get instance () {
+    return this._db
+  }
+
+  db (dbName) {
+    return (dbName ? this._dbs[dbName] : this._db)
+  }
+
+  collection (name, dbName) {
+    if (!this._collections.has(name)) {
+      // Get collection from secondary or primary DB
+      this._collections.set(name, this.db(dbName).collection(name))
+    }
+    return this._collections.get(name)
+  }
+}

package/core/api/hooks/hooks.authentication.js

@@ -1,74 +1,74 @@
-import makeDebug from 'debug'
-import common from 'feathers-hooks-common'
-import local from '@feathersjs/authentication-local'
-
-const debug = makeDebug('kdk:core:authentication:hooks')
-const { discard } = common
-
-// Make it more easy to acces
-export const hashPassword = local.hooks.hashPassword
-
-export async function verifyGuest (hook) {
-  if (hook.type !== 'after') {
-    throw new Error('The \'verifyGuest\' hook should only be used as a \'after\' hook.')
-  }
-  const app = hook.app
-  const user = hook.result.user
-  debug('verifyGuest hook called on ', user._id)
-
-  // Check whether the user has been inivted. If not, nothing to do
-  if (!user.sponsor) {
-    debug('Logged user is not a guest')
-    return hook
-  }
-
-  // Check whether has been already verified. If yes, nothing to do
-  if (user.isVerified) {
-    debug('Logged guest is already verified')
-    return hook
-  }
-
-  // The user is a guest and need to be verified
-  debug('Verifying logged guest')
-  const userService = app.getService('users')
-  await userService.patch(user._id, { isVerified: true })
-
-  return hook
-}
-
-export async function consentGuest (hook) {
-  if (hook.type !== 'after') {
-    throw new Error('The \'consentGuest\' hook should only be used as a \'after\' hook.')
-  }
-  const app = hook.app
-  const user = hook.result.user
-  debug('consentGuest hook called on ', user._id)
-
-  // Check whether the user has been invited. If not, nothing to do
-  if (!user.sponsor) {
-    debug('Logged user is not a guest')
-    return hook
-  }
-
-  // Check whether consent has been already checked. If yes, nothing to do
-  if (user.consentTerms) {
-    debug('Logged guest is already verified')
-    return hook
-  }
-
-  // The user is a guest and need to be consent
-  debug('Consenting logged guest')
-  const userService = app.getService('users')
-  await userService.patch(user._id, { consentTerms: true, expireAt: null })
-
-  return hook
-}
-
-export function discardAuthenticationProviders (hook) {
-  const providers = hook.app.authenticationProviders || []
-  
-  // Iterate through known providers
-  for (const provider of providers) {
-    discard(provider)(hook)
-  }
+import makeDebug from 'debug'
+import common from 'feathers-hooks-common'
+import local from '@feathersjs/authentication-local'
+
+const debug = makeDebug('kdk:core:authentication:hooks')
+const { discard } = common
+
+// Make it more easy to acces
+export const hashPassword = local.hooks.hashPassword
+
+export async function verifyGuest (hook) {
+  if (hook.type !== 'after') {
+    throw new Error('The \'verifyGuest\' hook should only be used as a \'after\' hook.')
+  }
+  const app = hook.app
+  const user = hook.result.user
+  debug('verifyGuest hook called on ', user._id)
+
+  // Check whether the user has been inivted. If not, nothing to do
+  if (!user.sponsor) {
+    debug('Logged user is not a guest')
+    return hook
+  }
+
+  // Check whether has been already verified. If yes, nothing to do
+  if (user.isVerified) {
+    debug('Logged guest is already verified')
+    return hook
+  }
+
+  // The user is a guest and need to be verified
+  debug('Verifying logged guest')
+  const userService = app.getService('users')
+  await userService.patch(user._id, { isVerified: true })
+
+  return hook
+}
+
+export async function consentGuest (hook) {
+  if (hook.type !== 'after') {
+    throw new Error('The \'consentGuest\' hook should only be used as a \'after\' hook.')
+  }
+  const app = hook.app
+  const user = hook.result.user
+  debug('consentGuest hook called on ', user._id)
+
+  // Check whether the user has been invited. If not, nothing to do
+  if (!user.sponsor) {
+    debug('Logged user is not a guest')
+    return hook
+  }
+
+  // Check whether consent has been already checked. If yes, nothing to do
+  if (user.consentTerms) {
+    debug('Logged guest is already verified')
+    return hook
+  }
+
+  // The user is a guest and need to be consent
+  debug('Consenting logged guest')
+  const userService = app.getService('users')
+  await userService.patch(user._id, { consentTerms: true, expireAt: null })
+
+  return hook
+}
+
+export function discardAuthenticationProviders (hook) {
+  const providers = hook.app.authenticationProviders || []
+  
+  // Iterate through known providers
+  for (const provider of providers) {
+    discard(provider)(hook)
+  }
 }