Skip to content

Commit 27f45f7

Browse files
committed
fix: remove unnecessary check
1 parent 6469516 commit 27f45f7

File tree

3 files changed

+11
-19
lines changed

3 files changed

+11
-19
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/datasource/model/Datasource.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ public boolean isLegacyQuickRestApi() {
121121
return REST_API.equals(type) && creationSource == LEGACY_WORKSPACE_PREDEFINED.getValue();
122122
}
123123

124-
@JsonIgnore
125-
public boolean isRestApi() {
126-
return REST_API.equals(type);
127-
}
128-
129124
@JsonIgnore
130125
public boolean isLegacyLowcoderApi() {
131126
return !REST_API.equals(type) && creationSource == LEGACY_WORKSPACE_PREDEFINED.getValue();

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,12 @@ public Mono<QueryExecutionResult> executeApplicationQuery(ServerWebExchange exch
117117

118118
Mono<List<Property>> paramsAndHeadersInheritFromLogin = Mono.empty();
119119

120-
if (datasource.isRestApi()) {
121-
// then check if oauth inherited from login and save token
122-
if(datasource.getDetailConfig() instanceof RestApiDatasourceConfig restApiDatasourceConfig
123-
&& restApiDatasourceConfig.isOauth2InheritFromLogin()) {
124-
paramsAndHeadersInheritFromLogin = getAuthParamsAndHeadersInheritFromLogin(tuple.getT1(), ((OAuthInheritAuthConfig)restApiDatasourceConfig.getAuthConfig()).getAuthId());
125120

126-
}
121+
// Check if oauth inherited from login and save token
122+
if(datasource.getDetailConfig() instanceof RestApiDatasourceConfig restApiDatasourceConfig
123+
&& restApiDatasourceConfig.isOauth2InheritFromLogin()) {
124+
paramsAndHeadersInheritFromLogin = getAuthParamsAndHeadersInheritFromLogin(tuple.getT1(), ((OAuthInheritAuthConfig)restApiDatasourceConfig.getAuthConfig()).getAuthId());
125+
127126
}
128127

129128
QueryVisitorContext queryVisitorContext = new QueryVisitorContext(userId, app.getOrganizationId(), port, cookies, paramsAndHeadersInheritFromLogin, commonConfig.getDisallowedHosts());

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,12 @@ public Mono<QueryExecutionResult> executeLibraryQuery(ServerWebExchange exchange
308308

309309
Mono<List<Property>> paramsAndHeadersInheritFromLogin = Mono.empty();
310310

311-
if (datasource.isRestApi()) {
312-
// then check if oauth inherited from login and save token
313-
if(datasource.getDetailConfig() instanceof RestApiDatasourceConfig restApiDatasourceConfig
314-
&& restApiDatasourceConfig.isOauth2InheritFromLogin()) {
315-
paramsAndHeadersInheritFromLogin = getParamsAndHeadersInheritFromLogin
316-
(user, ((OAuthInheritAuthConfig)restApiDatasourceConfig.getAuthConfig()).getAuthId());
317-
318-
}
311+
312+
// check if oauth inherited from login and save token
313+
if(datasource.getDetailConfig() instanceof RestApiDatasourceConfig restApiDatasourceConfig
314+
&& restApiDatasourceConfig.isOauth2InheritFromLogin()) {
315+
paramsAndHeadersInheritFromLogin = getParamsAndHeadersInheritFromLogin
316+
(user, ((OAuthInheritAuthConfig)restApiDatasourceConfig.getAuthConfig()).getAuthId());
319317
}
320318

321319
QueryVisitorContext queryVisitorContext = new QueryVisitorContext(userId, orgId, port, cookies, paramsAndHeadersInheritFromLogin,

0 commit comments

Comments
 (0)