Commit5b08e71

Thomasr

committed

#1397: Selecting current activeAuthId when "inherit from login" is selected for authentication type of datasource

1 parent6a3d7d3 commit5b08e71Copy full SHA for 5b08e71

File tree

-1

lines changed

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query
- ApplicationQueryApiServiceImpl.java

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -196,9 +196,15 @@ protected Mono<List<Property>> getAuthParamsAndHeadersInheritFromLogin(User user`
`196`	`196`	`if(authId ==null) {`
`197`	`197`	`returnMono.empty();`
`198`	`198`	`}`
	`199`	`+`
	`200`	`+StringfilterAuthId;`
	`201`	`+if(StringUtils.isEmpty(authId))filterAuthId =user.getActiveAuthId();`
	`202`	`+else {`
	`203`	`+filterAuthId =authId;`
	`204`	`+ }`
`199`	`205`	`Optional<Connection>activeConnectionOptional =user.getConnections()`
`200`	`206`	`.stream()`
`201`		`- .filter(connection ->connection.getAuthId().equals(authId))`
	`207`	`+ .filter(connection ->connection.getAuthId().equals(filterAuthId))`
`202`	`208`	`.findFirst();`
`203`	`209`	`if(!activeConnectionOptional.isPresent() \|\|activeConnectionOptional.get().getAuthConnectionAuthToken() ==null) {`
`204`	`210`	`returnMono.empty();`

Comments

(0)