Skip to content

Add group mapping for oauth provider #1639

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 1 commit into from
Apr 16, 2025
Merged

Add group mapping for oauth provider #1639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...er/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/model/AuthUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public class AuthUser {

private String orgId;

// Add groupId for group mapping
private String groupId;

private AuthRequestContext authContext;

/**
Expand Down
17 changes: 14 additions & 3 deletions ...r/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
import org.lowcoder.domain.authentication.FindAuthConfig;
import org.lowcoder.domain.authentication.context.AuthRequestContext;
import org.lowcoder.domain.authentication.context.FormAuthRequestContext;
import org.lowcoder.domain.group.model.GroupMember;
import org.lowcoder.domain.group.service.GroupMemberService;
import org.lowcoder.domain.organization.model.MemberRole;
import org.lowcoder.domain.organization.model.OrgMember;
import org.lowcoder.domain.organization.model.Organization;
import org.lowcoder.domain.organization.model.OrganizationDomain;
Expand Down Expand Up @@ -73,6 +76,7 @@ public class AuthenticationApiServiceImpl implements AuthenticationApiService {
private final JWTUtils jwtUtils;
private final AuthProperties authProperties;
private final CommonConfig commonConfig;
private final GroupMemberService groupMemberService;

@Override
public Mono<AuthUser> authenticateByForm(String loginId, String password, String source, boolean register, String authId, String orgId) {
Expand Down Expand Up @@ -143,7 +147,7 @@ public Mono<Void> loginOrRegister(AuthUser authUser, ServerWebExchange exchange,
return Mono.empty();
})
// after login
.delayUntil(user -> onUserLogin(authUser.getOrgId(), user, authUser.getSource()))
.delayUntil(user -> onUserLogin(authUser.getOrgId(), user, authUser.getSource(), authUser.getGroupId()))
// process invite
.delayUntil(__ -> {
if (StringUtils.isBlank(invitationId)) {
Expand Down Expand Up @@ -241,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
return organizationService.createDefault(user, isSuperAdmin).then();
}

protected Mono<Void> onUserLogin(String orgId, User user, String source) {
protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupId) {
Mono<String> orgMono;
if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {
orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
Expand All @@ -251,7 +255,14 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source) {
}
orgMono = Mono.just(orgId);
}
return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then();
Mono<GroupMember> groupMember = groupMemberService.getGroupMember(groupId, user.getId()).switchIfEmpty(Mono.defer(() -> {
GroupMember groupMember1 = GroupMember.builder()
.groupId(groupId)
.userId(user.getId())
.build();
return groupMemberService.addMember(orgId, groupId, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);
}));
return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then(groupMember).then();
}

@Override
Expand Down
3 changes: 3 additions & 0 deletions ...wcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,14 @@ public static AuthUser mapToAuthUser(Map<String, Object> map, HashMap<String, St
if(StringUtils.isEmpty(username)) username = email;
if(StringUtils.isEmpty(username)) username = uid;
String avatar = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "avatar"));
// Add group id mapping
String groupId = AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "group_id"));
return AuthUser.builder()
.uid(uid)
.username(username)
.email(email)
.avatar(avatar)
.groupId(groupId) // Make sure AuthUser has this field and builder method
.rawUserInfo(map)
.build();
}
Expand Down
Loading