Skip to content

revert: Remove setBillingAddress public API (ACC-6916) #1732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OnurVar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

revert: Remove setBillingAddress public API (ACC-6916) #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 39 additions & 109 deletions ...ore/PrimerHeadlessUniversalCheckout/Managers/Payment Method Managers/RawDataManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,22 @@
public protocol PrimerHeadlessUniversalCheckoutRawDataManagerDelegate {

@available(*, deprecated, message: "Use _:didReceiveCardMetadata:forState: instead")
@objc optional func primerRawDataManager(
_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
metadataDidChange metadata: [String: Any]?
)

@objc optional func primerRawDataManager(
_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
dataIsValid isValid: Bool,
errors: [Error]?
)

@objc optional func primerRawDataManager(
_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
willFetchMetadataForState state: PrimerValidationState
)

@objc optional func primerRawDataManager(
_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
didReceiveMetadata metadata: PrimerPaymentMethodMetadata,
forState state: PrimerValidationState
)

@objc optional func primerRawDataManager(
_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
didReceiveBinData binData: PrimerBinData
)
@objc optional func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
metadataDidChange metadata: [String: Any]?)

@objc optional func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
dataIsValid isValid: Bool,
errors: [Error]?)

@objc optional func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
willFetchMetadataForState state: PrimerValidationState)

@objc optional func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
didReceiveMetadata metadata: PrimerPaymentMethodMetadata,
forState state: PrimerValidationState)

@objc optional func primerRawDataManager(_ rawDataManager: PrimerHeadlessUniversalCheckout.RawDataManager,
didReceiveBinData binData: PrimerBinData)
}

protocol PrimerRawDataTokenizationBuilderProtocol {
Expand Down Expand Up @@ -110,11 +100,9 @@
/// The `isUsedInDropIn` flag enables support for Drop-In integration flow,
/// expanding the utility of RawDataManager to both Headless and Drop-In use cases.
/// When set to true, it configures the RawDataManager to behave as a Drop-In integration.
public required init(
paymentMethodType: String,
delegate: PrimerHeadlessUniversalCheckoutRawDataManagerDelegate? = nil,
isUsedInDropIn: Bool = false
) throws {
public required init(paymentMethodType: String,
delegate: PrimerHeadlessUniversalCheckoutRawDataManagerDelegate? = nil,
isUsedInDropIn: Bool = false) throws {
if isUsedInDropIn {
PrimerInternal.shared.sdkIntegrationType = .dropIn
} else {
Expand Down Expand Up @@ -256,62 +244,12 @@
}
} catch {
let delegate = PrimerHeadlessUniversalCheckout.current.delegate
delegate?.primerHeadlessUniversalCheckoutDidFail?(
withError: error,
checkoutData: self.paymentCheckoutData
)
delegate?.primerHeadlessUniversalCheckoutDidFail?(withError: error,
checkoutData: self.paymentCheckoutData)
}
}
}

/// Dispatches the billing address as a client-session action.
///
/// Must be awaited before calling ``submit()`` — tokenization reads billing from the server-side
/// client session. Safe to call repeatedly; the server accepts repeat dispatches idempotently.
///
/// - Parameter address: The billing address to dispatch. Must have at least one non-empty field.
/// If `countryCode` is set, it must be a valid `CountryCode` raw value.
/// - Throws: ``PrimerValidationError/invalidRawData`` when the address has no non-empty fields
/// or when `countryCode` is not a valid `CountryCode`. Also propagates any error from the
/// underlying client-session update (network, decoding, server validation).
public func setBillingAddress(_ address: PrimerAddress) async throws {
Analytics.Service.fire(event: Analytics.Event.sdk(
name: "\(Self.self).\(#function)",
params: [
"category": "RAW_DATA",
"intent": PrimerInternal.shared.intent?.rawValue ?? "null",
"paymentMethodType": paymentMethodType
]
))

try validate(billingAddress: address)

let clientSessionAddress = ClientSession.Address(from: address)
try await ClientSessionActionsModule
.updateBillingAddressViaClientSessionActionWithAddressIfNeeded(clientSessionAddress)
}

private func validate(billingAddress address: PrimerAddress) throws {
let hasAnyField = [
address.firstName,
address.lastName,
address.addressLine1,
address.addressLine2,
address.city,
address.state,
address.postalCode,
address.countryCode
].contains { $0?.isEmpty == false }

guard hasAnyField else {
throw PrimerValidationError.invalidRawData()
}

if let code = address.countryCode, !code.isEmpty, CountryCode(rawValue: code) == nil {
throw PrimerValidationError.invalidRawData()
}
}

func validateRawData(_ data: PrimerRawData) async throws {
// Store the latest data
latestDataForValidation = data
Expand Down Expand Up @@ -494,10 +432,8 @@
return nil
}

private func handleDecodedClientTokenIfNeeded(
_ decodedJWTToken: DecodedJWTToken,
paymentMethodTokenData: PrimerPaymentMethodTokenData
) async throws -> String? {
private func handleDecodedClientTokenIfNeeded(_ decodedJWTToken: DecodedJWTToken,
paymentMethodTokenData: PrimerPaymentMethodTokenData) async throws -> String? {
if decodedJWTToken.intent == RequiredActionName.threeDSAuthentication.rawValue {
return try await handle3DSAuthenticationForDecodedClientToken(decodedJWTToken, paymentMethodTokenData: paymentMethodTokenData)
} else if decodedJWTToken.intent == RequiredActionName.processor3DS.rawValue {
Expand All @@ -511,10 +447,8 @@
}
}

private func handle3DSAuthenticationForDecodedClientToken(
_ decodedJWTToken: DecodedJWTToken,
paymentMethodTokenData: PrimerPaymentMethodTokenData
) async throws -> String? {
private func handle3DSAuthenticationForDecodedClientToken(_ decodedJWTToken: DecodedJWTToken,

Check warning on line 450 in Sources/PrimerSDK/Classes/Core/PrimerHeadlessUniversalCheckout/Managers/Payment Method Managers/RawDataManager.swift

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove the unused function parameter "decodedJWTToken" or name it "_". 


See more on https://sonarcloud.io/project/issues?id=primer-io_primer-sdk-ios&issues=AZ3q85qpK1B6SoiZ1bDN&open=AZ3q85qpK1B6SoiZ1bDN&pullRequest=1732
paymentMethodTokenData: PrimerPaymentMethodTokenData) async throws -> String? {
try await ThreeDSService().perform3DS(
paymentMethodTokenData: paymentMethodTokenData,
sdkDismissed: nil
Expand Down Expand Up @@ -640,11 +574,9 @@
}

let formatter = DateFormatter().withExpirationDisplayDateFormat()
additionalInfo = XenditCheckoutVoucherAdditionalInfo(
expiresAt: formatter.string(from: decodedExpiresAt),
couponCode: decodedVoucherReference,
retailerName: selectedRetailerName
)
additionalInfo = XenditCheckoutVoucherAdditionalInfo(expiresAt: formatter.string(from: decodedExpiresAt),
couponCode: decodedVoucherReference,
retailerName: selectedRetailerName)
paymentCheckoutData?.additionalInfo = additionalInfo

default:
Expand Down Expand Up @@ -706,10 +638,8 @@
}

private func handleResumePaymentEvent(_ resumePaymentId: String, resumeToken: String) async throws -> Response.Body.Payment {
try await createResumePaymentService.resumePaymentWithPaymentId(
resumePaymentId,
paymentResumeRequest: Request.Body.Payment.Resume(token: resumeToken)
)
try await createResumePaymentService.resumePaymentWithPaymentId(resumePaymentId,
paymentResumeRequest: Request.Body.Payment.Resume(token: resumeToken))
}

@MainActor
Expand All @@ -732,17 +662,17 @@
}

#if DEBUG
if TEST {
// This ensures that the presentation completion is correctly handled in headless unit tests
guard !UIApplication.shared.windows.isEmpty else {
DispatchQueue.main.async {
guard !didResume else { return }
didResume = true
continuation.resume()
}
return
if TEST {
// This ensures that the presentation completion is correctly handled in headless unit tests
guard !UIApplication.shared.windows.isEmpty else {
DispatchQueue.main.async {
guard !didResume else { return }
didResume = true
continuation.resume()
}
return
}
}
#endif

Task { @MainActor in
Expand Down
22 changes: 0 additions & 22 deletions Sources/PrimerSDK/Classes/Data Models/ClientSession+PrimerAddress.swift
View file
Open in desktop

This file was deleted.

Loading
Loading