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

fix: Switched reference from package name to plugin name (#9916)

Browse Source
This commit is contained in:
Nidhi 2021-12-23 19:46:30 +05:30 committed by GitHub
parent b2855ccf77
commit 9af1f4c9f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 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/services/ce/PluginServiceCEImpl.java
View File

@ -307,7 +307,7 @@ public class PluginServiceCEImpl extends BaseService<PluginRepository, Plugin, S
return return
datasourceMono datasourceMono
.flatMap(datasource -> this.findById(datasource.getPluginId()) .flatMap(datasource -> this.findById(datasource.getPluginId())
.map(Plugin::getPackageName)); .map(plugin -> plugin.getPluginName() == null ? plugin.getPackageName() : plugin.getPluginName()));
} }
@Override @Override

3
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/AuthenticationServiceCEImpl.java
View File

@ -423,7 +423,8 @@ public class AuthenticationServiceCEImpl implements AuthenticationServiceCE {
integrationDTO.setInstallationKey(installationKey); integrationDTO.setInstallationKey(installationKey);
integrationDTO.setAuthenticationResponse(oAuth2.getAuthenticationResponse()); integrationDTO.setAuthenticationResponse(oAuth2.getAuthenticationResponse());
integrationDTO.setScope(oAuth2.getScope()); integrationDTO.setScope(oAuth2.getScope());
integrationDTO.setPluginName(plugin.getPackageName()); integrationDTO.setPluginName(plugin.getPluginName());
integrationDTO.setPluginVersion(plugin.getVersion());
WebClient.Builder builder = WebClient WebClient.Builder builder = WebClient
.builder() .builder()

5
app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/ImportExportApplicationServiceCEImpl.java
View File

@ -132,7 +132,7 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
return pluginRepository return pluginRepository
.findAll() .findAll()
.map(plugin -> { .map(plugin -> {
pluginMap.put(plugin.getId(), plugin.getPackageName()); pluginMap.put(plugin.getId(), plugin.getPluginName() == null ? plugin.getPackageName() : plugin.getPluginName());
return plugin; return plugin;
}) })
.then(applicationMono) .then(applicationMono)
@ -452,7 +452,8 @@ public class ImportExportApplicationServiceCEImpl implements ImportExportApplica
return pluginRepository.findAll() return pluginRepository.findAll()
.map(plugin -> { .map(plugin -> {
pluginMap.put(plugin.getPackageName(), plugin.getId()); final String pluginReference = plugin.getPluginName() == null ? plugin.getPackageName() : plugin.getPluginName();
pluginMap.put(pluginReference, plugin.getId());
return plugin; return plugin;
}) })
.then(organizationService.findById(organizationId, AclPermission.ORGANIZATION_MANAGE_APPLICATIONS)) .then(organizationService.findById(organizationId, AclPermission.ORGANIZATION_MANAGE_APPLICATIONS))