MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

delete tenant user when tenant user roles not exist

This commit is contained in:
CITE\amentis 2024-09-13 11:03:37 +03:00
parent 26dfe834ea
commit 0e983f04e5
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/core/src/main/java/org/opencdmp/service/user/UserServiceImpl.java
View File

@ -364,6 +364,10 @@ public class UserServiceImpl implements UserService {
this.eventBroker.emit(new UserTouchedEvent(data.getId())); this.eventBroker.emit(new UserTouchedEvent(data.getId()));
this.syncKeycloakRoles(data.getId()); this.syncKeycloakRoles(data.getId());
if (model.getRoles().stream().noneMatch(authorizationConfiguration.getAuthorizationProperties().getAllowedTenantRoles()::contains)){
this.deleteTenantUser(model.getId());
}
this.userTouchedIntegrationEventHandler.handle(data.getId()); this.userTouchedIntegrationEventHandler.handle(data.getId());
return this.builderFactory.builder(UserBuilder.class).authorize(AuthorizationFlags.AllExceptPublic).build(BaseFieldSet.build(fields, User._id), data); return this.builderFactory.builder(UserBuilder.class).authorize(AuthorizationFlags.AllExceptPublic).build(BaseFieldSet.build(fields, User._id), data);
@ -448,6 +452,16 @@ public class UserServiceImpl implements UserService {
} }
private void deleteTenantUser(UUID userId) throws InvalidApplicationException {
if (!this.tenantScope.isSet()) throw new MyForbiddenException("tenant scope required");
if (this.tenantScope.isDefaultTenant()) return;
TenantUserEntity tenantUser = this.queryFactory.query(TenantUserQuery.class).isActive(IsActive.Active).userIds(userId).tenantIds(this.tenantScope.getTenant()).first();
if (tenantUser == null) throw new MyApplicationException("tenant user not found");
this.deleterFactory.deleter(TenantUserDeleter.class).delete(List.of(tenantUser));
}
//region mine //region mine
@Override @Override