Skip to content

NIFI-10130 AzureGraphUserGroupProvider handles nested group #6135

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

Closed
sjyang18 wants to merge 2 commits into from
Closed

NIFI-10130 AzureGraphUserGroupProvider handles nested group #6135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c1dd34
NIFI-10130 AzureGraphUserGroupProvider handles nested group with tran…
sjyang18 Jun 17, 2022
8b1fa38
removed logger.info
sjyang18 Aug 10, 2022
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
26 changes: 9 additions & 17 deletions ...orizer/src/main/java/org/apache/nifi/authorization/azure/AzureGraphUserGroupProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,16 @@

import com.google.gson.JsonObject;
import com.microsoft.graph.core.ClientException;
import com.microsoft.graph.models.extensions.DirectoryObject;
import com.microsoft.graph.models.extensions.IGraphServiceClient;
import com.microsoft.graph.options.Option;
import com.microsoft.graph.options.QueryOption;
import com.microsoft.graph.requests.extensions.GraphServiceClient;
import com.microsoft.graph.requests.extensions.IDirectoryObjectCollectionWithReferencesPage;
import com.microsoft.graph.requests.extensions.IDirectoryObjectCollectionWithReferencesRequest;
import com.microsoft.graph.requests.extensions.IDirectoryObjectCollectionWithReferencesRequestBuilder;
import com.microsoft.graph.requests.extensions.IGroupCollectionPage;
import com.microsoft.graph.requests.extensions.IGroupCollectionRequest;
import com.microsoft.graph.requests.extensions.IGroupCollectionRequestBuilder;
import com.microsoft.graph.requests.extensions.IUserCollectionWithReferencesPage;
import com.microsoft.graph.requests.extensions.IUserCollectionWithReferencesRequest;
import com.microsoft.graph.requests.extensions.IUserCollectionWithReferencesRequestBuilder;

import org.apache.nifi.authorization.AuthorizerConfigurationContext;
import org.apache.nifi.authorization.Group;
Expand Down Expand Up @@ -345,23 +344,16 @@ private UserGroupQueryResult getUsersFrom(String groupName, int pageSize) throws
.identifier(graphGroup.id)
.name(graphGroup.displayName);

IDirectoryObjectCollectionWithReferencesRequest uRequest =
IUserCollectionWithReferencesRequest uRequest =
graphClient.groups(graphGroup.id)
.members()
.transitiveMembersAsUser()
.buildRequest()
.select("id, displayName, mail, userPrincipalName");

if (pageSize > 0) {
uRequest = uRequest.top(pageSize);
}
IDirectoryObjectCollectionWithReferencesPage userpage =
graphClient.groups(graphGroup.id)
.members()
.buildRequest()
.select("id, displayName, mail, userPrincipalName").get();
IUserCollectionWithReferencesPage userpage = uRequest.get();

while (userpage.getCurrentPage() != null) {
for (DirectoryObject userDO : userpage.getCurrentPage()) {
while (userpage != null && userpage.getCurrentPage() != null) {
for (com.microsoft.graph.models.extensions.User userDO : userpage.getCurrentPage()) {
JsonObject jsonUser = userDO.getRawObject();
final String idUser;
if (!jsonUser.get("id").isJsonNull()) {
Expand All @@ -386,7 +378,7 @@ private UserGroupQueryResult getUsersFrom(String groupName, int pageSize) throws
users.add(user);
groupBuilder.addUser(idUser);
}
IDirectoryObjectCollectionWithReferencesRequestBuilder nextPageRequest = userpage.getNextPage();
IUserCollectionWithReferencesRequestBuilder nextPageRequest = userpage.getNextPage();

if (nextPageRequest != null) {
userpage = nextPageRequest.buildRequest().get();
Expand Down