Skip to content

Commit

Permalink
Cleanup leftover message code (#162)
Browse files Browse the repository at this point in the history
  • Loading branch information
dleis612 authored May 9, 2024
1 parent 4a54127 commit 13e5e44
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 118 deletions.
17 changes: 1 addition & 16 deletions Sources/ForageSDK/Foundation/Network/ForageAPI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import Foundation
enum ForageAPI {
case tokenizeNumber(request: ForagePANRequestModel)
case xKey(sessionToken: String, merchantID: String)
case message(contentId: String, sessionToken: String, merchantID: String)
case getPaymentMethod(sessionToken: String, merchantID: String, paymentMethodRef: String)
case getPayment(sessionToken: String, merchantID: String, paymentRef: String)
}
Expand All @@ -28,7 +27,6 @@ extension ForageAPI: ServiceProtocol {
switch self {
case .tokenizeNumber: return "/api/payment_methods/"
case .xKey: return "/iso_server/encryption_alias/"
case let .message(contentId: contentId, _, _): return "/api/message/\(contentId)/"
case let .getPaymentMethod(request: request): return "/api/payment_methods/\(request.paymentMethodRef)/"
case let .getPayment(request: request): return "/api/payments/\(request.paymentRef)/"
}
Expand All @@ -37,7 +35,7 @@ extension ForageAPI: ServiceProtocol {
var method: HttpMethod {
switch self {
case .tokenizeNumber: return .post
case .xKey, .message, .getPaymentMethod, .getPayment: return .get
case .xKey, .getPaymentMethod, .getPayment: return .get
}
}

Expand Down Expand Up @@ -87,19 +85,6 @@ extension ForageAPI: ServiceProtocol {
additionalHeaders: headers
)

case let .message(_, sessionToken: sessionToken, merchantID: merchantID):
headers.addHeaders([
"Merchant-Account": merchantID,
"authorization": "Bearer \(sessionToken)",
"API-VERSION": "2023-02-01",
])

return .requestParametersAndHeaders(
bodyParameters: nil,
urlParameters: nil,
additionalHeaders: headers
)

case let .getPaymentMethod(request: request):
headers.addHeaders([
"Merchant-Account": request.merchantID,
Expand Down
102 changes: 0 additions & 102 deletions Tests/ForageSDKTests/Mock/ForageMocks.swift
Original file line number Diff line number Diff line change
Expand Up @@ -206,106 +206,4 @@ class ForageMocks {
"""
return NSError(domain: response, code: 400, userInfo: nil)
}

// MARK: GET /message/ success responses

var getMessageCompleted: Data {
let response = """
{
"content_id": "d789c086-9c4f-41c3-854a-1c436eee1d63",
"message_type": "0200",
"status": "completed",
"failed": false,
"errors": []
}
"""
return Data(response.utf8)
}

// we continue to retry until we see status: "completed"
// so we permantly set the status to: "sent_to_proxy" to trigger retry attempts
var getMessageIncomplete: Data {
let response = """
{
"content_id": "i789c086-9c4f-41c3-854a-1c436eee1d63",
"message_type": "0200",
"status": "sent_to_proxy",
"failed": false,
"errors": []
}
"""
return Data(response.utf8)
}

// MARK: GET /message/ error responses

var getMessageUnauthorized: Data {
let response = """
{
"path": "/api/message/1c53e9e0-92e9-4568-a128-deecf4c2194a/",
"errors": [
{
"code": "missing_merchant_account",
"message": "No merchant account FNS number was provided.",
"source": {
"resource": "Merchant_Account_Header",
"ref": ""
}
}
]
}
"""
return Data(response.utf8)
}

var getMessageExpiredCard: Data {
let response = """
{
"content_id": "36058ff7-0e9d-4025-94cd-80ef04a3bb1c",
"message_type": "0200",
"status": "received_on_django",
"failed": true,
"errors": [
{
"status_code": 400,
"forage_code": "ebt_error_54",
"message": "Expired card - Expired Card"
}
]
}
"""
return Data(response.utf8)
}

var getMessageFailed: Data {
let response = """
{
"content_id": "c2bf2b14-415f-4cb3-8687-7eea06f75369",
"message_type": "0200",
"status": "received_on_django",
"failed": true,
"errors": [
{
"status_code": 400,
"forage_code": "ebt_error_51",
"message": "Received failure response from EBT network"
}
]
}
"""
return Data(response.utf8)
}

// missing "errors" list
var getMessageMalformed: Data {
let response = """
{
"content_id": "d789c086-9c4f-41c3-854a-1c436eee1d63",
"message_type": "0200",
"status": "completed",
"failed": false
}
"""
return Data(response.utf8)
}
}

0 comments on commit 13e5e44

Please sign in to comment.