fix minify with flasherrors and pin passport modules versions #7386
Signed-off-by: si458 <simonsmith5521@gmail.com>
si458 committed
Oct 31, 2025 at 20:09 UTC
ad8b2e366bed158a2b68963cabec19a62ecd2c34
3 files changed
+6
-7
meshcentral.js
+5
-5
@@ -4299,11 +4299,11 @@ function mainStart() {
4299
if (mstsc == false) { config.domains[i].mstsc = false; }
4300
if (config.domains[i].ssh == true) { ssh = true; }
4301
if ((typeof config.domains[i].authstrategies == 'object')) {
4302
- if (passport.indexOf('passport') == -1) { passport.push('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
4303
- 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'); }
4304
- 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'); }
4305
- 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'); }
4306
- 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'); }
4302
+ if (passport.indexOf('passport') == -1) { passport.push('passport@0.7.0','connect-flash@0.1.1'); } // Passport v0.6.0 requires a patch, see https://github.com/jaredhanson/passport/issues/904 and include connect-flash here to display errors
4303
+ 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@1.0.4'); }
4304
+ 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@2.0.0'); }
4305
+ 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@0.1.12'); }
4306
+ 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@0.1.0'); passport.push('jwt-simple@0.5.6'); }
4307
if ((typeof config.domains[i].authstrategies.oidc == 'object') && (passport.indexOf('openid-client@5.7.1') == -1)) {
4308
if ((nodeVersion >= 17)
4309
|| ((Math.floor(nodeVersion) == 16) && (nodeVersion >= 16.13))
translate/translate.js
-1
@@ -453,7 +453,6 @@ async function startEx(argv) {
453
removeScriptTypeAttributes: true,
454
removeTagWhitespace: true,
455
preserveLineBreaks: false,
456
- useShortDoctype: true,
456
log: function(a) { if (typeof a !== 'string') { console.log(a); } } // Log errors from UglifyJS to console output
457
});
458
} catch (ex) {
webserver.js
+1
-1
@@ -3526,7 +3526,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
3526
}),
3527
hkey: encodeURIComponent(hardwareKeyChallenge).replace(/'/g, '%27'),
3528
messageid: msgid,
3529
- flashErrors: JSON.stringify(flashErrors),
3529
+ flashErrors: JSON.stringify(flashErrors).replace(/"/g, '\\"'),
3530
passhint: passhint,
3531
3532
welcometext: domain.welcometext ? encodeURIComponent(obj.common.replacePlaceholders(domain.welcometext, {