cmd/api/handlers-api.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	"encoding/json"
-	"myapp/internal/cards"
 	"net/http"
-	"strconv"
 )
 
 type stripePayload struct {
@@ -14,54 +12,21 @@ type stripePayload struct {
 
 type jsonResponse struct {
 	OK      bool   `json:"ok"`
-	Message string `json:"message,omitempty"`
-	Content string `json:"content,omitempty"`
-	ID      int    `json:"id,omitempty"`
+	Message string `json:"message"`
+	Content string `json:"content"`
+	ID      int    `json:"id"`
 }
 
 func (app *application) GetPaymentIntent(w http.ResponseWriter, r *http.Request) {
-	var payload stripePayload
+	j := jsonResponse{
+		OK: true,
+	}
 
-	err := json.NewDecoder(r.Body).Decode(&payload)
+	out, err := json.MarshalIndent(j, "", "    ")
 	if err != nil {
 		app.errorLog.Println(err)
-		return // TODO: return a valid json
 	}
 
-	amount, err := strconv.Atoi(payload.Amount)
-	if err != nil {
-		app.errorLog.Println(err)
-		return // TODO: return a valid json
-	}
-
-	card := cards.Card{
-		Secret:   app.config.stripe.secret,
-		Key:      app.config.stripe.key,
-		Currency: payload.Currency,
-	}
-
-	pi, msg, err := card.Charge(payload.Currency, amount)
-	if err != nil {
-		j := jsonResponse{
-			OK:      false,
-			Message: msg,
-			Content: "",
-		}
-
-		out, err := json.MarshalIndent(j, "", "    ")
-		if err != nil {
-			app.errorLog.Println(err)
-		}
-		w.Header().Set("Content-Type", "application/json")
-		w.Write(out)
-		return
-	}
-
-	out, err := json.MarshalIndent(pi, "", "    ")
-	if err != nil {
-		app.errorLog.Println(err)
-		return // TODO: return a valid json
-	}
 	w.Header().Set("Content-Type", "application/json")
 	w.Write(out)
 }

cmd/api/routes-api.go

@@ -18,6 +18,6 @@ func (app *application) routes() http.Handler {
 		MaxAge:           300,
 	}))
 
-	mux.Post("/api/payment-intent", app.GetPaymentIntent)
+	mux.Get("/api/payment-intent", app.GetPaymentIntent)
 	return mux
 }

cmd/web/handlers.go

@@ -5,41 +5,7 @@ import (
 )
 
 func (app *application) VirtualTerminal(w http.ResponseWriter, r *http.Request) {
-	stringMap := make(map[string]string)
-	stringMap["publishable_key"] = app.config.stripe.key
-	if err := app.renderTemplate(w, r, "terminal", &templateData{
-		StringMap: stringMap,
-	}); err != nil {
-		app.errorLog.Println(err)
-	}
-}
-
-func (app *application) PaymentSucceeded(w http.ResponseWriter, r *http.Request) {
-	err := r.ParseForm()
-	if err != nil {
-		app.errorLog.Println(err)
-		return
-	}
-
-	// read posted data
-	cardHolder := r.Form.Get("cardholder_name")
-	email := r.Form.Get("cardholder_email")
-	paymentIntent := r.Form.Get("payment_intent")
-	paymentMethod := r.Form.Get("payment_method")
-	paymentAmount := r.Form.Get("payment_amount")
-	paymentCurrency := r.Form.Get("payment_currency")
-
-	data := make(map[string]interface{})
-	data["cardholder"] = cardHolder
-	data["email"] = email
-	data["pi"] = paymentIntent
-	data["pm"] = paymentMethod
-	data["pa"] = paymentAmount
-	data["pc"] = paymentCurrency
-
-	if err := app.renderTemplate(w, r, "succeeded", &templateData{
-		Data: data,
-	}); err != nil {
+	if err := app.renderTemplate(w, r, "terminal", nil); err != nil {
 		app.errorLog.Println(err)
 	}
 }

cmd/web/render.go

@@ -28,8 +28,7 @@ var functions = template.FuncMap{}
 var templateFS embed.FS
 
 func (app *application) addDefaultData(td *templateData, r *http.Request) *templateData {
-	td.API = app.config.api
-	return td
+	return nil
 }
 
 func (app *application) renderTemplate(

cmd/web/routes.go

@@ -10,7 +10,6 @@ func (app *application) routes() http.Handler {
 	mux := chi.NewRouter()
 
 	mux.Get("/virtual-terminal", app.VirtualTerminal)
-	mux.Post("/payment-succeeded", app.PaymentSucceeded)
 
 	return mux
 }

cmd/web/templates/succeeded.page.gohtml

@@ -1,14 +0,0 @@
-{{ template "base" . }}
-{{ define "title" }}
-Payment Succedded!
-{{ end }}
-{{ define "content" }}
-<h2 class="mt-5">Payment Succeeded</h2>
-<hr>
-<p>Payment Intent: {{ index .Data "pi" }}</p>
-<p>Cardholder: {{ index .Data "cardholder" }}</p>
-<p>Email: {{ index .Data "email" }}</p>
-<p>Payment Method: {{ index .Data "pm" }}</p>
-<p>Payment Amount: {{ index .Data "pa" }}</p>
-<p>Currency: {{ index .Data "pc" }}</p>
-{{ end }}

cmd/web/templates/terminal.page.gohtml

@@ -6,7 +6,7 @@ Virtual Terminal
 <h2 class="mt-3 text-center">Virtual Terminal</h2>
 <hr>
 <div class="alert alert-danger text-center d-none" id="card-messages"></div>
-<form action="/payment-succeeded"
+<form action="/payment-succecded"
       method="post"
       name="charge_form"
       id="charge_form"
@@ -57,12 +57,6 @@ Virtual Terminal
             <span class="visually-hidden">Loading...</span>
         </div>
     </div>
-
-    <input id="payment_intent" type="hidden" name="payment_intent" value="payment_intent">
-    <input id="payment_method" type="hidden" name="payment_method" value="payment_method">
-    <input id="payment_amount" type="hidden" name="payment_amount" value="payment_amount">
-    <input id="payment_currency" type="hidden" name="payment_currency" value="payment_currency">
-
 </form>
 {{ end }}
 {{ define "js" }}
@@ -75,32 +69,13 @@ const cardMessages = document.getElementById("card-messages");
 const payButton = document.getElementById("pay-button");
 const processing = document.getElementById("processing-payment");
 
-stripe = Stripe('{{index .StringMap "publishable_key"}}');
+stripe = Stripe(''); // TODO: Publish key to be added
 
 function hidePayButton() {
     payButton.classList.add("d-none");
     processing.classList.remove("d-none");
 }
 
-function showPayButton() {
-    payButton.classList.remove("d-none");
-    processing.classList.add("d-none");
-}
-
-function showCardError(msg) {
-    cardMessages.classList.add("alert-danger");
-    cardMessages.classList.remove("alert-success");
-    cardMessages.classList.remove("d-none");
-    cardMessages.innerText = msg;
-}
-
-function showCardSuccess() {
-    cardMessages.classList.add("alert-success");
-    cardMessages.classList.remove("alert-danger");
-    cardMessages.classList.remove("d-none");
-    cardMessages.innerText = "Trasaction successful";
-}
-
 function val() {
     let form = document.getElementById("charge_form");
 
@@ -112,61 +87,6 @@ function val() {
     }
     form.classList.add("was-validated");
     hidePayButton();
-
-    let amountToCharge = String(parseFloat(document.getElementById("amount").value) * 100);
-    let payload = {
-        amount: amountToCharge,
-        currency: 'eur',
-    };
-
-    const requestOptions = {
-        method: 'post',
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(payload),
-    };
-
-    fetch("{{index .API}}/api/payment-intent", requestOptions)
-    .then(response => response.text())
-        .then(response => {
-            let data;
-            try {
-                data = JSON.parse(response);
-                stripe.confirmCardPayment(data.client_secret, {
-                    payment_method: {
-                        card: card,
-                        billing_details: {
-                            name: document.getElementById("cardholder-name").value,
-                        }
-                    }
-                }).then(function(result) {
-                        if (result.error) {
-                            // card declined, or sth went wrong with the card
-                            showCardError(result.error.message);
-                            showPayButton();
-                        } else if (result.paymentIntent) {
-                            if (result.paymentIntent.status === "succeeded") {
-                                // we have charged the card
-                                document.getElementById("payment_intent").value = result.paymentIntent.id;
-                                document.getElementById("payment_method").value = result.paymentIntent.payment_method_types[0];
-                                document.getElementById("payment_amount").value = result.paymentIntent.amount;
-                                document.getElementById("payment_currency").value = result.paymentIntent.currency;
-                                processing.classList.add("d-none");
-                                showCardSuccess();
-                                document.getElementById("charge_form").submit();
-                            }
-                        }
-                    })
-                console.log(data);
-
-            } catch (err) {
-                console.log(err);
-                showCardError("Invalid response from payment gateway!");
-                showPayButton();
-            }
-        });
 }
 
 (function () {