Minor fixes.
Ylian Saint-Hilaire committed
Sep 6, 2022 at 17:52 UTC
d25bfeafa5f2c7e2a51688d0706e6ca2727e571c
2 files changed
+1
-8
meshcentral.js
+1
-7
@@ -3947,13 +3947,7 @@ function mainStart() {
3947
if ((typeof config.domains[i].authstrategies.reddit == 'object') && (typeof config.domains[i].authstrategies.reddit.clientid == 'string') && (typeof config.domains[i].authstrategies.reddit.clientsecret == 'string') && (passport.indexOf('passport-reddit') == -1)) { passport.push('passport-reddit'); }
3948
if ((typeof config.domains[i].authstrategies.azure == 'object') && (typeof config.domains[i].authstrategies.azure.clientid == 'string') && (typeof config.domains[i].authstrategies.azure.clientsecret == 'string') && (typeof config.domains[i].authstrategies.azure.tenantid == 'string') && (passport.indexOf('passport-azure-oauth2') == -1)) { passport.push('passport-azure-oauth2'); passport.push('jwt-simple'); }
3949
if ((typeof config.domains[i].authstrategies.oidc == 'object') && (typeof config.domains[i].authstrategies.oidc.clientid == 'string') && (typeof config.domains[i].authstrategies.oidc.clientsecret == 'string') && (typeof config.domains[i].authstrategies.oidc.issuer == 'string') && (passport.indexOf('@mstrhakr/passport-openidconnect') == -1)) {
3950
- if ((nodeVersion >= 17) || ((Math.floor(nodeVersion) == 16) && (nodeVersion >= 16.13)) || ((Math.floor(nodeVersion) == 14) && (nodeVersion >= 14.15)) || ((Math.floor(nodeVersion) == 12) && (nodeVersion >= 12.19))) {
3951
- passport.push('@mstrhakr/passport-openidconnect');
3952
- passport.push('openid-client');
3953
- } else {
3954
- addServerWarning('This NodeJS version does not support OpenID.', 25);
3955
- delete config.domains[i].authstrategies.oidc;
3956
- }
3950
+ if ((nodeVersion >= 17) || ((Math.floor(nodeVersion) == 16) && (nodeVersion >= 16.13)) || ((Math.floor(nodeVersion) == 14) && (nodeVersion >= 14.15)) || ((Math.floor(nodeVersion) == 12) && (nodeVersion >= 12.19))) { passport.push('@mstrhakr/passport-openidconnect'); passport.push('openid-client'); } else { addServerWarning('This NodeJS version does not support OpenID.', 25); delete config.domains[i].authstrategies.oidc; }
3951
}
3952
if ((typeof config.domains[i].authstrategies.saml == 'object') || (typeof config.domains[i].authstrategies.jumpcloud == 'object')) { passport.push('passport-saml'); }
3953
}
views/default.handlebars
-1
@@ -2322,7 +2322,6 @@
2322
break;
2323
}
2324
case 'serverwarnings': {
2325
- console.log(message);
2325
if ((message.warnings != null) && (message.warnings.length > 0)) {
2326
var ServerWarnings = {
2327
1: "MeshCentral SSH support requires NodeJS 11 or higher.",