Commit796adc2

Thomasr

authored and

ludomikula

committed

Add superuser to org as it is created

1 parentb39d244 commit796adc2Copy full SHA for 796adc2

File tree

2 files changed

-1

lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain
- organization/service
  - OrganizationServiceImpl.java
- user/service
  - UserServiceImpl.java

2 files changed

-1

lines changed

`‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java‎`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`importorg.lowcoder.domain.organization.model.Organization.OrganizationCommonSettings;`
`16`	`16`	`importorg.lowcoder.domain.organization.repository.OrganizationRepository;`
`17`	`17`	`importorg.lowcoder.domain.user.model.User;`
	`18`	`+importorg.lowcoder.domain.user.repository.UserRepository;`
	`19`	`+importorg.lowcoder.domain.user.service.UserService;`
`18`	`20`	`importorg.lowcoder.infra.annotation.PossibleEmptyMono;`
`19`	`21`	`importorg.lowcoder.infra.mongo.MongoUpsertHelper;`
`20`	`22`	`importorg.lowcoder.sdk.config.CommonConfig;`
`@@ -51,6 +53,7 @@`
`51`	`53`	`@Service`
`52`	`54`	`publicclassOrganizationServiceImplimplementsOrganizationService {`
`53`	`55`
	`56`	`+privatefinalUserRepositoryuserRepository;`
`54`	`57`	`privateConf<Integer>logoMaxSizeInKb;`
`55`	`58`	`privatefinalAssetRepositoryassetRepository;`
`56`	`59`	`privatefinalAssetServiceassetService;`
`@@ -150,6 +153,12 @@ private Mono<Organization> onOrgCreated(String userId, Organization newOrg, bool`
`150`	`153`	`returngroupService.createAllUserGroup(newOrg.getId())`
`151`	`154`	`.then(groupService.createDevGroup(newOrg.getId()))`
`152`	`155`	`.then(setOrgAdmin(userId,newOrg,isSuperAdmin))`
	`156`	`+ .then(userRepository.findAll().filter(User::getSuperAdmin).last().map(superAdminUser -> {`
	`157`	`+if(!userId.equals(superAdminUser.getId())) {`
	`158`	`+returnsetOrgSuperAdmin(superAdminUser.getId(),newOrg,true);`
	`159`	`+ }`
	`160`	`+returnMono.empty();`
	`161`	`+ }))`
`153`	`162`	`.thenReturn(newOrg);`
`154`	`163`	`}`
`155`	`164`

`‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,6 @@ public Mono<Boolean> markAsSuperAdmin(String userId) {`
`348`	`348`	`.thenReturn(true);`
`349`	`349`	`}`
`350`	`350`
`351`		`-`
`352`	`351`	`@Override`
`353`	`352`	`publicMono<UserDetail>buildUserDetail(Useruser,booleanwithoutDynamicGroups) {`
`354`	`353`	`if (user.isAnonymous()) {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit796adc2

File tree

2 files changed

2 files changed

`‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java‎`

`‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java‎`

0 commit comments