Load access token for invoice request

Author: chRyNaN

feature-billing/src/wasmJsMain/kotlin/com/mooncloak/website/feature/billing/BillingStateModel.kt

@@ -20,7 +20,7 @@ public data class BillingStateModel public constructor(
     public val paymentStatusDetails: BillingPaymentStatusDetails? = null,
     public val selectedPlan: Plan? = null,
     public val plans: List<Plan> = emptyList(),
-    public val token: TransactionToken? = null,
+    public val transactionToken: TransactionToken? = null,
     public val acceptedTerms: Boolean = false,
     public val termsAndConditionsText: @Composable () -> AnnotatedString = { AnnotatedString("") },
     public val noticeText: String? = null,

feature-billing/src/wasmJsMain/kotlin/com/mooncloak/website/feature/billing/BillingViewModel.kt

@@ -64,7 +64,7 @@ public class BillingViewModel public constructor(
                             isLoading = false,
                             selectedPlan = selectedPlan,
                             plans = plans,
-                            token = token,
+                            transactionToken = token,
                             queryParameters = queryParameters,
                             startDestination = when (paymentStatus) {
                                 BillingPaymentStatus.Completed -> BillingDestination.Success
@@ -85,7 +85,7 @@ public class BillingViewModel public constructor(
                             isLoading = false,
                             selectedPlan = selectedPlan,
                             plans = plans,
-                            token = token,
+                            transactionToken = token,
                             queryParameters = queryParameters,
                             startDestination = when (paymentStatus) {
                                 BillingPaymentStatus.Completed -> BillingDestination.Success
@@ -126,7 +126,8 @@ public class BillingViewModel public constructor(
                         invoice = getInvoice(
                             productId = productId,
                             currencyCode = currentState.selectedCryptoCurrency.currencyCode,
-                            currentInvoices = currentState.invoices
+                            currentInvoices = currentState.invoices,
+                            accessToken = currentState.queryParameters["access_token"]
                         )
                     }
 
@@ -177,7 +178,8 @@ public class BillingViewModel public constructor(
                         invoice = getInvoice(
                             productId = productId,
                             currencyCode = currentState.selectedCryptoCurrency.currencyCode,
-                            currentInvoices = currentState.invoices
+                            currentInvoices = currentState.invoices,
+                            accessToken = currentState.queryParameters["access_token"]
                         )
                     }
 
@@ -291,12 +293,10 @@ public class BillingViewModel public constructor(
             .filter { plan -> plan.isAvailable(at = clock.now()) }
             .sortedBy { plan -> plan.price.amount }
 
-    private suspend fun getPlan(id: String?): Plan? =
-        id?.let { billingApi.getPlan(id = it) }
-
     private suspend fun getInvoice(
         currencyCode: Currency.Code,
         productId: String?,
+        accessToken: String?,
         currentInvoices: Map<CryptoCurrency, CryptoInvoice?>
     ): CryptoInvoice? {
         CryptoCurrency[currencyCode]?.let { currentInvoices[it] }?.let { return it }
@@ -305,7 +305,8 @@ public class BillingViewModel public constructor(
 
         return billingApi.getInvoice(
             productId = productId,
-            currencyCode = currencyCode
+            currencyCode = currencyCode,
+            accessToken = accessToken
         )
     }
 

feature-billing/src/wasmJsMain/kotlin/com/mooncloak/website/feature/billing/api/BillingApi.kt

@@ -12,7 +12,7 @@ public interface BillingApi {
 
     public suspend fun getInvoice(
         productId: String,
-        token: String? = null,
+        accessToken: String? = null,
         currencyCode: Currency.Code
     ): CryptoInvoice
 

feature-billing/src/wasmJsMain/kotlin/com/mooncloak/website/feature/billing/api/HttpBillingApi.kt

@@ -38,10 +38,10 @@ internal class HttpBillingApi internal constructor(
             return@withContext response.body<HttpResponseBody<AvailablePlans>>().getOrThrow().plans
         }
 
-    override suspend fun getInvoice(productId: String, token: String?, currencyCode: Currency.Code): CryptoInvoice =
+    override suspend fun getInvoice(productId: String, accessToken: String?, currencyCode: Currency.Code): CryptoInvoice =
         withContext(Dispatchers.Default) {
             val response = httpClient.post(url("/billing/payment/invoice")) {
-                token?.let { bearerAuth(it) }
+                accessToken?.let { bearerAuth(it) }
 
                 contentType(ContentType.Application.Json)
                 accept(ContentType.Application.Json)