Few minor changes in PayPal integration

Author: TobyNartowski

src/main/java/pl/simplemethod/codebin/paypal/PayPalBillingPlan.java

@@ -21,8 +21,8 @@ public PayPalBillingPlan(APIContext apiContext) {
  this.apiContext = apiContext;
  }
 
- private static final String CANCEL_URL = "http://localhost/subscribe-failure";
- private static final String PROCESS_URL = "http://localhost/subscribe-success";
+ private static final String CANCEL_URL = "http://127.0.0.1/dashboard/dashboard-payment-error.html";
+ private static final String PROCESS_URL = "http://127.0.0.1/dashboard/dashboard-payment-accept.html";
 
  /**
  * Creates a plan to billing plan

src/main/java/pl/simplemethod/codebin/paypal/PayPalController.java

@@ -3,15 +3,19 @@
 import com.paypal.api.payments.Agreement;
 import com.paypal.api.payments.Plan;
 import com.paypal.base.rest.PayPalRESTException;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 
 @RestController
+@RequestMapping("paypal")
 public class PayPalController {
 
  private PayPalBillingPlan payPalBillingPlan;
@@ -25,20 +29,27 @@ public PayPalController(PayPalBillingPlan payPalBillingPlan, PayPalBillingAgreem
 
  /**
  * Define and create billing plan and billing agreement.
- * Redirects response to successful or unsuccessful URL
+ * Redirects response to returned URL
  */
  @GetMapping("/subscribe")
- public void subscribe() {
+ public @ResponseBody ResponseEntity subscribe() {
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+
  try {
  Plan plan = payPalBillingPlan.create();
  Agreement agreement = payPalBillingAgreement.define(plan.getId());
- String redirect = payPalBillingAgreement.create(agreement);
- // TODO: 02/06/2019 REDIRECT to redirect url
+
+ JSONObject body = new JSONObject();
+ body.put("url", payPalBillingAgreement.create(agreement));
+ return new ResponseEntity<>(body.toString(), headers, HttpStatus.valueOf(200));
  } catch (PayPalRESTException e) {
  System.err.println(e.getDetails());
  } catch (MalformedURLException | UnsupportedEncodingException e) {
  e.printStackTrace();
  }
+
+ return new ResponseEntity<>("", headers, HttpStatus.BAD_REQUEST);
  }
 
  /**

src/main/resources/public/dashboard/dashboard-profile.html

@@ -125,7 +125,7 @@ <h3 class="page-title">Premium Plan</h3>
  </div>
  <span>Do not wait and buy your access right now!</span>
  <h4 class="mb-4">Only for <span style="text-decoration: line-through;">$19.99</span> <b>$9.95</b>/month*</h4>
- <a href="dashboard-payment-accept.html">
+ <a href="/paypal/subscribe">
  <button type="button" class="mb-5 btn btn-primary mr-2 btn-block"><i class="fab fa-paypal p-1"></i> Buy with PayPal</button>
  </a>
  </div>