nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

choose other emails when primary not available (#2188)

Browse Source
This commit is contained in:
Kyle Spearrin 2022-08-15 09:44:38 -04:00 committed by GitHub
parent 5cbdee1379
commit a89bfdfe2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bitwarden_license/src/Scim/Controllers/v2/UsersController.cs
View File

@ -135,6 +135,11 @@ namespace Bit.Scim.Controllers.v2
email = model.UserName?.ToLowerInvariant(); email = model.UserName?.ToLowerInvariant();
break; break;
default: default:
email = model.WorkEmail?.ToLowerInvariant();
if (string.IsNullOrWhiteSpace(email))
{
email = model.Emails?.FirstOrDefault()?.Value?.ToLowerInvariant();
}
break; break;
} }
} }

1
bitwarden_license/src/Scim/Models/BaseScimUserModel.cs
View File

@ -16,6 +16,7 @@ namespace Bit.Scim.Models
public NameModel Name { get; set; } public NameModel Name { get; set; }
public List<EmailModel> Emails { get; set; } public List<EmailModel> Emails { get; set; }
public string PrimaryEmail => Emails?.FirstOrDefault(e => e.Primary)?.Value; public string PrimaryEmail => Emails?.FirstOrDefault(e => e.Primary)?.Value;
public string WorkEmail => Emails?.FirstOrDefault(e => e.Type == "work")?.Value;
public string DisplayName { get; set; } public string DisplayName { get; set; }
public bool Active { get; set; } public bool Active { get; set; }
public List<string> Groups { get; set; } public List<string> Groups { get; set; }