Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

Browse Source
This commit is contained in:
Trisha Anand 2020-07-15 20:15:42 +05:30
commit 8368c223c8
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/SecurityConfig.java
View File

@ -133,7 +133,7 @@ public class SecurityConfig {
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, USER_URL + "/invite/verify"), ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, USER_URL + "/invite/verify"),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.PUT, USER_URL + "/invite/confirm"), ServerWebExchangeMatchers.pathMatchers(HttpMethod.PUT, USER_URL + "/invite/confirm"),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, USER_URL + "/me"), ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, USER_URL + "/me"),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, ACTION_URL), ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, ACTION_URL + "/**"),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, PAGE_URL + "/**"), ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, PAGE_URL + "/**"),
ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, APPLICATION_URL + "/**")) ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, APPLICATION_URL + "/**"))
.permitAll() .permitAll()

3
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
View File

@ -62,7 +62,6 @@ import static com.appsmith.server.acl.AclPermission.EXECUTE_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES; import static com.appsmith.server.acl.AclPermission.MANAGE_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES; import static com.appsmith.server.acl.AclPermission.MANAGE_PAGES;
import static com.appsmith.server.acl.AclPermission.READ_ACTIONS; import static com.appsmith.server.acl.AclPermission.READ_ACTIONS;
import static com.appsmith.server.acl.AclPermission.READ_DATASOURCES;
import static com.appsmith.server.acl.AclPermission.READ_PAGES; import static com.appsmith.server.acl.AclPermission.READ_PAGES;
@Slf4j @Slf4j
@ -629,7 +628,7 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
if (datasource.getId() != null) { if (datasource.getId() != null) {
// its a global datasource. Get the datasource from the collection // its a global datasource. Get the datasource from the collection
pluginIdUpdateMono = datasourceService pluginIdUpdateMono = datasourceService
.findById(datasource.getId(), READ_DATASOURCES) .findById(datasource.getId())
.map(datasource1 -> { .map(datasource1 -> {
action.setPluginId(datasource1.getPluginId()); action.setPluginId(datasource1.getPluginId());
return action; return action;

2
app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceService.java
View File

@ -15,6 +15,8 @@ public interface DatasourceService extends CrudService<Datasource, String> {
Mono<Datasource> findById(String id, AclPermission aclPermission); Mono<Datasource> findById(String id, AclPermission aclPermission);
Mono<Datasource> findById(String id);
Set<String> extractKeysFromDatasource(Datasource datasource); Set<String> extractKeysFromDatasource(Datasource datasource);
Mono<Datasource> validateDatasource(Datasource datasource); Mono<Datasource> validateDatasource(Datasource datasource);

5
app/server/appsmith-server/src/main/java/com/appsmith/server/services/DatasourceServiceImpl.java
View File

@ -263,6 +263,11 @@ public class DatasourceServiceImpl extends BaseService<DatasourceRepository, Dat
return repository.findById(id, aclPermission); return repository.findById(id, aclPermission);
} }
@Override
public Mono<Datasource> findById(String id) {
return repository.findById(id);
}
@Override @Override
public Set<String> extractKeysFromDatasource(Datasource datasource) { public Set<String> extractKeysFromDatasource(Datasource datasource) {
if (datasource.getDatasourceConfiguration() == null) { if (datasource.getDatasourceConfiguration() == null) {