Merge pull request #8566 from ProcessMaker/bugfix/FOUR-26588

[Regression] SAML admin users prompted for password when updating user details

Author: nolanpro

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",

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();
             }

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();
                   }