Commitabe80fe

authored

Merge pull request#1647 from lowcoder-org/fix_org_by_email

Fixed organizationByEmail endpoint

2 parentsa49b1ff +69d75d6 commitabe80feCopy full SHA for abe80fe

File tree

+15

-3

lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement
- OrganizationController.java

+15

-3

lines changed

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,23 @@ public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String emai`
`62`	`62`	`@RequestParam(required =false,defaultValue ="0")IntegerpageSize) {`
`63`	`63`	`Flux<OrgView>flux;`
`64`	`64`	`if (commonConfig.getWorkspace().getMode() ==WorkspaceMode.SAAS) {`
`65`		`-flux =userService.findByEmailDeep(email).flux().flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))`
	`65`	`+flux =userService.findByEmailDeep(email).flux()`
	`66`	`+ .flatMap(user ->orgMemberService.getAllActiveOrgs(user.getId()))`
`66`	`67`	`.flatMap(orgMember ->organizationService.getById(orgMember.getOrgId()))`
`67`		`- .map(OrgView::new).cache();`
	`68`	`+ .map(OrgView::new)`
	`69`	`+ .cache();`
`68`	`70`	`}else {`
`69`		`-flux =organizationService.getOrganizationInEnterpriseMode().flux().map(OrgView::new).cache();`
	`71`	`+// Not SAAS: check if user exists and is a member of the org`
	`72`	`+flux =userService.findByEmailDeep(email)`
	`73`	`+ .flatMapMany(user ->`
	`74`	`+organizationService.getOrganizationInEnterpriseMode().flux()`
	`75`	`+ .flatMap(org ->`
	`76`	`+orgMemberService.getOrgMember(org.getId(),user.getId())`
	`77`	`+ .filter(orgMember -> !orgMember.isInvalid())`
	`78`	`+ .map(__ ->newOrgView(org))`
	`79`	`+ )`
	`80`	`+ )`
	`81`	`+ .cache();`
`70`	`82`	`}`
`71`	`83`	`varnewflux =flux.sort((OrgViewo1,OrgViewo2) -> {`
`72`	`84`	`if (o1.getOrgName() ==null \|\|o2.getOrgName() ==null) {`

Comments

(0)