fix(creditcall): restore SDK timeout and cancellation classification
This commit is contained in:
@@ -16,6 +16,22 @@ import (
|
||||
// creditCallProcessor delegates to the unchanged legacy execution/finalization core.
|
||||
type creditCallProcessor struct{ app *App }
|
||||
|
||||
type creditCallInitialKind uint8
|
||||
|
||||
const (
|
||||
creditCallInitialUnknown creditCallInitialKind = iota
|
||||
creditCallInitialApproved
|
||||
creditCallInitialDeclined
|
||||
creditCallInitialCancelled
|
||||
creditCallInitialTimeout
|
||||
)
|
||||
|
||||
// creditCallInitialResult describes only the completed initial SDK response.
|
||||
type creditCallInitialResult struct {
|
||||
kind creditCallInitialKind
|
||||
reason string
|
||||
}
|
||||
|
||||
func (*creditCallProcessor) ValidatePreauth(req paymentsvc.SaleRequest) error {
|
||||
if req.Amount < 0 {
|
||||
return paymentsvc.ErrPreauthUnsupported
|
||||
@@ -34,12 +50,17 @@ func (p *creditCallProcessor) run(ctx context.Context, req paymentsvc.SaleReques
|
||||
transaction.AmountMinorUnits = ""
|
||||
transaction.TransactionType = "AccountVerification"
|
||||
}
|
||||
var initial creditCallInitialResult
|
||||
start := func(client *http.Client) (creditcall.TransactionResultXML, error) {
|
||||
return callChipDNATransactionStream(context.WithoutCancel(ctx), client, transaction, func(code string) {
|
||||
result, err := callChipDNATransactionStream(context.WithoutCancel(ctx), client, transaction, func(code string) {
|
||||
if status != nil {
|
||||
status(paymentsvc.StatusUpdate{Code: code})
|
||||
}
|
||||
})
|
||||
if err == nil {
|
||||
initial = classifyCreditCallInitialResult(result)
|
||||
}
|
||||
return result, err
|
||||
}
|
||||
var outcome creditCallSaleOutcome
|
||||
if preauth {
|
||||
@@ -48,7 +69,7 @@ func (p *creditCallProcessor) run(ctx context.Context, req paymentsvc.SaleReques
|
||||
} else {
|
||||
outcome = p.app.executeCreditCallSale(transaction, start)
|
||||
}
|
||||
final := outcome.streamResult()
|
||||
final := outcome.streamResult(initial)
|
||||
final.AmountMinor, final.CurrencyCode = req.Amount, req.Currency
|
||||
if outcome.Approved {
|
||||
if raw := outcome.Payment.Fields[types.TotalAmount]; raw != "" {
|
||||
@@ -66,7 +87,37 @@ func (p *creditCallProcessor) run(ctx context.Context, req paymentsvc.SaleReques
|
||||
return &paymentsvc.Result{Terminal: final}, nil
|
||||
}
|
||||
|
||||
func (outcome creditCallSaleOutcome) streamResult() paymentapi.Result {
|
||||
func classifyCreditCallInitialResult(result creditcall.TransactionResultXML) creditCallInitialResult {
|
||||
var transactionResult, sdkError string
|
||||
for _, entry := range result.Entries {
|
||||
switch entry.Key {
|
||||
case types.TransactionResult:
|
||||
transactionResult = entry.Value
|
||||
case types.Errors:
|
||||
sdkError = entry.Value
|
||||
}
|
||||
}
|
||||
transactionResult = strings.ToLower(transactionResult)
|
||||
switch transactionResult {
|
||||
case types.ResultApproved:
|
||||
return creditCallInitialResult{kind: creditCallInitialApproved}
|
||||
case "cancelled", "canceled":
|
||||
return creditCallInitialResult{kind: creditCallInitialCancelled}
|
||||
case "", types.ResultError, types.ResultDeclined:
|
||||
switch sdkError {
|
||||
case "CardHolderActionTimedOut":
|
||||
return creditCallInitialResult{kind: creditCallInitialTimeout, reason: "cardholder_timeout"}
|
||||
case "PinPadUserCancelled":
|
||||
return creditCallInitialResult{kind: creditCallInitialCancelled, reason: "user_cancelled"}
|
||||
}
|
||||
if transactionResult == types.ResultDeclined {
|
||||
return creditCallInitialResult{kind: creditCallInitialDeclined}
|
||||
}
|
||||
}
|
||||
return creditCallInitialResult{}
|
||||
}
|
||||
|
||||
func (outcome creditCallSaleOutcome) streamResult(initial creditCallInitialResult) paymentapi.Result {
|
||||
final := paymentapi.Result{Outcome: "unknown", HTTPStatus: outcome.HTTPStatus, Provider: "creditcall", Message: "Payment outcome uncertain; contact reception"}
|
||||
if final.HTTPStatus == 0 {
|
||||
final.HTTPStatus = http.StatusOK
|
||||
@@ -79,13 +130,21 @@ func (outcome creditCallSaleOutcome) streamResult() paymentapi.Result {
|
||||
final.MaskedCardNumber = creditcall.MaskedCardNumber(fields[types.PanMasked])
|
||||
final.ExpiryDate = fields[types.ExpiryDate]
|
||||
final.CardHash, final.CardReference = fields[types.CardHash], fields[types.CardReference]
|
||||
} else {
|
||||
switch strings.ToLower(outcome.FailureType) {
|
||||
case "declined":
|
||||
final.Outcome, final.Retryable, final.Message = "declined", true, "Transaction declined"
|
||||
case "cancelled", "canceled":
|
||||
final.Outcome, final.Retryable, final.Message = "cancelled", true, "Transaction cancelled"
|
||||
}
|
||||
return final
|
||||
}
|
||||
// Initial approval followed by unsuccessful confirmation must not permit another charge.
|
||||
if initial.kind == creditCallInitialApproved {
|
||||
return final
|
||||
}
|
||||
switch initial.kind {
|
||||
case creditCallInitialDeclined:
|
||||
final.Outcome, final.Retryable, final.Message = "declined", true, "Transaction declined"
|
||||
case creditCallInitialCancelled:
|
||||
final.Outcome, final.Retryable = "cancelled", true
|
||||
final.Reason, final.Message = initial.reason, "Transaction cancelled"
|
||||
case creditCallInitialTimeout:
|
||||
final.Outcome, final.Retryable = "timeout", true
|
||||
final.Reason, final.Message = initial.reason, "Cardholder action timed out"
|
||||
}
|
||||
return final
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user