KM-16629: call finish on transactions

Author: kp-mario-nachbaur

LocalPackages/PIALibrary/Sources/PIALibrary/Account/EphemeralAccountProvider.swift

@@ -125,6 +125,10 @@ final class EphemeralAccountProvider: AccountProvider, ProvidersAccess, InAppAcc
                     return
                 }
 
+                if let transaction = request.transaction {
+                    accessedStore.finishTransaction(transaction, success: true)
+                }
+
                 let user = UserAccount(credentials: credentials, info: nil)
                 self.currentUser = user
                 self.isLoggedIn = true

LocalPackages/PIALibrary/Sources/PIALibrary/ClientError.swift

@@ -98,6 +98,10 @@ public enum ClientError: Error, Equatable {
         /// The selected sandbox subscription is not available in production.
         case sandboxPurchase
 
+        /// The purchase is pending external action (e.g. "Ask to Buy" approval or SCA).
+        /// The transaction will be delivered later through `Transaction.updates`.
+        case purchasePending
+
         /// Cant retrieve regions
         case noRegions
 

LocalPackages/PIALibrary/Sources/PIALibrary/InApp/AppStoreProvider.swift

@@ -71,6 +71,7 @@ final class AppStoreProvider: NSObject, InAppProvider {
 
         transactionObserverTask = Task {
             for await result in Transaction.updates {
+                if Task.isCancelled { break }
                 log.debug("transaction result: \(result)")
             }
         }
@@ -163,7 +164,7 @@ final class AppStoreProvider: NSObject, InAppProvider {
             return .failure(.userCancelled)
         case .pending:
             log.debug("\(#function) pending")
-            return .failure(.userCancelled)
+            return .failure(.purchasePending)
         @unknown default:
             log.warning("Unknown purchase result: \(result)")
             return .failure(.unknown(code: 606, message: "Unknown purchase result: \(result)"))
@@ -176,6 +177,13 @@ final class AppStoreProvider: NSObject, InAppProvider {
             return
         }
 
+        guard success else {
+            // Leave the transaction unfinished so StoreKit keeps re-delivering it through
+            // `Transaction.updates` until the content is successfully delivered to the backend.
+            log.debug("Not finishing transaction \(native.id): delivery was not successful")
+            return
+        }
+
         log.debug("Finishing transaction: \(native.id)")
         Task { await native.finish() }
     }

LocalPackages/PIALibrary/Sources/PIALibrary/InApp/AppStoreTransaction.swift

@@ -26,7 +26,7 @@ import StoreKit
 
 struct AppStoreTransaction: InAppTransaction<Transaction> {
     var identifier: String {
-        return native.appTransactionID
+        return String(native.id)
     }
 
     let native: Transaction

LocalPackages/PIALocalizations/Sources/PIALocalizations/Generated/L10n.swift

@@ -1160,6 +1160,10 @@ public enum L10n {
       /// Sign-up failed
       public static let vcTitle = L10n.tr("Localizable", "signup.failure.vc_title", fallback: "Sign-up failed")
       public enum Purchase {
+        public enum Pending {
+          /// Your purchase is awaiting approval. Once it's approved, reopen the app to finish setting up your account.
+          public static let message = L10n.tr("Localizable", "signup.failure.purchase.pending.message", fallback: "Your purchase is awaiting approval. Once it's approved, reopen the app to finish setting up your account.")
+        }
         public enum Sandbox {
           /// The selected sandbox subscription is not available in production.
           public static let message = L10n.tr("Localizable", "signup.failure.purchase.sandbox.message", fallback: "The selected sandbox subscription is not available in production.")

LocalPackages/PIALocalizations/Sources/PIALocalizations/Resources/ar.lproj/Localizable.strings

@@ -534,6 +534,7 @@
 "signup.failure.title"= "فشل إنشاء الحساب";
 "signup.failure.message"= "يتعذر علينا إنشاء حساب في الوقت الحالي. يرجى إعادة المحاولة لاحقًا. \n\nعند إعادة فتح التطبيق سيتم إعادة محاولة إنشاء حساب.";
 "signup.failure.purchase.sandbox.message"= "اشتراك الصندوق المحدد غير متاح في الإنتاج.";
+"signup.failure.purchase.pending.message"= "عملية الشراء الخاصة بك في انتظار الموافقة. بمجرد الموافقة عليها، أعد فتح التطبيق لإكمال إعداد حسابك.";
 "signup.failure.redeem.invalid.title"= "رمز بطاقة غير صالح";
 "signup.failure.redeem.invalid.message"= "يبدو أنك أدخلت رمز بطاقة غير صالح. يرجى إعادة المحاولة.";
 "signup.failure.redeem.claimed.title"= "تم استخدام هذه البطاقة بالفعل";

LocalPackages/PIALocalizations/Sources/PIALocalizations/Resources/da.lproj/Localizable.strings

@@ -534,6 +534,7 @@
 "signup.failure.title"= "Kunne ikke oprette konto";
 "signup.failure.message"= "Vi kan ikke oprette en konto på nuværende tidspunkt. Prøv igen senere.\n\nGenåbning af appen vil genoptage forsøget på at oprette en konto.";
 "signup.failure.purchase.sandbox.message"= "Det valgte sandbox-abonnement er ikke tilgængeligt i produktionen.";
+"signup.failure.purchase.pending.message"= "Dit køb afventer godkendelse. Når det er godkendt, skal du genåbne appen for at færdiggøre opsætningen af din konto.";
 "signup.failure.redeem.invalid.title"= "Ugyldig kort-pinkode";
 "signup.failure.redeem.invalid.message"= "Det ser ud til, at du har indtastet en ugyldig kort-pinkode. Prøv igen.";
 "signup.failure.redeem.claimed.title"= "Kort allerede taget";

LocalPackages/PIALocalizations/Sources/PIALocalizations/Resources/de.lproj/Localizable.strings

@@ -534,6 +534,7 @@
 "signup.failure.title"= "Konto nicht erstellt";
 "signup.failure.message"= "Zur Zeit können wir kein Konto erstellen. Bitte später erneut versuchen.\n\nBeim erneuten Öffnen der App wird wieder versucht, ein Konto zu erstellen.";
 "signup.failure.purchase.sandbox.message"= "Das ausgewählte Sandbox-Abonnement ist in der Produktion nicht verfügbar.";
+"signup.failure.purchase.pending.message"= "Dein Kauf wartet auf Genehmigung. Sobald er genehmigt wurde, öffne die App erneut, um die Einrichtung deines Kontos abzuschließen.";
 "signup.failure.redeem.invalid.title"= "Ungültige Karten-PIN";
 "signup.failure.redeem.invalid.message"= "Anscheinend haben Sie eine ungültige PIN eingegeben. Bitte erneut versuchen.";
 "signup.failure.redeem.claimed.title"= "Karte bereits eingelöst";

LocalPackages/PIALocalizations/Sources/PIALocalizations/Resources/en.lproj/Localizable.strings

@@ -534,6 +534,7 @@
 "signup.failure.title"= "Account creation failed";
 "signup.failure.message"= "We're unable to create an account at this time. Please try again later. Reopening the app will re-attempt to create an account.";
 "signup.failure.purchase.sandbox.message"= "The selected sandbox subscription is not available in production.";
+"signup.failure.purchase.pending.message"= "Your purchase is awaiting approval. Once it's approved, reopen the app to finish setting up your account.";
 "signup.failure.redeem.invalid.title"= "Invalid card PIN";
 "signup.failure.redeem.invalid.message"= "Looks like you entered an invalid card PIN. Please try again.";
 "signup.failure.redeem.claimed.title"= "Card claimed already";

LocalPackages/PIALocalizations/Sources/PIALocalizations/Resources/es-MX.lproj/Localizable.strings

@@ -534,6 +534,7 @@
 "signup.failure.title"= "Falló la creación de la cuenta";
 "signup.failure.message"= "No pudimos crear una cuenta en este momento. Por favor, inténtalo de nuevo más tarde. \nSi vuelves a abrir la aplicación intentaremos crear una cuenta otra vez.";
 "signup.failure.purchase.sandbox.message"= "La suscripción del entorno aislado seleccionado no está disponible en la producción.";
+"signup.failure.purchase.pending.message"= "Tu compra está pendiente de aprobación. Una vez aprobada, vuelve a abrir la aplicación para terminar de configurar tu cuenta.";
 "signup.failure.redeem.invalid.title"= "El PIN de la tarjeta no es válido";
 "signup.failure.redeem.invalid.message"= "Parece que ingresaste un PIN de tarjeta inválido. Por favor, inténtalo de nuevo.";
 "signup.failure.redeem.claimed.title"= "La tarjeta ya fue reclamada";