Skip to content

[SQL] Add Guest user lookup support to SetAzSQLServerAzureDirectoryAdministrator #11973

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
merged 3 commits into from
May 23, 2020
Merged

[SQL] Add Guest user lookup support to SetAzSQLServerAzureDirectoryAdministrator #11973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7074a9
Add Guest user lookup and remove incorrect if statement.
amolagar5 May 22, 2020
e364a7a
Add a few null checks for safely.
amolagar5 May 22, 2020
05497eb
update ChangeLog.md
amolagar5 May 22, 2020
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
1 change: 1 addition & 0 deletions src/Sql/Sql/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
## Upcoming Release
* Added UsePrivateLinkConnection to `New-AzSqlSyncGroup`, `Update-AzSqlSyncGroup`, `New-AzSqlSyncMember` and `Update-AzSqlSyncMember`
* Added SyncMemberAzureDatabaseResourceId to `New-AzSqlSyncMember` and `Update-AzSqlSyncMember`
* Add Guest user lookup support to Set SQL Server Azure Active Directory Admin cmdlet

## Version 2.6.1
* Enhance performance of:
Expand Down
27 changes: 18 additions & 9 deletions ...ctiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@ protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displa
// Get a list of groups from Azure Active Directory
groupList = ActiveDirectoryClient.FilterGroups(filter).Where(gr => string.Equals(gr.DisplayName, displayName, StringComparison.OrdinalIgnoreCase));

if (groupList.Count() > 1)
if (groupList != null && groupList.Count() > 1)
{
// More than one group was found with that display name.
throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Sql.Properties.Resources.ADGroupMoreThanOneFound, displayName));
}
else if (groupList.Count() == 1)
else if (groupList != null && groupList.Count() == 1)
{
// Only one group was found. Get the group display name and object id
group = groupList.First();
Expand All @@ -224,17 +224,12 @@ protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displa

var applicationList = ActiveDirectoryClient.GetApplicationWithFilters(odataQueryFilter);

// No application was found
if (applicationList == null || applicationList.Count() == 0)
{
throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Sql.Properties.Resources.ADObjectNotFound, displayName));
}
else if (applicationList.Count() > 1)
if (applicationList != null && applicationList.Count() > 1)
{
// More than one application was found.
throw new ArgumentException(string.Format(Microsoft.Azure.Commands.Sql.Properties.Resources.ADApplicationMoreThanOneFound, displayName));
}
else if (applicationList.Count() == 1)
else if (applicationList != null && applicationList.Count() == 1)
{
// Only one user was found. Get the user display name and object id
PSADApplication app = applicationList.First();
Expand Down Expand Up @@ -294,6 +289,20 @@ protected ServerAzureADAdministrator GetActiveDirectoryInformation(string displa
userList = ActiveDirectoryClient.FilterUsers(filter).Where(gr => string.Equals(gr.UserPrincipalName, displayName, StringComparison.OrdinalIgnoreCase));
}

// No user was found. Check if the display name is a guest user.
if (userList == null || userList.Count() == 0)
{
// Check if the display name is the UPN
filter = new ADObjectFilterOptions()
{
Id = (objectId != null && objectId != Guid.Empty) ? objectId.ToString() : null,
Mail = displayName,
Paging = true,
};

userList = ActiveDirectoryClient.FilterUsers(filter);
}

// No user was found
if (userList == null || userList.Count() == 0)
{
Expand Down