Skip to content

EPMRPP-115237 || Move encryption logic to service-api #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Evelina02 merged 3 commits into from
Jun 18, 2026
Merged

EPMRPP-115237 || Move encryption logic to service-api #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc576b7
EPMRPP-115237 encrypt in service-api
Evelina02 Jun 17, 2026
538861a
Update GitHubExtension.java
Evelina02 Jun 17, 2026
af9a81a
EPMRPP-114242 || refactor GitHubIntegrationStrategy: simplify buildRe…
grabsefx Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ dependencies {
exclude group: 'org.springframework.modulith', module: 'spring-modulith-apt'
}
} else {
implementation 'com.github.reportportal:service-api:b6fe35f3df'
annotationProcessor('com.github.reportportal:service-api:b6fe35f3df') {
implementation 'com.github.reportportal:service-api:0141b9e'
annotationProcessor('com.github.reportportal:service-api:0141b9e') {
exclude group: 'org.springframework.modulith', module: 'spring-modulith-apt'
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version=1.0.0
description=EPAM Report Portal. GitHub auth plugin.
pluginId=github
pluginClass=com.epam.reportportal.extension.github.GitHubPlugin
pluginName=GitHub Auth Plugin
pluginName=GitHub Auth
provider=ReportPortal
license=Apache 2.0
documentation=https://reportportal.io/docs/plugins/authorization/GitHubAuthorization
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/epam/reportportal/extension/github/GitHubExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import java.util.function.Supplier;
import javax.sql.DataSource;
import lombok.extern.slf4j.Slf4j;
import org.jasypt.util.text.BasicTextEncryptor;
import com.epam.reportportal.base.core.integration.util.IntegrationParamsEncryptor;
import org.pf4j.Extension;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -75,7 +75,7 @@ public class GitHubExtension implements AuthExtension, DisposableBean {
public static final String SCHEMA_SCRIPTS_DIR = "resources/schema";

private static final String PLUGIN_ID = "github";
private static final String PLUGIN_NAME = "GitHub OAuth Plugin";
private static final String PLUGIN_NAME = "GitHub Auth";
private static final String DOCUMENTATION_LINK = "https://reportportal.io/docs/plugins/authorization/GitHubAuthorization";
private static final String DOCUMENTATION_LINK_FIELD = "documentationLink";
private static final String NAME_FIELD = "name";
Expand Down Expand Up @@ -128,7 +128,7 @@ public boolean supports(Class<?> authentication) {
private OrganizationRepository organizationRepository;

@Autowired
private BasicTextEncryptor encryptor;
private IntegrationParamsEncryptor paramsEncryptor;

@Autowired
private DataSource dataSource;
Expand All @@ -147,7 +147,7 @@ public void init() throws IOException {
this.gitHubIntegrationStrategySupplier = new MemoizingSupplier<>(
() -> new GitHubIntegrationStrategy(integrationRepository,
new UpdateAuthRequestValidator(new GitHubRequiredParamNamesProvider()), integrationDuplicateValidator,
encryptor));
paramsEncryptor));

this.pluginLoadedListenerSupplier = new MemoizingSupplier<>(
() -> new PluginLoadedEventListener(PLUGIN_ID, integrationTypeRepository, integrationRepository,
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/epam/reportportal/extension/github/oauth/GitHubOAuth2UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ private List<String> parseAllowedOrganizations(OAuthRegistrationResource registr

private void validateUserOrganizations(UserResource user, GitHubClient client,
List<String> allowedOrgs) {
if (allowedOrgs.isEmpty()) {
return;
}
boolean hasAccess = client.getUserOrganizations(user)
.stream()
.map(OrganizationResource::getLogin)
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/epam/reportportal/extension/github/service/GitHubIntegrationStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import java.util.Map;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.jasypt.util.text.BasicTextEncryptor;
import com.epam.reportportal.base.core.integration.util.IntegrationParamsEncryptor;
import org.springframework.security.config.oauth2.client.CommonOAuth2Provider;
import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.stereotype.Service;
Expand All @@ -62,8 +62,9 @@ public class GitHubIntegrationStrategy extends AuthIntegrationStrategy {
public GitHubIntegrationStrategy(IntegrationRepository integrationRepository,
AuthRequestValidator<IntegrationRQ> updateAuthRequestValidator,
IntegrationDuplicateValidator integrationDuplicateValidator,
BasicTextEncryptor encryptor) {
super(integrationRepository, updateAuthRequestValidator, integrationDuplicateValidator);
IntegrationParamsEncryptor paramsEncryptor) {
super(integrationRepository, updateAuthRequestValidator, integrationDuplicateValidator,
paramsEncryptor);
}

@Override
Expand Down
Loading