Merge tag '219.0.0-1'

duckduckgo · Dec 12, 2024 · d683458 · d683458
2 parents e8654e1 + 155b47e
commit d683458
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Sources/PrivacyDashboard/PrivacyDashboardUserScript.swift b/Sources/PrivacyDashboard/PrivacyDashboardUserScript.swift
@@ -363,6 +363,7 @@ final class PrivacyDashboardUserScript: NSObject, StaticUserScript {
                              {"id": "jsPerformance"},
                              {"id": "openerContext"},
                              {"id": "userRefreshCount"},
+                             {"id": "locale"},
                          ]
                      }
                      window.onGetToggleReportOptionsResponse(json);

diff --git a/Sources/Subscription/Flows/AppStore/AppStoreAccountManagementFlow.swift b/Sources/Subscription/Flows/AppStore/AppStoreAccountManagementFlow.swift
@@ -23,6 +23,7 @@ import os.log
 public enum AppStoreAccountManagementFlowError: Swift.Error {
     case noPastTransaction
     case authenticatingWithTransactionFailed
+    case missingAuthTokenOnRefresh
 }
 
 @available(macOS 12.0, iOS 15.0, *)
@@ -46,7 +47,8 @@ public final class DefaultAppStoreAccountManagementFlow: AppStoreAccountManageme
     @discardableResult
     public func refreshAuthTokenIfNeeded() async -> Result<String, AppStoreAccountManagementFlowError> {
         Logger.subscription.info("[AppStoreAccountManagementFlow] refreshAuthTokenIfNeeded")
-        var authToken = accountManager.authToken ?? ""
+
+        guard let authToken = accountManager.authToken else { return .failure(.missingAuthTokenOnRefresh) }
 
         // Check if auth token if still valid
         if case let .failure(validateTokenError) = await authEndpointService.validateToken(accessToken: authToken) {
@@ -58,8 +60,9 @@ public final class DefaultAppStoreAccountManagementFlow: AppStoreAccountManageme
             switch await authEndpointService.storeLogin(signature: lastTransactionJWSRepresentation) {
             case .success(let response):
                 if response.externalID == accountManager.externalID {
-                    authToken = response.authToken
-                    accountManager.storeAuthToken(token: authToken)
+                    let refreshedAuthToken = response.authToken
+                    accountManager.storeAuthToken(token: refreshedAuthToken)
+                    return .success(refreshedAuthToken)
                 }
             case .failure(let storeLoginError):
                 Logger.subscription.error("[AppStoreAccountManagementFlow] storeLogin error: \(String(reflecting: storeLoginError), privacy: .public)")