Reverted to stable Mongoose version (#2704)

adaptlearning · Aug 14, 2023 · 57eda53 · 57eda53
2 parents facde9a + cb973f9
commit 57eda53
Show file tree

Hide file tree

Showing 4 changed files with 10,905 additions and 8,201 deletions.
diff --git a/lib/application.js b/lib/application.js
@@ -270,7 +270,14 @@ Origin.prototype.createServer = function (options, cb) {
     server.use(session({
       key: 'connect.sid',
       secret: app.configuration.getConfig('sessionSecret'),
-      store: new MongoStore({ uri: db.conn.connectionUri }),
+      store: new MongoStore({ 
+        uri: db.conn.connectionUri,
+        connectionOptions: {
+          domainsEnabled: true,
+          useNewUrlParser: true,
+          useUnifiedTopology: true
+        }
+       }),
       resave: true,
       cookie: {
         signed: true,
@@ -284,9 +291,10 @@ Origin.prototype.createServer = function (options, cb) {
       requestDomain.add(res);
       requestDomain.session = req.session;
       requestDomain.on('error', next);
-      requestDomain.enter();
+      requestDomain.run(next);
+      // requestDomain.enter();
       // requestDomain.run(next());
-      next();
+      // next();
     });
     server.use(auth.initialize());
     server.use(auth.session());

diff --git a/lib/permissions.js b/lib/permissions.js
@@ -494,7 +494,7 @@ exports = module.exports = {
       if(this.shouldIgnore(req.url)) {
         return next(); // route has been explicitly ignored somewhere
       }
-      const user = app.usermanager.getCurrentUser();
+      const user = app.usermanager.getCurrentUser() || JSON.parse(JSON.stringify(req.session.passport.user));
 
       if (!user || !user._id) {
         return res.status(403).json({ statusCode: STATUS.NOT_AUTHENTICATED });