From ce25e787e965803a434fab4dbdcfa2d17bb659c9 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 14 Oct 2025 17:54:58 -0500 Subject: [PATCH 1/2] Implement SAML email edit restriction alert in user profile updates --- resources/lang/en.json | 1 + resources/views/admin/users/edit.blade.php | 11 +++++++++-- resources/views/profile/edit.blade.php | 10 ++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/resources/lang/en.json b/resources/lang/en.json index afbf41e7cd..03ce641c60 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -773,6 +773,7 @@ "Element is not connected": "Element is not connected", "Element": "Element", "Email Address": "Email Address", + "Email address for users created via SAML synchronization cannot be edited manually.": "Email address for users created via SAML synchronization cannot be edited manually.", "Email": "Email", "Embed Media": "Embed Media", "Embed URL": "Embed URL", diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index c6ec688672..7a276fce0c 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -478,9 +478,16 @@ } return true }, + profileUpdate($event) { - if(this.emailHasChanged && !this.ssoUser) { - $('#validateModal').modal('show'); + if (this.emailHasChanged) { + if (this.ssoUser) { + let message = 'Email address for users created via SAML synchronization cannot be edited manually.'; + ProcessMaker.alert(this.$t($message), 'warning'); + return; + } else { + $('#validateModal').modal('show'); + } } else { this.saveProfileChanges(); } diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php index 3ddc8b4de2..85fa5e51a6 100644 --- a/resources/views/profile/edit.blade.php +++ b/resources/views/profile/edit.blade.php @@ -192,8 +192,14 @@ modalVueInstance.$refs.updateAvatarModal.show(); }, profileUpdate() { - if(this.emailHasChanged && !this.ssoUser) { - $('#validateModal').modal('show'); + if(this.emailHasChanged) { + if (this.ssoUser) { + let message = 'Email address for users created via SAML synchronization cannot be edited manually.'; + ProcessMaker.alert(this.$t($message), 'warning'); + return; + } else { + $('#validateModal').modal('show'); + } } else { this.saveProfileChanges(); } From f98013b5e4faaede6bf7c4a7d17f2396b5483216 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 14 Oct 2025 18:08:29 -0500 Subject: [PATCH 2/2] Fix alert message translation for SAML email edit restriction in user profile and admin user edit views --- resources/views/admin/users/edit.blade.php | 2 +- resources/views/profile/edit.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 7a276fce0c..180739726b 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -483,7 +483,7 @@ if (this.emailHasChanged) { if (this.ssoUser) { let message = 'Email address for users created via SAML synchronization cannot be edited manually.'; - ProcessMaker.alert(this.$t($message), 'warning'); + ProcessMaker.alert(this.$t(message), 'warning'); return; } else { $('#validateModal').modal('show'); diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php index 85fa5e51a6..d7d24757a2 100644 --- a/resources/views/profile/edit.blade.php +++ b/resources/views/profile/edit.blade.php @@ -195,7 +195,7 @@ if(this.emailHasChanged) { if (this.ssoUser) { let message = 'Email address for users created via SAML synchronization cannot be edited manually.'; - ProcessMaker.alert(this.$t($message), 'warning'); + ProcessMaker.alert(this.$t(message), 'warning'); return; } else { $('#validateModal').modal('show');