Skip to content

feat(ad-hoc): Prioritize token instead of error code when parsing APM response #345

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

Merged
vitalii-vanziak-cko merged 2 commits into from
Nov 10, 2025
Merged

feat(ad-hoc): Prioritize token instead of error code when parsing APM response #345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3862a3d
Prioritize token instead of error code when parsing APM response
vitalii-vanziak-cko Nov 10, 2025
25b1b6e
baseUrl.toUri()
vitalii-vanziak-cko Nov 10, 2025
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
39 changes: 25 additions & 14 deletions ...src/main/kotlin/com/processout/sdk/api/service/DefaultAlternativePaymentMethodsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.processout.sdk.api.service

import android.net.Uri
import androidx.core.net.toUri
import com.processout.sdk.api.model.request.POAlternativePaymentMethodRequest
import com.processout.sdk.api.model.response.POAlternativePaymentMethodResponse
import com.processout.sdk.api.model.response.POAlternativePaymentMethodResponse.APMReturnType
import com.processout.sdk.core.POFailure.*
import com.processout.sdk.core.POFailure.Code.*
import com.processout.sdk.core.ProcessOutResult
import com.processout.sdk.core.logger.POLogger
import com.processout.sdk.core.util.findBy
import com.processout.sdk.di.ContextGraph

Expand Down Expand Up @@ -39,7 +41,7 @@ internal class DefaultAlternativePaymentMethodsService(
}
arrayList
}
val uriBuilder = Uri.parse(baseUrl).buildUpon()
val uriBuilder = baseUrl.toUri().buildUpon()
pathComponents.forEach { uriBuilder.appendPath(it) }
request.additionalData?.forEach {
uriBuilder.appendQueryParameter("additional_data[${it.key}]", it.value)
Expand All @@ -54,24 +56,33 @@ internal class DefaultAlternativePaymentMethodsService(
message = "Invalid or malformed alternative payment method URI: $uri"
)
}

uri.getQueryParameter("token")?.let { gatewayToken ->
if (gatewayToken.isEmpty()) {
POLogger.debug("Gateway 'token' is empty in the URI: %s", uri)
}
val customerId = uri.getQueryParameter("customer_id")
val tokenId = uri.getQueryParameter("token_id")
val returnType = if (customerId != null && tokenId != null)
APMReturnType.CREATE_TOKEN else APMReturnType.AUTHORIZATION
return ProcessOutResult.Success(
POAlternativePaymentMethodResponse(
gatewayToken = gatewayToken,
customerId = customerId,
tokenId = tokenId,
returnType = returnType
)
)
}
uri.getQueryParameter("error_code")?.let { errorCode ->
return ProcessOutResult.Failure(failureCode(errorCode))
}

val gatewayToken = uri.getQueryParameter("token") ?: String()

val customerId = uri.getQueryParameter("customer_id")
val tokenId = uri.getQueryParameter("token_id")
val returnType = if (customerId != null && tokenId != null)
APMReturnType.CREATE_TOKEN else APMReturnType.AUTHORIZATION

POLogger.warn("Neither the gateway 'token' nor 'error_code' is set in the URI: %s", uri)
return ProcessOutResult.Success(
POAlternativePaymentMethodResponse(
gatewayToken = gatewayToken,
customerId = customerId,
tokenId = tokenId,
returnType = returnType
gatewayToken = String(),
customerId = null,
tokenId = null,
returnType = APMReturnType.AUTHORIZATION
)
)
}
Expand Down