valitydev/adapter-flow-lib
14
0
Fork 0
mirror of https://github.com/valitydev/adapter-flow-lib.git synced 2024-11-06 00:05:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

INT-375: Redecorate CallbackUrlExtractor (add interface and implementation) (#54)

Browse Source
This commit is contained in:
Baikov Dmitrii 2022-11-22 00:10:45 -08:00 committed by GitHub
parent ed09f7e71f
commit 97d85e7ee5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -12,7 +12,7 @@
</parent> </parent>
<artifactId>adapter-flow-lib</artifactId> <artifactId>adapter-flow-lib</artifactId>
<version>0.1.19</version> <version>0.1.20</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>adapter-flow-lib</name> <name>adapter-flow-lib</name>

2
src/main/java/dev/vality/adapter/flow/lib/converter/entry/CtxToEntryModelConverter.java
View File

@ -11,7 +11,7 @@ import dev.vality.adapter.flow.lib.service.CardDataService;
import dev.vality.adapter.flow.lib.service.IdGenerator; import dev.vality.adapter.flow.lib.service.IdGenerator;
import dev.vality.adapter.flow.lib.service.TemporaryContextService; import dev.vality.adapter.flow.lib.service.TemporaryContextService;
import dev.vality.adapter.flow.lib.utils.AdapterProperties; import dev.vality.adapter.flow.lib.utils.AdapterProperties;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor; import dev.vality.adapter.flow.lib.service.CallbackUrlExtractor;
import dev.vality.adapter.flow.lib.utils.CardDataUtils; import dev.vality.adapter.flow.lib.utils.CardDataUtils;
import dev.vality.adapter.flow.lib.utils.TargetStatusResolver; import dev.vality.adapter.flow.lib.utils.TargetStatusResolver;
import dev.vality.cds.storage.Auth3DS; import dev.vality.cds.storage.Auth3DS;

13
src/main/java/dev/vality/adapter/flow/lib/service/CallbackUrlExtractor.java Normal file
View File

@ -0,0 +1,13 @@
package dev.vality.adapter.flow.lib.service;
import java.util.Map;
public interface CallbackUrlExtractor {
String TERMINATION_URI = "termination_uri";
String extractCallbackUrl(String redirectUrl);
String getSuccessRedirectUrl(Map<String, String> adapterConfigurations, String redirectUrl);
}

1
src/main/java/dev/vality/adapter/flow/lib/service/IntentResultFactory.java
View File

@ -8,7 +8,6 @@ import dev.vality.adapter.flow.lib.model.ExitStateModel;
import dev.vality.adapter.flow.lib.model.PollingInfo; import dev.vality.adapter.flow.lib.model.PollingInfo;
import dev.vality.adapter.flow.lib.model.ThreeDsData; import dev.vality.adapter.flow.lib.model.ThreeDsData;
import dev.vality.adapter.flow.lib.serde.ParametersSerializer; import dev.vality.adapter.flow.lib.serde.ParametersSerializer;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor;
import dev.vality.adapter.flow.lib.utils.ThreeDsDataInitializer; import dev.vality.adapter.flow.lib.utils.ThreeDsDataInitializer;
import dev.vality.adapter.flow.lib.utils.TimeoutUtils; import dev.vality.adapter.flow.lib.utils.TimeoutUtils;
import dev.vality.adapter.flow.lib.utils.TimerProperties; import dev.vality.adapter.flow.lib.utils.TimerProperties;

1
src/main/java/dev/vality/adapter/flow/lib/service/RecurrentIntentResultFactory.java
View File

@ -6,7 +6,6 @@ import dev.vality.adapter.flow.lib.model.EntryStateModel;
import dev.vality.adapter.flow.lib.model.ExitStateModel; import dev.vality.adapter.flow.lib.model.ExitStateModel;
import dev.vality.adapter.flow.lib.model.PollingInfo; import dev.vality.adapter.flow.lib.model.PollingInfo;
import dev.vality.adapter.flow.lib.model.ThreeDsData; import dev.vality.adapter.flow.lib.model.ThreeDsData;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor;
import dev.vality.adapter.flow.lib.utils.ThreeDsDataInitializer; import dev.vality.adapter.flow.lib.utils.ThreeDsDataInitializer;
import dev.vality.adapter.flow.lib.utils.TimeoutUtils; import dev.vality.adapter.flow.lib.utils.TimeoutUtils;
import dev.vality.adapter.flow.lib.utils.TimerProperties; import dev.vality.adapter.flow.lib.utils.TimerProperties;

1
src/main/java/dev/vality/adapter/flow/lib/service/ThreeDsAdapterService.java
View File

@ -4,7 +4,6 @@ import dev.vality.adapter.common.exception.HellgateException;
import dev.vality.adapter.common.hellgate.HellgateClient; import dev.vality.adapter.common.hellgate.HellgateClient;
import dev.vality.adapter.flow.lib.serde.ParametersDeserializer; import dev.vality.adapter.flow.lib.serde.ParametersDeserializer;
import dev.vality.adapter.flow.lib.serde.ParametersSerializer; import dev.vality.adapter.flow.lib.serde.ParametersSerializer;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;

10
src/main/java/dev/vality/adapter/flow/lib/utils/CallbackUrlExtractor.java → src/main/java/dev/vality/adapter/flow/lib/service/impl/CallbackUrlExtractorImpl.java
View File

@ -1,6 +1,8 @@
package dev.vality.adapter.flow.lib.utils; package dev.vality.adapter.flow.lib.service.impl;
import dev.vality.adapter.flow.lib.constant.RedirectFields; import dev.vality.adapter.flow.lib.constant.RedirectFields;
import dev.vality.adapter.flow.lib.service.CallbackUrlExtractor;
import dev.vality.adapter.flow.lib.utils.AdapterProperties;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
@ -8,18 +10,18 @@ import org.springframework.web.util.UriComponentsBuilder;
import java.util.Map; import java.util.Map;
@RequiredArgsConstructor @RequiredArgsConstructor
public class CallbackUrlExtractor { public class CallbackUrlExtractorImpl implements CallbackUrlExtractor {
public static final String TERMINATION_URI = "termination_uri";
private final AdapterProperties adapterProperties; private final AdapterProperties adapterProperties;
@Override
public String extractCallbackUrl(String redirectUrl) { public String extractCallbackUrl(String redirectUrl) {
return UriComponentsBuilder.fromUriString(adapterProperties.getCallbackUrl()) return UriComponentsBuilder.fromUriString(adapterProperties.getCallbackUrl())
.path(adapterProperties.getPathCallbackUrl()) .path(adapterProperties.getPathCallbackUrl())
.queryParam(TERMINATION_URI, redirectUrl).build().toUriString(); .queryParam(TERMINATION_URI, redirectUrl).build().toUriString();
} }
@Override
public String getSuccessRedirectUrl(Map<String, String> adapterConfigurations, String redirectUrl) { public String getSuccessRedirectUrl(Map<String, String> adapterConfigurations, String redirectUrl) {
if (StringUtils.hasText(redirectUrl)) { if (StringUtils.hasText(redirectUrl)) {
return redirectUrl; return redirectUrl;

5
src/test/java/dev/vality/adapter/flow/lib/flow/AbstractGenerateTokenTest.java
View File

@ -11,7 +11,7 @@ import dev.vality.adapter.flow.lib.flow.full.FullThreeDsAllVersionsStepResolverI
import dev.vality.adapter.flow.lib.flow.full.GenerateTokenFullThreeDsAllVersionsStepResolverImpl; import dev.vality.adapter.flow.lib.flow.full.GenerateTokenFullThreeDsAllVersionsStepResolverImpl;
import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer; import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer;
import dev.vality.adapter.flow.lib.service.TagManagementService; import dev.vality.adapter.flow.lib.service.TagManagementService;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor; import dev.vality.adapter.flow.lib.service.impl.CallbackUrlExtractorImpl;
import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator; import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator;
import dev.vality.bender.BenderSrv; import dev.vality.bender.BenderSrv;
import dev.vality.damsel.proxy_provider.*; import dev.vality.damsel.proxy_provider.*;
@ -25,11 +25,10 @@ import static dev.vality.adapter.common.damsel.DomainPackageCreators.createTarge
import static dev.vality.adapter.flow.lib.flow.full.three.ds.ForwardRecurrentPaymentNon3dsTest.RECURRENT_TOKEN; import static dev.vality.adapter.flow.lib.flow.full.three.ds.ForwardRecurrentPaymentNon3dsTest.RECURRENT_TOKEN;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@PropertySource("classpath:application.yaml") @PropertySource("classpath:application.yaml")
@ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class, @ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class,
ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementService.class, ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementService.class,
CallbackUrlExtractor.class, FullThreeDsAllVersionsStepResolverImpl.class, CallbackUrlExtractorImpl.class, FullThreeDsAllVersionsStepResolverImpl.class,
GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class}) GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class})
public class AbstractGenerateTokenTest { public class AbstractGenerateTokenTest {

5
src/test/java/dev/vality/adapter/flow/lib/flow/AbstractPaymentTest.java
View File

@ -11,7 +11,7 @@ import dev.vality.adapter.flow.lib.flow.full.FullThreeDsAllVersionsStepResolverI
import dev.vality.adapter.flow.lib.flow.full.GenerateTokenFullThreeDsAllVersionsStepResolverImpl; import dev.vality.adapter.flow.lib.flow.full.GenerateTokenFullThreeDsAllVersionsStepResolverImpl;
import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer; import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer;
import dev.vality.adapter.flow.lib.service.TagManagementService; import dev.vality.adapter.flow.lib.service.TagManagementService;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor; import dev.vality.adapter.flow.lib.service.impl.CallbackUrlExtractorImpl;
import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator; import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator;
import dev.vality.bender.BenderSrv; import dev.vality.bender.BenderSrv;
import dev.vality.damsel.domain.InvoicePaymentCaptured; import dev.vality.damsel.domain.InvoicePaymentCaptured;
@ -27,11 +27,10 @@ import org.springframework.test.context.ContextConfiguration;
import static dev.vality.adapter.common.damsel.DomainPackageCreators.createTargetProcessed; import static dev.vality.adapter.common.damsel.DomainPackageCreators.createTargetProcessed;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@PropertySource("classpath:application.yaml") @PropertySource("classpath:application.yaml")
@ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class, @ContextConfiguration(classes = {HandlerConfig.class, AppConfig.class, ProcessorConfig.class, SerdeConfig.class,
ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementService.class, ThreeDsCallbackController.class, TomcatEmbeddedConfiguration.class, TagManagementService.class,
CallbackUrlExtractor.class, FullThreeDsAllVersionsStepResolverImpl.class, CallbackUrlExtractorImpl.class, FullThreeDsAllVersionsStepResolverImpl.class,
GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class}) GenerateTokenFullThreeDsAllVersionsStepResolverImpl.class})
public class AbstractPaymentTest { public class AbstractPaymentTest {

2
src/test/java/dev/vality/adapter/flow/lib/flow/config/HandlerConfig.java
View File

@ -23,7 +23,7 @@ import dev.vality.adapter.flow.lib.serde.TemporaryContextDeserializer;
import dev.vality.adapter.flow.lib.serde.TemporaryContextSerializer; import dev.vality.adapter.flow.lib.serde.TemporaryContextSerializer;
import dev.vality.adapter.flow.lib.service.*; import dev.vality.adapter.flow.lib.service.*;
import dev.vality.adapter.flow.lib.utils.AdapterProperties; import dev.vality.adapter.flow.lib.utils.AdapterProperties;
import dev.vality.adapter.flow.lib.utils.CallbackUrlExtractor; import dev.vality.adapter.flow.lib.service.CallbackUrlExtractor;
import dev.vality.adapter.flow.lib.utils.TimerProperties; import dev.vality.adapter.flow.lib.utils.TimerProperties;
import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator; import dev.vality.adapter.flow.lib.validator.AdapterConfigurationValidator;
import dev.vality.bender.BenderSrv; import dev.vality.bender.BenderSrv;