include connect-flash with passport to allow displaying of errors
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Jun 17, 2024 at 10:10 UTC
7955bc49549be93b8605f9f825e27ab2261bb5f7
1 file changed
+1
-2
meshcentral.js
+1
-2
@@ -4033,7 +4033,7 @@ function mainStart() {
4033
if (mstsc == false) { config.domains[i].mstsc = false; }
4034
if (config.domains[i].ssh == true) { ssh = true; }
4035
if ((typeof config.domains[i].authstrategies == 'object')) {
4036
- if (passport == null) { passport = ['passport']; } // Passport v0.6.0 requires a patch, see https://github.com/jaredhanson/passport/issues/904
4036
+ if (passport == null) { passport = ['passport','connect-flash']; } // Passport v0.6.0 requires a patch, see https://github.com/jaredhanson/passport/issues/904 and include connect-flash here to display errors
4037
if ((typeof config.domains[i].authstrategies.twitter == 'object') && (typeof config.domains[i].authstrategies.twitter.clientid == 'string') && (typeof config.domains[i].authstrategies.twitter.clientsecret == 'string') && (passport.indexOf('passport-twitter') == -1)) { passport.push('passport-twitter'); }
4038
if ((typeof config.domains[i].authstrategies.google == 'object') && (typeof config.domains[i].authstrategies.google.clientid == 'string') && (typeof config.domains[i].authstrategies.google.clientsecret == 'string') && (passport.indexOf('passport-google-oauth20') == -1)) { passport.push('passport-google-oauth20'); }
4039
if ((typeof config.domains[i].authstrategies.github == 'object') && (typeof config.domains[i].authstrategies.github.clientid == 'string') && (typeof config.domains[i].authstrategies.github.clientsecret == 'string') && (passport.indexOf('passport-github2') == -1)) { passport.push('passport-github2'); }
@@ -4044,7 +4044,6 @@ function mainStart() {
4044
|| ((Math.floor(nodeVersion) == 14) && (nodeVersion >= 14.15))
4045
|| ((Math.floor(nodeVersion) == 12) && (nodeVersion >= 12.19))) {
4046
passport.push('openid-client');
4047
- passport.push('connect-flash');
4047
} else {
4048
addServerWarning('This NodeJS version does not support OpenID Connect on MeshCentral.', 25);
4049
delete config.domains[i].authstrategies.oidc;