Use a custom scheme to complete the PayPal auth flow

Selipsky · Dec 6, 2022 · 7be776d · 7be776d
1 parent c11d9b1
commit 7be776d
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 163 deletions.
diff --git a/Signal/Signal-AppStore.entitlements b/Signal/Signal-AppStore.entitlements
@@ -10,7 +10,6 @@
 		<string>applinks:signal.tube</string>
 		<string>applinks:signal.group</string>
 		<string>applinks:signal.me</string>
-		<string>applinks:signaldonations.org</string>
 	</array>
 	<key>com.apple.developer.default-data-protection</key>
 	<string>NSFileProtectionComplete</string>

diff --git a/Signal/Signal.entitlements b/Signal/Signal.entitlements
@@ -10,7 +10,6 @@
 		<string>applinks:signal.tube</string>
 		<string>applinks:signal.group</string>
 		<string>applinks:signal.me</string>
-		<string>applinks:signaldonations.org</string>
 	</array>
 	<key>com.apple.developer.default-data-protection</key>
 	<string>NSFileProtectionComplete</string>

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
@@ -397,8 +397,6 @@ - (BOOL)tryToOpenUrl:(NSURL *)url
         return [self tryToShowGroupInviteLinkUI:url];
     } else if ([SignalProxy isValidProxyLink:url]) {
         return [self tryToShowProxyLinkUI:url];
-    } else if ([PaypalCallbackUrlBridge handlePossibleCallbackUrl:url]) {
-        OWSLogInfo(@"Handled PayPal callback url!");
     } else if ([url.scheme isEqualToString:kURLSchemeSGNLKey]) {
         if ([url.host hasPrefix:kURLHostAddStickersPrefix] && [self.tsAccountManager isRegistered]) {
             StickerPackInfo *_Nullable stickerPackInfo = [self parseAddStickersUrl:url];

diff --git a/SignalMessaging/Subscriptions/Paypal+API.swift b/SignalMessaging/Subscriptions/Paypal+API.swift
@@ -18,8 +18,8 @@ public extension Paypal {
                 integerMoneyValue: DonationUtilities.integralAmount(for: amount),
                 inCurrencyCode: amount.currencyCode,
                 level: level.rawValue,
-                returnUrl: Paypal.approvedCallbackUrl,
-                cancelUrl: Paypal.canceledCallbackUrl
+                returnUrl: Paypal.returnUrl,
+                cancelUrl: Paypal.cancelUrl
             )
 
             return networkManager.makePromise(request: createBoostRequest)