Skip to content
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.

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

Cb 4403 map ad roles #2295

Merged
merged 18 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d7d0ac0
CB-4403. Implement import with auth roles for AD
DenisSinelnikov Jan 11, 2024
b5f0450
CB-4403 feat: add auth role provided flag
Wroud Jan 12, 2024
a3de3ad
CB-4403. Refactor after review, added auto configurable flag
DenisSinelnikov Jan 12, 2024
1ee9d61
Merge branch 'devel' into CB-4403-map-ad-roles
DenisSinelnikov Jan 12, 2024
7b96050
Merge remote-tracking branch 'origin/devel' into CB-4403-map-ad-roles
Wroud Jan 15, 2024
e998afe
CB-4403. Refactor after review
DenisSinelnikov Jan 16, 2024
4ece241
Merge remote-tracking branch 'origin/CB-4403-map-ad-roles' into CB-44…
DenisSinelnikov Jan 16, 2024
65a0ff8
Merge branch 'devel' into CB-4403-map-ad-roles
DenisSinelnikov Jan 16, 2024
586ea4d
Merge branch 'devel' into CB-4403-map-ad-roles
DenisSinelnikov Jan 16, 2024
fbb5ea0
CB-4403. Refactor after review
DenisSinelnikov Jan 16, 2024
056c2a5
Merge remote-tracking branch 'origin/CB-4403-map-ad-roles' into CB-44…
DenisSinelnikov Jan 16, 2024
884d627
CB-4403. Refactor after review
DenisSinelnikov Jan 17, 2024
aeeabe2
Merge branch 'devel' into CB-4403-map-ad-roles
kseniaguzeeva Jan 17, 2024
7fe7be8
Merge branch 'devel' into CB-4403-map-ad-roles
kseniaguzeeva Jan 18, 2024
2fd6781
CB-4403. Fixed set teams for imported users
DenisSinelnikov Jan 18, 2024
9c27f5d
Merge remote-tracking branch 'origin/CB-4403-map-ad-roles' into CB-44…
DenisSinelnikov Jan 18, 2024
1651c52
CB-4403. Refactor after review
DenisSinelnikov Jan 18, 2024
e4da96a
CB-4403. Refactor after review
DenisSinelnikov Jan 18, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ type AuthProviderConfiguration {
id: ID!
displayName: String!
disabled: Boolean!
authRoleProvided: Boolean

iconURL: String
description: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ protected void importUsers(@NotNull Connection connection, @NotNull SMUserImport
enableUser(connection, user.getUserId(), true);
continue;
}
createUser(connection, user.getUserId(), user.getMetaParameters(), true, userImportList.getAuthRole());
String authRole = user.getAuthRole() == null ? userImportList.getAuthRole() : user.getAuthRole();
createUser(connection, user.getUserId(), user.getMetaParameters(), true, authRole);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
fragment AuthProviderConfigurationInfo on AuthProviderConfiguration {
id
displayName
authRoleProvided
iconURL
description
signInLink
Expand Down
Loading