Skip to content

Commit 7b1ad25

Browse files
authored
Support searching user by mail (#187)
1 parent 494eb86 commit 7b1ad25

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

src/Graph.Rbac/Version1_6.20190326/ActiveDirectory/ActiveDirectoryClient.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,15 @@ public IEnumerable<PSADUser> FilterUsers(ADObjectFilterOptions options, ulong fi
203203
try
204204
{
205205
string upnOrMail = Normalize(options.UPN) ?? Normalize(options.Mail);
206-
var odataQuery = new Rest.Azure.OData.ODataQuery<User>(u => u.UserPrincipalName == upnOrMail);
206+
var odataQuery = new Rest.Azure.OData.ODataQuery<User>();
207+
if (!string.IsNullOrEmpty(options.UPN))
208+
{
209+
odataQuery.SetFilter(u => u.UserPrincipalName == upnOrMail);
210+
}
211+
else
212+
{
213+
odataQuery.SetFilter(u => u.Mail == upnOrMail);
214+
}
207215
result = GraphClient.Users.List(odataQuery);
208216
}
209217
catch { /* The user does not exist, ignore the exception. */ }

src/Graph.Rbac/Version1_6/ActiveDirectory/ActiveDirectoryClient.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,15 @@ public IEnumerable<PSADUser> FilterUsers(ADObjectFilterOptions options, ulong fi
203203
try
204204
{
205205
string upnOrMail = Normalize(options.UPN) ?? Normalize(options.Mail);
206-
var odataQuery = new Rest.Azure.OData.ODataQuery<User>(u => u.UserPrincipalName == upnOrMail);
206+
var odataQuery = new Rest.Azure.OData.ODataQuery<User>();
207+
if (!string.IsNullOrEmpty(options.UPN))
208+
{
209+
odataQuery.SetFilter(u => u.UserPrincipalName == upnOrMail);
210+
}
211+
else
212+
{
213+
odataQuery.SetFilter(u => u.Mail == upnOrMail);
214+
}
207215
result = GraphClient.Users.List(odataQuery);
208216
}
209217
catch { /* The user does not exist, ignore the exception. */ }

0 commit comments

Comments
 (0)