external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

display flash errors for external auths like saml or oidc on the login screen #6154

Browse source 
Signed-off-by: si458 <simonsmith5521@gmail.com>
This commit is contained in:
si458 2024-06-11 20:06:19 +01:00
parent 74d6252699
commit d7341ab153
5 changed files with 62 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
views/login-mobile.handlebars
View file

@ -356,6 +356,19 @@
}
}
// Display flash error Messages
var flashErrors = JSON.parse('{{{flashErrors}}}');
if (flashErrors && (flashErrors.length > 0)) {
var msg = '';
for (i = 0; i < flashErrors.length; i++) {
if (flashErrors[i]) {
msg += '<span class="msg error"><b style=color:#8C001A>' + flashErrors[i] + '<b></span><br /><br />';
}
}
QH('message1', msg);
QV('message1', true);
}
// If URL arguments are provided, add them to form posts
if (window.location.href.indexOf('?') > 0) {
var urlargs = window.location.href.substring(window.location.href.indexOf('?'));

13
views/login.handlebars
View file

@ -361,6 +361,19 @@
}
}
// Display flash error Messages
var flashErrors = JSON.parse('{{{flashErrors}}}');
if (flashErrors && (flashErrors.length > 0)) {
var msg = '';
for (i = 0; i < flashErrors.length; i++) {
if (flashErrors[i]) {
msg += '<span class="msg error"><b style=color:#8C001A>' + flashErrors[i] + '<b></span><br /><br />';
}
}
QH('message1', msg);
QV('message1', true);
}
// Fix links if a loginKey if used
var urlargs = parseUriArgs();
if (urlargs.key) {

13
views/login2.handlebars
View file

@ -437,6 +437,19 @@
}
}
// Display flash error Messages
var flashErrors = JSON.parse('{{{flashErrors}}}');
if (flashErrors && (flashErrors.length > 0)) {
var msg = '';
for (i = 0; i < flashErrors.length; i++) {
if (flashErrors[i]) {
msg += '<span class="msg error"><b style=color:#8C001A>' + flashErrors[i] + '<b></span><br /><br />';
}
}
QH('message1', msg);
QV('message1', true);
}
// Fix links if a loginKey if used
var urlargs = parseUriArgs();
//if (urlargs.key) { Q('termsLinkFooter').href += '?key=' + urlargs.key; }