chore: merge master

Author: ghusse

CHANGELOG.md

@@ -20,6 +20,20 @@
 * **filter:** add possibility to filter on smart field ([090a902](https://github.com/ForestAdmin/forest-express-mongoose/commit/090a902d1f85cc082b0d4176343a19f823e3421d))
 * **filter:** add possibility to filter on smart field ([#478](https://github.com/ForestAdmin/forest-express-mongoose/issues/478)) ([e27feca](https://github.com/ForestAdmin/forest-express-mongoose/commit/e27feca408f26efcf61d65e7b47a1d9ae1ad2dfc))
 
+# [7.0.0-beta.4](https://github.com/ForestAdmin/forest-express-mongoose/compare/v7.0.0-beta.3...v7.0.0-beta.4) (2021-01-08)
+
+
+### Bug Fixes
+
+* **authentication:** error when authenticating with an invalid token in cookies ([#476](https://github.com/ForestAdmin/forest-express-mongoose/issues/476)) ([e61460a](https://github.com/ForestAdmin/forest-express-mongoose/commit/e61460a8c35d2bae86a9c915908ae1a8146243c3))
+
+# [7.0.0-beta.3](https://github.com/ForestAdmin/forest-express-mongoose/compare/v7.0.0-beta.2...v7.0.0-beta.3) (2021-01-06)
+
+
+### Bug Fixes
+
+* user being disconnected after 33min instead of 14 days ([#474](https://github.com/ForestAdmin/forest-express-mongoose/issues/474)) ([8a70566](https://github.com/ForestAdmin/forest-express-mongoose/commit/8a70566653c52c4447668cbe9e383488e4c3a071))
+
 ## [6.6.3](https://github.com/ForestAdmin/forest-express-mongoose/compare/v6.6.2...v6.6.3) (2020-12-21)
 
 
@@ -47,6 +61,7 @@
 ### Features
 
 * **smart actions:** introduce smart action forms hooks ([#459](https://github.com/ForestAdmin/forest-express-mongoose/issues/459)) ([a7c8183](https://github.com/ForestAdmin/forest-express-mongoose/commit/a7c81838b27333b90d90815a6209c4a713176ad9))
+* **role-permissions:**  support the new role ACL format ([#577](https://github.com/ForestAdmin/forest-express/issues/569)) ([4aed30f](https://github.com/ForestAdmin/forest-express/commit/4aed30fefabf616360a05e54e7b4c6ff71c7a038))
 
 ## [6.5.2](https://github.com/ForestAdmin/forest-express-mongoose/compare/v6.5.1...v6.5.2) (2020-12-03)
 
@@ -56,6 +71,18 @@
 * **filters:** ensure 'is present' behaves as in forest-express-sequelize ([1a914c1](https://github.com/ForestAdmin/forest-express-mongoose/commit/1a914c1c611b5c2a13b001546b0de6081c6a25d0))
 * **filters:** ensure 'is present' behaves as in forest-express-sequelize ([fb3d531](https://github.com/ForestAdmin/forest-express-mongoose/commit/fb3d5311b2b4269edffba688dfe3b3bd3c98dd42))
 
+# [7.0.0-beta.2](https://github.com/ForestAdmin/forest-express-mongoose/compare/v7.0.0-beta.1...v7.0.0-beta.2) (2020-12-02)
+
+
+### Bug Fixes
+
+* **smart fields:** compute properly smart fields with mongoose ([#453](https://github.com/ForestAdmin/forest-express-mongoose/issues/453)) ([55c33f7](https://github.com/ForestAdmin/forest-express-mongoose/commit/55c33f774b1b4fe4f2c490d6b0ac354a5d7c8f5f))
+* export error handler middleware ([#443](https://github.com/ForestAdmin/forest-express-mongoose/issues/443)) ([220f4c3](https://github.com/ForestAdmin/forest-express-mongoose/commit/220f4c37b9d0b1e652ce3e4c9489c49932a7abc8))
+
+### Features
+
+* **smart actions:** endpoint that handle forms' load hooks ([86b15a3](https://github.com/ForestAdmin/forest-express-mongoose/commit/86b15a37bdf2f702142b83fbc0882a8cfd6c7359))
+
 ## [6.5.1](https://github.com/ForestAdmin/forest-express-mongoose/compare/v6.5.0...v6.5.1) (2020-12-01)
 
 
@@ -77,6 +104,20 @@
 
 * export error handler middleware ([#443](https://github.com/ForestAdmin/forest-express-mongoose/issues/443)) ([220f4c3](https://github.com/ForestAdmin/forest-express-mongoose/commit/220f4c37b9d0b1e652ce3e4c9489c49932a7abc8))
 
+# [7.0.0-beta.1](https://github.com/ForestAdmin/forest-express-mongoose/compare/v6.4.0...v7.0.0-beta.1) (2020-11-24)
+
+
+### Features
+
+* init function now uses connections & objectMapping instead of sequelize as parameter ([#432](https://github.com/ForestAdmin/forest-express-mongoose/issues/432)) ([97b2ac2](https://github.com/ForestAdmin/forest-express-mongoose/commit/97b2ac2e29374de51435c5dff79fd033b41b74eb))
+
+
+### BREAKING CHANGES
+
+* mongoose options is not supported anymore by Liana.init()
+connections and objectMapping is now required on Liana.init().
+Update forest-express dependency to 8.0.0-beta.1 (See https://github.com/ForestAdmin/forest-express/tree/v8.0.0-beta.1)
+
 # [6.4.0](https://github.com/ForestAdmin/forest-express-mongoose/compare/v6.3.10...v6.4.0) (2020-11-17)
 
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "forest-express-mongoose",
   "description": "Official Express/Mongoose Liana for Forest",
-  "version": "6.7.2",
+  "version": "7.0.0-beta.4",
   "author": "Sandro Munda <[email protected]>",
   "contributors": [
     "Arnaud Besnier <[email protected]>",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@babel/runtime": "7.10.1",
     "bluebird": "2.9.25",
-    "forest-express": "7.9.6",
+    "forest-express": "8.0.0-beta.11",
     "http-errors": "1.7.2",
     "lodash": "4.17.19",
     "moment": "2.24.0",

src/adapters/mongoose.js

@@ -2,7 +2,6 @@ const P = require('bluebird');
 const _ = require('lodash');
 const Interface = require('forest-express');
 const utils = require('../utils/schema');
-const mongooseUtils = require('../services/mongoose-utils');
 
 /* eslint-disable */
 function unflatten(data) {
@@ -27,15 +26,14 @@ function unflatten(data) {
 module.exports = (model, opts) => {
   const fields = [];
   const paths = unflatten(model.schema.paths);
-  const { mongoose } = opts;
+  const { Mongoose } = opts;
   // NOTICE: mongoose.base is used when opts.mongoose is not the default connection.
-  const Schema = mongoose.Schema || mongoose.base.Schema;
   let schemaType;
 
   function formatRef(ref) {
-    const models = mongooseUtils.getModels(opts);
-    if (models[ref]) {
-      return utils.getModelName(models[ref]);
+    const referenceModel = utils.getReferenceModel(opts, ref);
+    if (referenceModel) {
+      return utils.getModelName(referenceModel);
     }
     Interface.logger.warn(`Cannot find the reference "${ref}" on the model "${model.modelName}".`);
     return null;
@@ -105,7 +103,7 @@ module.exports = (model, opts) => {
     if (_.isFunction(type) && type.name === 'ObjectId') {
       return 'String';
     }
-    if (type instanceof Schema) {
+    if (type instanceof Mongoose.Schema) {
       return schemaType(type);
     }
 
@@ -138,7 +136,7 @@ module.exports = (model, opts) => {
         || _.keys(fieldInfo.caster.options).length === 0)) {
         return [getTypeFromMongoose(fieldInfo.caster)];
       }
-      if (fieldInfo.options.type[0] instanceof Schema) {
+      if (fieldInfo.options.type[0] instanceof Mongoose.Schema) {
         // Schema
         return [schemaType(fieldInfo.options.type[0])];
       }
@@ -212,7 +210,7 @@ module.exports = (model, opts) => {
       || (
         fieldInfo.path === '_id'
         && !fieldInfo.options.auto
-        && fieldInfo.options.type !== mongoose.Schema.ObjectId
+        && fieldInfo.options.type !== Mongoose.ObjectId
       );
   }
 

src/index.js

@@ -3,7 +3,6 @@ const P = require('bluebird');
 const Interface = require('forest-express');
 const utils = require('./utils/schema');
 const orm = require('./utils/orm');
-const mongooseUtils = require('./services/mongoose-utils');
 
 const REGEX_VERSION = /(\d+\.)?(\d+\.)?(\*|\d+)/;
 
@@ -29,11 +28,18 @@ exports.PUBLIC_ROUTES = Interface.PUBLIC_ROUTES;
 exports.init = (opts) => {
   exports.opts = opts;
 
-  // NOTICE: Ensure compatibility with the old middleware configuration.
-  if (!('connections' in opts)) {
-    opts.connections = [opts.mongoose];
+  if (!opts.objectMapping) {
+    Interface.logger.error('The objectMapping option appears to be missing. Please make sure it is set correctly.');
+    return Promise.resolve(() => {});
   }
 
+  if (opts.mongoose) {
+    Interface.logger.warn('The mongoose option is not supported anymore. Please remove this option.');
+  }
+
+  opts.Mongoose = opts.objectMapping;
+  opts.useMultipleDatabases = Object.keys(opts.connections).length > 1;
+
   exports.getLianaName = () => 'forest-express-mongoose';
 
   exports.getLianaVersion = () => {
@@ -44,17 +50,12 @@ exports.init = (opts) => {
     return null;
   };
 
-  exports.getOrmVersion = () => {
-    if (!opts.mongoose) { return null; }
-    return orm.getVersion(opts.mongoose);
-  };
+  exports.getOrmVersion = () => orm.getVersion(opts.Mongoose);
 
-  exports.getDatabaseType = () => 'MongoDB';
+  exports.getDatabaseType = () => (opts.useMultipleDatabases ? 'multiple' : 'MongoDB');
 
   exports.SchemaAdapter = require('./adapters/mongoose');
 
-  exports.getModels = () => mongooseUtils.getModels(opts);
-
   exports.getModelName = utils.getModelName;
   // TODO: Remove nameOld attribute once the lianas versions older than 2.0.0 are minority
   exports.getModelNameOld = utils.getModelNameOld;

src/services/filters-parser.js

@@ -18,7 +18,7 @@ function FiltersParser(model, timezone, options) {
   const parseString = (value) => {
     // NOTICE: Check if the value is a real ObjectID. By default, the isValid method returns true
     //         for a random string with length 12 (example: 'Black Friday').
-    const { ObjectId } = options.mongoose.Types;
+    const { ObjectId } = options.Mongoose.Types;
     if (ObjectId.isValid(value) && ObjectId(value).toString() === value) {
       return ObjectId(value);
     }

src/services/has-many-getter.js

@@ -49,7 +49,7 @@ function HasManyGetter(model, association, opts, params) {
     return new P((resolve, reject) => {
       let id = params.recordId;
       if (OBJECTID_REGEXP.test(params.recordId)) {
-        id = opts.mongoose.Types.ObjectId(id);
+        id = opts.Mongoose.Types.ObjectId(id);
       }
 
       return model

src/services/mongoose-utils.js

@@ -47,7 +47,7 @@ function QueryBuilder(model, params, opts) {
         return this;
       }
 
-      const referencedKey = field.reference.split('.')[1];
+      const referencedKey = utils.getReferenceField(field.reference);
       const subModel = utils.getReferenceModel(opts, field.reference);
       joinQuery.push({
         $lookup: {
@@ -111,7 +111,7 @@ function QueryBuilder(model, params, opts) {
   };
 
   this.addCountToQuery = (jsonQuery) => {
-    if (Orm.hasRequiredVersion(opts.mongoose, '3.4')) {
+    if (Orm.hasRequiredVersion(opts.Mongoose, '3.4')) {
       jsonQuery.push({ $count: 'count' });
     } else {
       jsonQuery.push({ $group: { _id: null, count: { $sum: 1 } } });

src/services/query-builder.js

@@ -30,7 +30,7 @@ function SearchBuilder(model, opts, params, searchFields) {
 
       if (value.instance === 'ObjectID') {
         if (new RegExp('^[0-9a-fA-F]{24}$').test(params.search)) {
-          condition[key] = opts.mongoose.Types.ObjectId(params.search);
+          condition[key] = opts.Mongoose.Types.ObjectId(params.search);
           pushCondition(condition, key);
         }
       } else if (value.instance === 'Number') {

src/services/search-builder.js

@@ -1,8 +1,8 @@
-const mongooseUtils = require('../services/mongoose-utils');
-
 exports.getReferenceModel = (options, reference) => {
-  const models = mongooseUtils.getModels(options);
-  return models[exports.getReferenceCollectionName(reference)];
+  const { connections } = options;
+  return Object.values(connections)
+    .reduce((models, connection) => models.concat(Object.values(connection.models)), [])
+    .find((model) => exports.getModelName(model) === exports.getReferenceCollectionName(reference));
 };
 
 exports.getReferenceField = (reference) => reference.split('.')[1];