Backend: - Create square_http_client.go: real Square REST API client (Payments, Terminal Checkouts, Refunds, Cards, Locations) with proper JSON types, auth, error handling - Update ProdClient in square.go to delegate to shared HTTP functions - Wire devProdClient in square_dev.go to also make real HTTP calls for sandbox/prod env - Rewrite CreateTipPayment handler: accept card_id OR new_card_token (+save_card), advisory lock, idempotency check, max amount validation - Add ValidateCardInfo, bump ValidateAmount max to £10,000 - Fix mock CreateCardOnFile to detect brand/last4 from raw card numbers - Fix mock RefundPayment to index by SquarePayID and accept unknown payment IDs - Remove dead types (ProcessingFee, sqAddress), add Deadline parity - Fix AMEX brand inconsistency (AMEX -> AMERICAN_EXPRESS) - Pre-existing fix: remove unused context import in giftcards.go Frontend: - CardInput.svelte: add onfieldblur/onfieldinput callbacks for blur-based validation - CardBrandIcon.svelte: brand SVGs for VISA, MC, AMEX, Discover, Diners, JCB, Square Gift Card, UnionPay, Interac, EFTPOS - tip/+page, pay-tip/[id], UserBookingModal tip: saved card list + CardInput + Luhn/expiry/CVC validation + blur-based errors + no-saved-cards edge case - UserPaymentModal, BookingFlow: card validation parity (blur-based, all-valid check) - account page: replace text brand badges with CardBrandIcon - Fix handleCustomTip bug (state mutations outside if block) - Remove dead pageState variable - Add tip modal scroll (max-h-[90vh] overflow-y-auto) - Submit button disabled on !isCardValid Tests: - 30 square package tests (+new: CreateCardOnFile raw number path, detectCardInfo variants) - 5 tip handler tests (HappyPath, NoPriorPayment, WrongOwner, MultipleTips, TxFailure) - All +-race clean, refund tests fixed
466 lines
14 KiB
Go
466 lines
14 KiB
Go
//go:build dev
|
|
|
|
package square
|
|
|
|
import (
|
|
"context"
|
|
"crussell/clock"
|
|
"fmt"
|
|
"log"
|
|
"os"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
var Client SquareClient
|
|
|
|
var isTesting = os.Getenv("GO_TESTING") == "1"
|
|
|
|
func mockSleep(d time.Duration) {
|
|
if !isTesting {
|
|
time.Sleep(d)
|
|
}
|
|
}
|
|
|
|
type MockClient struct {
|
|
mu sync.RWMutex
|
|
cards map[string]map[string]*CardOnFile
|
|
checkouts map[string]*CheckoutResult
|
|
payments map[string]*PaymentResult
|
|
refunds map[string]*RefundResult
|
|
completed map[string]*PaymentResult
|
|
HoldCheckouts bool
|
|
ShouldFail bool // if true, CreatePayment/RefundPayment return errors for testing error paths
|
|
}
|
|
|
|
type devProdClient struct{}
|
|
|
|
func (d *devProdClient) CreatePayment(ctx context.Context, req CreatePaymentReq) (*PaymentResult, error) {
|
|
return createPaymentHTTP(ctx, req)
|
|
}
|
|
func (d *devProdClient) CreateCheckout(ctx context.Context, req CreateCheckoutReq) (*CheckoutResult, error) {
|
|
return createCheckoutHTTP(ctx, req)
|
|
}
|
|
func (d *devProdClient) GetCheckout(ctx context.Context, checkoutID string) (*PaymentResult, error) {
|
|
return getCheckoutHTTP(ctx, checkoutID)
|
|
}
|
|
func (d *devProdClient) RefundPayment(ctx context.Context, req RefundPaymentReq) (*RefundResult, error) {
|
|
return refundPaymentHTTP(ctx, req)
|
|
}
|
|
func (d *devProdClient) CreateCardOnFile(ctx context.Context, userID, cardToken string) (*CardOnFile, error) {
|
|
return createCardOnFileHTTP(ctx, userID, cardToken)
|
|
}
|
|
func (d *devProdClient) CreateCardOnFileRaw(ctx context.Context, userID, cardNumber string, expMonth, expYear int, cvc string) (*CardOnFile, error) {
|
|
return nil, fmt.Errorf("square: raw card number input is not supported in production — use CreateCardOnFile with a card nonce")
|
|
}
|
|
func (d *devProdClient) GetCardsOnFile(ctx context.Context, userID string) ([]CardOnFile, error) {
|
|
return getCardsOnFileHTTP(ctx, userID)
|
|
}
|
|
func (d *devProdClient) DeleteCardOnFile(ctx context.Context, cardID string) error {
|
|
return deleteCardOnFileHTTP(ctx, cardID)
|
|
}
|
|
|
|
func NewClient() SquareClient {
|
|
return NewDevClient()
|
|
}
|
|
|
|
func NewDevClient() SquareClient {
|
|
env := os.Getenv("SQUARE_ENVIRONMENT")
|
|
if env == "sandbox" || env == "production" {
|
|
log.Printf("[SQUARE-PROD] SQUARE_ENVIRONMENT=%s — making real API calls to %s", env, realBaseURL(env))
|
|
return &devProdClient{}
|
|
}
|
|
log.Println("[SQUARE-MOCK] Using in-memory mock client")
|
|
return &MockClient{
|
|
cards: make(map[string]map[string]*CardOnFile),
|
|
checkouts: make(map[string]*CheckoutResult),
|
|
payments: make(map[string]*PaymentResult),
|
|
refunds: make(map[string]*RefundResult),
|
|
completed: make(map[string]*PaymentResult),
|
|
}
|
|
}
|
|
|
|
func detectCardInfo(sourceID string) (brand, last4 string) {
|
|
switch sourceID {
|
|
case "cnon:test-card":
|
|
return "VISA", "4242"
|
|
case "cnon:visa":
|
|
return "VISA", "1111"
|
|
case "cnon:mastercard":
|
|
return "MASTERCARD", "4444"
|
|
case "cnon:amex":
|
|
return "AMERICAN_EXPRESS", "0005"
|
|
default:
|
|
return "VISA", "4242"
|
|
}
|
|
}
|
|
|
|
func (m *MockClient) CreatePayment(ctx context.Context, req CreatePaymentReq) (*PaymentResult, error) {
|
|
if m.ShouldFail {
|
|
return nil, fmt.Errorf("mock: payment declined (simulated failure)")
|
|
}
|
|
log.Printf("[SQUARE-MOCK] CreatePayment: amount=%d, reference=%s, source=%s", req.Amount, req.ReferenceID, req.SourceID)
|
|
mockSleep(1 * time.Second)
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
now := clock.Now().UTC()
|
|
|
|
status := "COMPLETED"
|
|
if req.Autocomplete != nil && !*req.Autocomplete {
|
|
status = "APPROVED"
|
|
}
|
|
|
|
amount := req.Amount
|
|
tipAmount := int64(0)
|
|
if req.TipMoney != nil {
|
|
tipAmount = *req.TipMoney
|
|
amount += tipAmount
|
|
}
|
|
|
|
cardBrand, cardLast4 := detectCardInfo(req.SourceID)
|
|
|
|
// Entry method: ON_FILE for card-on-file tokens, KEYED for nonces
|
|
entryMethod := "KEYED"
|
|
if len(req.SourceID) >= 5 && req.SourceID[:5] == "ccof:" {
|
|
entryMethod = "ON_FILE"
|
|
}
|
|
|
|
paymentID := fmt.Sprintf("pay_mock_%d", now.UnixNano())
|
|
fees := amount*14/1000 + 25 // online rate: 1.4% + 25p
|
|
|
|
locationID := req.LocationID
|
|
if locationID == "" {
|
|
locationID = "L_MOCK"
|
|
}
|
|
|
|
result := &PaymentResult{
|
|
ID: paymentID,
|
|
Status: status,
|
|
Amount: amount,
|
|
CardBrand: cardBrand,
|
|
CardLast4: cardLast4,
|
|
CardFingerprint: fmt.Sprintf("sqfp_mock_%d", now.UnixNano()),
|
|
ExpMonth: 12,
|
|
ExpYear: 2030,
|
|
EntryMethod: entryMethod,
|
|
CVVStatus: "CVV_ACCEPTED",
|
|
AVSStatus: "AVS_ACCEPTED",
|
|
TipAmount: tipAmount,
|
|
ReceiptURL: "https://squareup.com/receipt/" + paymentID,
|
|
ReceiptNumber: fmt.Sprintf("RCPT_mock_%d", now.UnixNano()),
|
|
SquarePayID: "sqp_" + paymentID,
|
|
Fees: fees,
|
|
BuyerEmail: req.BuyerEmail,
|
|
CustomerID: req.CustomerID,
|
|
LocationID: locationID,
|
|
CreatedAt: now.Format(time.RFC3339),
|
|
UpdatedAt: now.Format(time.RFC3339),
|
|
ReferenceID: req.ReferenceID,
|
|
}
|
|
m.payments[paymentID] = result
|
|
m.payments[result.SquarePayID] = result
|
|
log.Printf("[SQUARE-MOCK] Payment created: id=%s, status=%s, amount=%d, fees=%d", paymentID, status, amount, fees)
|
|
return result, nil
|
|
}
|
|
|
|
func (m *MockClient) CreateCheckout(ctx context.Context, req CreateCheckoutReq) (*CheckoutResult, error) {
|
|
log.Printf("[SQUARE-MOCK] CreateCheckout: amount=%d, tipEnabled=%v, reference=%s", req.Amount, req.TipEnabled, req.ReferenceID)
|
|
|
|
now := clock.Now().UTC()
|
|
checkoutID := fmt.Sprintf("chk_mock_%d", now.UnixNano())
|
|
|
|
result := &CheckoutResult{
|
|
ID: checkoutID,
|
|
Status: "PENDING",
|
|
AmountMoney: req.Amount,
|
|
Currency: req.Currency,
|
|
DeviceID: req.DeviceID,
|
|
ReferenceID: req.ReferenceID,
|
|
Note: req.Note,
|
|
CreatedAt: now.Format(time.RFC3339),
|
|
UpdatedAt: now.Format(time.RFC3339),
|
|
Deadline: now.Add(5 * time.Minute).Format(time.RFC3339),
|
|
}
|
|
|
|
m.mu.Lock()
|
|
m.checkouts[checkoutID] = result
|
|
m.mu.Unlock()
|
|
|
|
// Copy the result before spawning the goroutine to avoid data races.
|
|
// The caller gets this copy; the goroutine modifies the map-stored original.
|
|
resultCopy := *result
|
|
|
|
if !m.HoldCheckouts {
|
|
go func() {
|
|
defer func() {
|
|
if r := recover(); r != nil {
|
|
log.Printf("Panic recovered in Square mock payment processing: %v", r)
|
|
}
|
|
}()
|
|
mockSleep(3 * time.Second)
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
payNow := clock.Now().UTC()
|
|
paymentID := fmt.Sprintf("pay_mock_%d", payNow.UnixNano())
|
|
amount := req.Amount
|
|
tipAmount := int64(0)
|
|
if req.TipEnabled {
|
|
tipAmount = 500
|
|
amount += tipAmount
|
|
}
|
|
fees := amount * 175 / 10000 // in-person rate: 1.75%
|
|
|
|
paymentResult := &PaymentResult{
|
|
ID: paymentID,
|
|
Status: "COMPLETED",
|
|
Amount: amount,
|
|
CardBrand: "VISA",
|
|
CardLast4: "4242",
|
|
CardFingerprint: fmt.Sprintf("sqfp_mock_%d", payNow.UnixNano()),
|
|
ExpMonth: 12,
|
|
ExpYear: 2030,
|
|
EntryMethod: "EMV",
|
|
CVVStatus: "CVV_ACCEPTED",
|
|
AVSStatus: "AVS_ACCEPTED",
|
|
TipAmount: tipAmount,
|
|
ReceiptURL: "https://squareup.com/receipt/" + paymentID,
|
|
ReceiptNumber: fmt.Sprintf("RCPT_mock_%d", payNow.UnixNano()),
|
|
SquarePayID: "sqp_" + paymentID,
|
|
Fees: fees,
|
|
CustomerID: req.CustomerID,
|
|
LocationID: "L_MOCK",
|
|
CreatedAt: payNow.Format(time.RFC3339),
|
|
UpdatedAt: payNow.Format(time.RFC3339),
|
|
ReferenceID: req.ReferenceID,
|
|
}
|
|
m.completed[checkoutID] = paymentResult
|
|
m.checkouts[checkoutID].Status = "COMPLETED"
|
|
m.checkouts[checkoutID].UpdatedAt = payNow.Format(time.RFC3339)
|
|
m.checkouts[checkoutID].PaymentIDs = []string{paymentID}
|
|
log.Printf("[SQUARE-MOCK] Checkout completed: id=%s, amount=%d, tip=%d", checkoutID, amount, tipAmount)
|
|
}()
|
|
}
|
|
|
|
return &resultCopy, nil
|
|
}
|
|
|
|
func (m *MockClient) GetCheckout(ctx context.Context, checkoutID string) (*PaymentResult, error) {
|
|
log.Printf("[SQUARE-MOCK] GetCheckout: id=%s", checkoutID)
|
|
|
|
m.mu.RLock()
|
|
defer m.mu.RUnlock()
|
|
|
|
checkout, ok := m.checkouts[checkoutID]
|
|
if !ok {
|
|
return nil, fmt.Errorf("checkout not found: %s", checkoutID)
|
|
}
|
|
|
|
if checkout.Status == "PENDING" {
|
|
return nil, fmt.Errorf("checkout pending")
|
|
}
|
|
|
|
result, ok := m.completed[checkoutID]
|
|
if !ok {
|
|
return nil, fmt.Errorf("checkout result not found: %s", checkoutID)
|
|
}
|
|
|
|
return result, nil
|
|
}
|
|
|
|
func (m *MockClient) RefundPayment(ctx context.Context, req RefundPaymentReq) (*RefundResult, error) {
|
|
if m.ShouldFail {
|
|
return nil, fmt.Errorf("mock: refund declined (simulated failure)")
|
|
}
|
|
log.Printf("[SQUARE-MOCK] RefundPayment: payment=%s, amount=%d", req.PaymentID, req.Amount)
|
|
mockSleep(1 * time.Second)
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
now := clock.Now().UTC()
|
|
refundID := fmt.Sprintf("ref_mock_%d", now.UnixNano())
|
|
|
|
payment, ok := m.payments[req.PaymentID]
|
|
if !ok {
|
|
// Payment not in mock map — this happens when integration tests
|
|
// create payments via DB fixture with a square_payment_id, bypassing
|
|
// the mock. Process the refund without full payment data.
|
|
log.Printf("[SQUARE-MOCK] RefundPayment: payment %s not in mock map — proceeding without full payment data", req.PaymentID)
|
|
}
|
|
|
|
amount := req.Amount
|
|
if amount == 0 && ok {
|
|
amount = payment.Amount
|
|
}
|
|
|
|
locationID := req.LocationID
|
|
if locationID == "" {
|
|
locationID = "L_MOCK"
|
|
}
|
|
|
|
result := &RefundResult{
|
|
ID: refundID,
|
|
Status: "COMPLETED",
|
|
Amount: amount,
|
|
PaymentID: req.PaymentID,
|
|
LocationID: locationID,
|
|
Reason: req.Reason,
|
|
CreatedAt: now.Format(time.RFC3339),
|
|
}
|
|
m.refunds[refundID] = result
|
|
log.Printf("[SQUARE-MOCK] Refund completed: id=%s, payment=%s, amount=%d", refundID, req.PaymentID, amount)
|
|
return result, nil
|
|
}
|
|
|
|
func (m *MockClient) CreateCardOnFile(ctx context.Context, userID, cardToken string) (*CardOnFile, error) {
|
|
log.Printf("[SQUARE-MOCK] CreateCardOnFile: user=%s", userID)
|
|
|
|
// Detect card info from the input token.
|
|
// Raw card numbers (digit-only, possibly with spaces) are parsed directly.
|
|
// Nonce-like tokens (cnon:xxx etc.) use detectCardInfo for mapped values.
|
|
cleanDigits := strings.ReplaceAll(cardToken, " ", "")
|
|
cardBrand := "VISA"
|
|
cardLast4 := "4242"
|
|
cardExpMonth := 12
|
|
cardExpYear := 2030
|
|
|
|
if isAllDigits(cleanDigits) && len(cleanDigits) >= 13 {
|
|
cardLast4 = cleanDigits[len(cleanDigits)-4:]
|
|
firstDigit := string(cleanDigits[0])
|
|
switch firstDigit {
|
|
case "4":
|
|
cardBrand = "VISA"
|
|
case "5":
|
|
cardBrand = "MASTERCARD"
|
|
case "3":
|
|
cardBrand = "AMERICAN_EXPRESS"
|
|
case "6":
|
|
cardBrand = "DISCOVER"
|
|
}
|
|
} else {
|
|
brand, last4 := detectCardInfo(cardToken)
|
|
cardBrand = brand
|
|
cardLast4 = last4
|
|
}
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
if m.cards[userID] == nil {
|
|
m.cards[userID] = make(map[string]*CardOnFile)
|
|
}
|
|
|
|
now := clock.Now().UTC()
|
|
cardID := fmt.Sprintf("mock_card_%d", now.UnixNano())
|
|
card := &CardOnFile{
|
|
ID: cardID,
|
|
CardID: fmt.Sprintf("ccof_mock_%d", now.UnixNano()),
|
|
Brand: cardBrand,
|
|
Last4: cardLast4,
|
|
ExpMonth: cardExpMonth,
|
|
ExpYear: cardExpYear,
|
|
Fingerprint: fmt.Sprintf("sqfp_mock_%d", now.UnixNano()),
|
|
CardholderName: "John Doe",
|
|
CustomerID: userID,
|
|
Enabled: true,
|
|
IsDefault: len(m.cards[userID]) == 0,
|
|
Version: 1,
|
|
CreatedAt: now.Format(time.RFC3339),
|
|
}
|
|
m.cards[userID][cardID] = card
|
|
log.Printf("[SQUARE-MOCK] Card created: id=%s, brand=%s, last4=%s", cardID, card.Brand, card.Last4)
|
|
return card, nil
|
|
}
|
|
|
|
func (m *MockClient) CreateCardOnFileRaw(ctx context.Context, userID, cardNumber string, expMonth, expYear int, cvc string) (*CardOnFile, error) {
|
|
log.Printf("[SQUARE-MOCK] CreateCardOnFileRaw: user=%s", userID)
|
|
|
|
if len(cardNumber) < 4 {
|
|
return nil, fmt.Errorf("invalid card number: too short")
|
|
}
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
if m.cards[userID] == nil {
|
|
m.cards[userID] = make(map[string]*CardOnFile)
|
|
}
|
|
|
|
now := clock.Now().UTC()
|
|
cardID := fmt.Sprintf("mock_card_%d", now.UnixNano())
|
|
last4 := cardNumber[len(cardNumber)-4:]
|
|
brands := map[string]string{"4": "VISA", "5": "MASTERCARD", "3": "AMERICAN_EXPRESS", "6": "DISCOVER"}
|
|
brand := brands[string(cardNumber[0])]
|
|
if brand == "" {
|
|
brand = "UNKNOWN"
|
|
}
|
|
|
|
card := &CardOnFile{
|
|
ID: cardID,
|
|
CardID: fmt.Sprintf("ccof_mock_%d", now.UnixNano()),
|
|
Brand: brand,
|
|
Last4: last4,
|
|
ExpMonth: expMonth,
|
|
ExpYear: expYear,
|
|
Fingerprint: fmt.Sprintf("sqfp_mock_%d", now.UnixNano()),
|
|
CardholderName: "John Doe",
|
|
CustomerID: userID,
|
|
Enabled: true,
|
|
IsDefault: len(m.cards[userID]) == 0,
|
|
Version: 1,
|
|
CreatedAt: now.Format(time.RFC3339),
|
|
}
|
|
m.cards[userID][cardID] = card
|
|
log.Printf("[SQUARE-MOCK] Card created: id=%s, brand=%s, last4=%s", cardID, card.Brand, card.Last4)
|
|
return card, nil
|
|
}
|
|
|
|
func (m *MockClient) GetCardsOnFile(ctx context.Context, userID string) ([]CardOnFile, error) {
|
|
log.Printf("[SQUARE-MOCK] GetCardsOnFile: user=%s", userID)
|
|
|
|
m.mu.RLock()
|
|
defer m.mu.RUnlock()
|
|
|
|
userCards, ok := m.cards[userID]
|
|
if !ok {
|
|
return []CardOnFile{}, nil
|
|
}
|
|
|
|
var cards []CardOnFile
|
|
for _, card := range userCards {
|
|
cards = append(cards, *card)
|
|
}
|
|
return cards, nil
|
|
}
|
|
|
|
func (m *MockClient) DeleteCardOnFile(ctx context.Context, cardID string) error {
|
|
log.Printf("[SQUARE-MOCK] DeleteCardOnFile: id=%s", cardID)
|
|
|
|
m.mu.Lock()
|
|
defer m.mu.Unlock()
|
|
|
|
for userID, cards := range m.cards {
|
|
if card, ok := cards[cardID]; ok {
|
|
card.Enabled = false
|
|
log.Printf("[SQUARE-MOCK] Card disabled: id=%s (user=%s)", cardID, userID)
|
|
return nil
|
|
}
|
|
}
|
|
return fmt.Errorf("card not found: %s", cardID)
|
|
}
|
|
|
|
// isAllDigits returns true if every rune in s is an ASCII digit.
|
|
func isAllDigits(s string) bool {
|
|
for _, r := range s {
|
|
if r < '0' || r > '9' {
|
|
return false
|
|
}
|
|
}
|
|
return len(s) > 0
|
|
}
|