@tiledesk/tiledesk-server 2.4.32 → 2.4.34

package/app.js

@@ -72,6 +72,7 @@ var connection = mongoose.connect(databaseUri, { "useNewUrlParser": true, "autoI
     winston.error('Failed to connect to MongoDB on ' + databaseUri + " ", err);
     process.exit(1);
   }
+  winston.info("Mongoose connection done on host: "+mongoose.connection.host + " on port: " + mongoose.connection.port + " with name: "+ mongoose.connection.name)// , mongoose.connection.db);
 });
 if (process.env.MONGOOSE_DEBUG==="true") {
   mongoose.set('debug', true);
@@ -133,6 +134,7 @@ var schemaMigrationService = require('./services/schemaMigrationService');
 var RouterLogger = require('./models/routerLogger');
 var cacheEnabler = require("./services/cacheEnabler");
 const session = require('express-session');
+const RedisStore = require("connect-redis").default
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -275,11 +277,49 @@ app.use(passport.initialize());
 if (process.env.DISABLE_SESSION_STRATEGY==true ||  process.env.DISABLE_SESSION_STRATEGY=="true" ) {
   winston.info("Express Session disabled");
 } else {
+
   // https://www.npmjs.com/package/express-session
   let sessionSecret = process.env.SESSION_SECRET || "tiledesk-session-secret";
-  winston.info("Express Session Secret: " + sessionSecret);
-  app.use(session({ secret: sessionSecret}));
+
+  if (process.env.ENABLE_REDIS_SESSION==true ||  process.env.ENABLE_REDIS_SESSION=="true" ) {
+  
+      // Initialize client.
+      // let redisClient = createClient()
+      // redisClient.connect().catch(console.error)
+
+      let cacheClient = undefined;
+      if (pubModulesManager.cache) {
+        cacheClient = pubModulesManager.cache._cache._cache;  //_cache._cache to jump directly to redis modules without cacheoose wrapper (don't support await)
+      }
+      // winston.info("Express Session cacheClient",cacheClient);
+
+
+      let redisStore = new RedisStore({
+        client: cacheClient,
+        prefix: "sessions:",
+      })
+
+
+      app.use(
+        session({
+          store: redisStore,
+          resave: false, // required: force lightweight session keep alive (touch)
+          saveUninitialized: false, // recommended: only save session when data exists
+          secret: sessionSecret
+        })
+      )
+      winston.info("Express Session with Redis enabled with Secret: " + sessionSecret);
+
+
+  } else {
+    app.use(session({ secret: sessionSecret}));
+    winston.info("Express Session enabled with Secret: " + sessionSecret);
+
+  }
+
   app.use(passport.session());
+  
+  
 }
 
 //ATTENTION. If you use AWS Api Gateway you need also to configure the cors policy https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-cors-console.html

package/middleware/passport.js

@@ -459,7 +459,8 @@ if (enableGoogleSignin==true) {
   passport.use(new GoogleStrategy({
     clientID: googleClientId, 
     clientSecret: googleClientSecret,
-    callbackURL: googleCallbackURL  // 'https://www.example.com/oauth2/redirect/google'
+    callbackURL: googleCallbackURL,  // 'https://www.example.com/oauth2/redirect/google'
+    // stateless: true ????
   },
   function(issuer, profile, cb) {
 
@@ -538,8 +539,15 @@ if (enableGoogleSignin==true) {
             return cb(null, savedUser);
           });
         }).catch(function(err) {
-          winston.error("Error signup google ", err);
-          return cb(err); 
+          // if (err.code == 11000) {
+          
+
+            
+          // } else {
+            winston.error("Error signup google ", err);
+            return cb(err); 
+          // }
+         
         });
       } else {
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.32",
+  "version": "2.4.34",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -29,11 +29,11 @@
     "tiledesk-server": "./bin/www"
   },
   "optionalDependencies": {
+    "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0",
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
     "@tiledesk-ent/tiledesk-server-payments": "^1.1.12",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
-    "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1",
-    "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
+    "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1"
   },
   "dependencies": {
     "@tiledesk/tiledesk-apps": "^1.0.16",
@@ -51,6 +51,7 @@
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.20.0",
     "cachegoose": "^8.0.0",
+    "connect-redis": "^7.1.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "csv-express": "^1.2.2",

package/routes/files.js

@@ -81,7 +81,7 @@ router.get("/download", (req, res) => {
   winston.debug('path', req.query.path);
   // if (path.indexOf("/users/"))
   let filename = pathlib.basename(req.query.path);
-  winston.info("filename:"+filename);
+  winston.debug("filename:"+filename);
 
   res.attachment(filename);
   fileService.getFileDataAsStream(req.query.path).pipe(res);