Update Subscription URLs (#662)

* Update Subscription URLs * Remove obsolete folder in hierarchy
duckduckgo · Feb 14, 2024 · 328ce45 · 328ce45
1 parent ff4cd59
commit 328ce45
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 6 deletions.
diff --git a/...ription/Subscription/AccountManager.swift → Sources/Subscription/AccountManager.swift b/...ription/Subscription/AccountManager.swift → Sources/Subscription/AccountManager.swift
diff --git a/...countStorage/AccountKeychainStorage.swift → ...countStorage/AccountKeychainStorage.swift b/...countStorage/AccountKeychainStorage.swift → ...countStorage/AccountKeychainStorage.swift
diff --git a/...ption/AccountStorage/AccountStorage.swift → ...ption/AccountStorage/AccountStorage.swift b/...ption/AccountStorage/AccountStorage.swift → ...ption/AccountStorage/AccountStorage.swift
diff --git a/...Store/AppStoreAccountManagementFlow.swift → ...Store/AppStoreAccountManagementFlow.swift b/...Store/AppStoreAccountManagementFlow.swift → ...Store/AppStoreAccountManagementFlow.swift
diff --git a/...Flows/AppStore/AppStorePurchaseFlow.swift → ...Flows/AppStore/AppStorePurchaseFlow.swift b/...Flows/AppStore/AppStorePurchaseFlow.swift → ...Flows/AppStore/AppStorePurchaseFlow.swift
diff --git a/.../Flows/AppStore/AppStoreRestoreFlow.swift → .../Flows/AppStore/AppStoreRestoreFlow.swift b/.../Flows/AppStore/AppStoreRestoreFlow.swift → .../Flows/AppStore/AppStoreRestoreFlow.swift
diff --git a/...ion/Subscription/Flows/PurchaseFlow.swift → ...ces/Subscription/Flows/PurchaseFlow.swift b/...ion/Subscription/Flows/PurchaseFlow.swift → ...ces/Subscription/Flows/PurchaseFlow.swift
diff --git a/...ion/Flows/Stripe/StripePurchaseFlow.swift → ...ion/Flows/Stripe/StripePurchaseFlow.swift b/...ion/Flows/Stripe/StripePurchaseFlow.swift → ...ion/Flows/Stripe/StripePurchaseFlow.swift
diff --git a/...ion/NSNotificationName+Subscription.swift → ...ion/NSNotificationName+Subscription.swift b/...ion/NSNotificationName+Subscription.swift → ...ion/NSNotificationName+Subscription.swift
diff --git a/...iption/Subscription/PurchaseManager.swift → Sources/Subscription/PurchaseManager.swift b/...iption/Subscription/PurchaseManager.swift → Sources/Subscription/PurchaseManager.swift
diff --git a/...on/Subscription/Services/APIService.swift → ...es/Subscription/Services/APIService.swift b/...on/Subscription/Services/APIService.swift → ...es/Subscription/Services/APIService.swift
diff --git a/...n/Subscription/Services/AuthService.swift → ...s/Subscription/Services/AuthService.swift b/...n/Subscription/Services/AuthService.swift → ...s/Subscription/Services/AuthService.swift
diff --git a/...iption/Services/SubscriptionService.swift → ...iption/Services/SubscriptionService.swift b/...iption/Services/SubscriptionService.swift → ...iption/Services/SubscriptionService.swift
diff --git a/...ion/SubscriptionPurchaseEnvironment.swift → ...ion/SubscriptionPurchaseEnvironment.swift b/...ion/SubscriptionPurchaseEnvironment.swift → ...ion/SubscriptionPurchaseEnvironment.swift
diff --git a/...ption/Subscription/URL+Subscription.swift → Sources/Subscription/URL+Subscription.swift b/...ption/Subscription/URL+Subscription.swift → Sources/Subscription/URL+Subscription.swift
@@ -20,8 +20,12 @@ import Foundation
 
 public extension URL {
 
-    static var purchaseSubscription: URL {
-        URL(string: "https://abrown.duckduckgo.com/subscriptions/welcome")!
+    static var subscriptionBaseURL: URL {
+        URL(string: "https://abrown.duckduckgo.com/subscriptions")!
+    }
+
+    static var subscriptionPurchase: URL {
+        subscriptionBaseURL.appendingPathComponent("welcome")
     }
 
     static var subscriptionFAQ: URL {
@@ -30,15 +34,15 @@ public extension URL {
 
     // MARK: - Subscription Email
     static var activateSubscriptionViaEmail: URL {
-        URL(string: "https://abrown.duckduckgo.com/subscriptions/activate")!
+        subscriptionBaseURL.appendingPathComponent("activate")
     }
 
     static var addEmailToSubscription: URL {
-        URL(string: "https://abrown.duckduckgo.com/subscriptions/add-email")!
+        subscriptionBaseURL.appendingPathComponent("add-email")
     }
 
     static var manageSubscriptionEmail: URL {
-        URL(string: "https://abrown.duckduckgo.com/subscriptions/manage")!
+        subscriptionBaseURL.appendingPathComponent("manage")
     }
 
     // MARK: - App Store app manage subscription URL
@@ -47,7 +51,7 @@ public extension URL {
         URL(string: "macappstores://apps.apple.com/account/subscriptions")!
     }
 
-     // MARK: - Identity Theft Restoration
+    // MARK: - Identity Theft Restoration
 
     static var identityTheftRestoration: URL {
         URL(string: "https://abrown.duckduckgo.com/identity-theft-restoration")!