Skip to content

FOUR-21445 email field cannot be updated for users imported from AD or SAML #7871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryancooley merged 1 commit into from
Jan 23, 2025
Merged

FOUR-21445 email field cannot be updated for users imported from AD or SAML #7871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,15 @@ function ($result, $item) {
);
$ssoUser = false;
if (class_exists(SsoUser::class)) {
// Check if the user is an SSO user (including SAML)
$ssoUser = SsoUser::where('user_id', $user->id)->exists();
}

// Check if the user is an LDAP user
if (isset($user->meta?->authenticationType) && $user->meta->authenticationType === 'ldap') {
$ssoUser = true;
}

// Get global and valid 2FA preferences for the user
$enabled2FA = config('password-policies.2fa_enabled', false);
$global2FAEnabled = config('password-policies.2fa_method', []);
Expand Down
6 changes: 6 additions & 0 deletions ProcessMaker/Http/Controllers/ProfileController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,15 @@ function ($result, $item) {

$ssoUser = false;
if (class_exists(SsoUser::class)) {
// Check if the user is an SSO user (including SAML)
$ssoUser = SsoUser::where('user_id', $currentUser->id)->exists();
}

// Check if the user is an LDAP user
if (isset($currentUser->meta?->authenticationType) && $currentUser->meta->authenticationType === 'ldap') {
$ssoUser = true;
}

// Get global and valid 2FA preferences for the user
$enabled2FA = config('password-policies.2fa_enabled', false);
$global2FAEnabled = config('password-policies.2fa_method', []);
Expand Down