jlengrand/java-spring-oldflow
1
0
Fork 0
mirror of https://github.com/jillingk/java-spring-oldflow.git synced 2026-03-10 08:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

progress :)

Browse Source
This commit is contained in:
jillingk
2023-05-17 17:45:03 +00:00
committed by GitHub
parent eb7a28bbf6
commit 15cae99ce9
5 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@@ -17,6 +17,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
implementation 'com.adyen:adyen-java-api-library:20.0.0'
implementation 'com.google.code.gson:gson:2.10.1'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
testImplementation('org.springframework.boot:spring-boot-starter-test') {
exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'

39
src/main/java/com/adyen/checkout/api/CheckoutResource.java
View File

@@ -14,7 +14,7 @@ import org.springframework.web.servlet.view.RedirectView;
import com.adyen.Client;
import com.adyen.enums.Environment;
import com.adyen.model.checkout.*;
import com.adyen.service.Checkout;
import com.adyen.service.checkout.PaymentsApi;
import com.adyen.service.exception.ApiException;
/**
@@ -28,11 +28,11 @@ public class CheckoutResource {
@Value("${ADYEN_MERCHANT_ACCOUNT}")
private String merchantAccount;
private final Checkout checkout;
private final PaymentsApi paymentsApi;
public CheckoutResource(@Value("${ADYEN_API_KEY}") String apiKey) {
var client = new Client(apiKey, Environment.TEST);
this.checkout = new Checkout(client);
this.paymentsApi = new PaymentsApi(client);
}
/**
@@ -49,7 +49,8 @@ public class CheckoutResource {
paymentMethodsRequest.setChannel(PaymentMethodsRequest.ChannelEnum.WEB);
log.info("REST request to get Adyen payment methods {}", paymentMethodsRequest);
var response = checkout.paymentMethods(paymentMethodsRequest);
PaymentMethodsResponse response = paymentsApi.paymentMethods(paymentMethodsRequest);
log.info(response.toJson());
return ResponseEntity.ok()
.body(response);
}
@@ -62,13 +63,15 @@ public class CheckoutResource {
* @throws ApiException from Adyen API.
*/
@PostMapping("/initiatePayment")
public ResponseEntity<PaymentsResponse> payments(@RequestBody PaymentsRequest body, HttpServletRequest request) throws IOException, ApiException {
var paymentRequest = new PaymentsRequest();
public ResponseEntity<PaymentResponse> payments(@RequestBody String bodyRequest, HttpServletRequest request) throws IOException, ApiException {
var body = PaymentRequest.fromJson(bodyRequest);
System.out.println(bodyRequest);
var paymentRequest = new PaymentRequest();
paymentRequest.setMerchantAccount(merchantAccount); // required
paymentRequest.setChannel(PaymentsRequest.ChannelEnum.WEB); // required
paymentRequest.setChannel(PaymentRequest.ChannelEnum.WEB); // required
var amount = new Amount()
.currency(findCurrency(body.getPaymentMethod().getType()))
.currency(findCurrency(body.getPaymentMethod().getActualInstance().getClass().getTypeName()))
.value(1000L); // value is 10€ in minor units
paymentRequest.setAmount(amount);
@@ -88,7 +91,7 @@ public class CheckoutResource {
paymentRequest.setPaymentMethod(body.getPaymentMethod());
var type = body.getPaymentMethod().getType();
var type = body.getPaymentMethod().getActualInstance().getClass().getTypeName();
// required for Klarna
if (type.contains("klarna")) {
paymentRequest.setCountryCode("DE");
@@ -108,7 +111,7 @@ public class CheckoutResource {
}
log.info("REST request to make Adyen payment {}", paymentRequest);
var response = checkout.payments(paymentRequest);
var response = paymentsApi.payments(paymentRequest);
return ResponseEntity.ok()
.body(response);
}
@@ -121,9 +124,9 @@ public class CheckoutResource {
* @throws ApiException from Adyen API.
*/
@PostMapping("/submitAdditionalDetails")
public ResponseEntity<PaymentsDetailsResponse> payments(@RequestBody PaymentsDetailsRequest detailsRequest) throws IOException, ApiException {
public ResponseEntity<PaymentDetailsResponse> payments(@RequestBody DetailsRequest detailsRequest) throws IOException, ApiException {
log.info("REST request to make Adyen payment details {}", detailsRequest);
var response = checkout.paymentsDetails(detailsRequest);
var response = paymentsApi.paymentsDetails(detailsRequest);
return ResponseEntity.ok()
.body(response);
}
@@ -137,19 +140,21 @@ public class CheckoutResource {
*/
@GetMapping("/handleShopperRedirect")
public RedirectView redirect(@RequestParam(required = false) String payload, @RequestParam(required = false) String redirectResult, @RequestParam String orderRef) throws IOException, ApiException {
var detailsRequest = new PaymentsDetailsRequest();
var detailsRequest = new DetailsRequest();
if (redirectResult != null && !redirectResult.isEmpty()) {
detailsRequest.setDetails(Collections.singletonMap("redirectResult", redirectResult));
PaymentCompletionDetails paymentCompletionDetails = PaymentCompletionDetails.fromJson(redirectResult);
detailsRequest.setDetails(paymentCompletionDetails);
} else if (payload != null && !payload.isEmpty()) {
detailsRequest.setDetails(Collections.singletonMap("payload", payload));
PaymentCompletionDetails paymentCompletionDetails2 = PaymentCompletionDetails.fromJson(payload);
detailsRequest.setDetails(paymentCompletionDetails2);
}
return getRedirectView(detailsRequest);
}
private RedirectView getRedirectView(final PaymentsDetailsRequest detailsRequest) throws ApiException, IOException {
private RedirectView getRedirectView(final DetailsRequest detailsRequest) throws ApiException, IOException {
log.info("REST request to handle payment redirect {}", detailsRequest);
var response = checkout.paymentsDetails(detailsRequest);
var response = paymentsApi.paymentsDetails(detailsRequest);
var redirectURL = "/result/";
switch (response.getResultCode()) {
case AUTHORISED:

1
src/main/resources/application.properties
View File

@@ -1 +1,2 @@
spring.jackson.default-property-inclusion=non_null
spring.http.converters.preferred-json-mapper=gson

3
src/main/resources/static/adyenImplementation.js
View File

@@ -37,6 +37,7 @@ async function initCheckout() {
},
onSubmit: (state, component) => {
if (state.isValid) {
alert("");
handleSubmission(state, component, "/api/initiatePayment");
}
},
@@ -46,7 +47,7 @@ async function initCheckout() {
};
// `spring.jackson.default-property-inclusion=non_null` needs to set in
// src/main/resources/application.properties to avoid NPE here
const checkout = new AdyenCheckout(configuration);
const checkout = await AdyenCheckout(configuration);
checkout.create(type).mount(document.getElementById("payment"));
} catch (error) {
console.error(error);

8
src/main/resources/templates/layout.html
View File

@@ -20,13 +20,13 @@
crossorigin="anonymous"
/>
<script src="https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/4.1.0/adyen.js"
integrity="sha384-3tEepwhhMcyxgIbL3HBe3I59BpSMNyKoNrbKWARYH1tJ7K7K6NdTDqOltKlwiVsH"
<script src="https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/5.23.1/adyen.js"
integrity="sha384-O0Q35c47I1ojd1zrD78yWAs+r5gytAjBC/sxwZqgQW5z9hDbAFM49z8SViprrDwm"
crossorigin="anonymous"></script>
<link rel="stylesheet"
href="https://checkoutshopper-live.adyen.com/checkoutshopper/sdk/4.1.0/adyen.css"
integrity="sha384-+CPzBNZVkBXu4uXDECnVuVQ24Kl8vWrR61UzuuuUj5IBEP//BQ0G0KDNfz2iPcvJ"
href="https://checkoutshopper-test.adyen.com/checkoutshopper/sdk/5.23.1/adyen.css"
integrity="sha384-y6jvSkH/EJ+EmVfUABibJST5Df3+PXlPuQveX3NigzwJmiNofEBsUXxbxoaEllaI"
crossorigin="anonymous">
<link rel="stylesheet" href="/css/application.css" />