Nightly auto-update (125.0.20240313050306)

Firefox Sync Engineering · Firefox Sync Engineering · commit 44aec117e8b4 · 2024-03-13T08:03:08.000Z
diff --git a/Package.swift b/Package.swift
@@ -1,13 +1,13 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "2337c16f6abc444c3746612e02b8429fef5954b1d41eca3e1abdac0c2f07728e"
-let version = "125.0.20240309050254"
-let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.125.20240309050254/artifacts/public/build/MozillaRustComponents.xcframework.zip"
+let checksum = "cc4b6e2483c0113516e014fa0a09a4680555c77ca4899d8c4be9cae09ee45441"
+let version = "125.0.20240313050306"
+let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.125.20240313050306/artifacts/public/build/MozillaRustComponents.xcframework.zip"
 
 // Focus xcframework
-let focusChecksum = "b96df88f60dd75c7813ed8610d8af0b410fdc2df27b8b619baf776e9154f72c4"
-let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.125.20240309050254/artifacts/public/build/FocusRustComponents.xcframework.zip"
+let focusChecksum = "d3f594d36492e85e2561ae4e7e84ea2ed226d7a4d75fa482223038113404010d"
+let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.125.20240313050306/artifacts/public/build/FocusRustComponents.xcframework.zip"
 let package = Package(
     name: "MozillaRustComponentsSwift",
     platforms: [.iOS(.v14)],
diff --git a/swift-source/all/FxAClient/FxAccountManager.swift b/swift-source/all/FxAClient/FxAccountManager.swift
@@ -90,6 +90,14 @@ open class FxAccountManager {
         return state == .authenticationProblem
     }
 
+    /// Set the user data before completing their authentication
+    public func setUserData(userData: UserData, completion: @escaping () -> Void) {
+        DispatchQueue.global().async {
+            self.account?.setUserData(userData: userData)
+            completion()
+        }
+    }
+
     /// Begins a new authentication flow.
     ///
     /// This function returns a URL string that the caller should open in a webview.
@@ -99,13 +107,18 @@ open class FxAccountManager {
     /// `finishAuthentication(...)` to complete the flow.
     public func beginAuthentication(
         entrypoint: String,
+        scopes: [String] = [],
         completionHandler: @escaping (Result<URL, Error>) -> Void
     ) {
         FxALog.info("beginAuthentication")
+        var scopes = scopes
+        if scopes.isEmpty {
+            scopes = applicationScopes
+        }
         DispatchQueue.global().async {
             let result = self.updatingLatestAuthState { account in
                 try account.beginOAuthFlow(
-                    scopes: self.applicationScopes,
+                    scopes: scopes,
                     entrypoint: entrypoint
                 )
             }
@@ -125,13 +138,18 @@ open class FxAccountManager {
     public func beginPairingAuthentication(
         pairingUrl: String,
         entrypoint: String,
+        scopes: [String] = [],
         completionHandler: @escaping (Result<URL, Error>) -> Void
     ) {
+        var scopes = scopes
+        if scopes.isEmpty {
+            scopes = applicationScopes
+        }
         DispatchQueue.global().async {
             let result = self.updatingLatestAuthState { account in
                 try account.beginPairingFlow(
                     pairingUrl: pairingUrl,
-                    scopes: self.applicationScopes,
+                    scopes: scopes,
                     entrypoint: entrypoint
                 )
             }
diff --git a/swift-source/all/FxAClient/PersistedFirefoxAccount.swift b/swift-source/all/FxAClient/PersistedFirefoxAccount.swift
@@ -52,6 +52,11 @@ class PersistedFirefoxAccount {
         try inner.toJson()
     }
 
+    public func setUserData(userData: UserData) {
+        defer { tryPersistState() }
+        inner.setUserData(userData: userData)
+    }
+
     public func beginOAuthFlow(
         scopes: [String],
         entrypoint: String
diff --git a/swift-source/all/Generated/Metrics/Metrics.swift b/swift-source/all/Generated/Metrics/Metrics.swift
@@ -25,7 +25,7 @@ extension GleanMetrics {
             // Intentionally left private, no external user can instantiate a new global object.
         }
 
-        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 3, day: 9, hour: 5, minute: 15, second: 40))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 3, day: 13, hour: 5, minute: 11, second: 50))
     }
 
     enum NimbusEvents {
diff --git a/swift-source/all/Generated/fxa_client.swift b/swift-source/all/Generated/fxa_client.swift
@@ -403,6 +403,7 @@ public protocol FirefoxAccountProtocol {
     func sendSingleTab(targetDeviceId: String, title: String, url: String) throws
     func setDeviceName(displayName: String) throws -> LocalDevice
     func setPushSubscription(subscription: DevicePushSubscription) throws -> LocalDevice
+    func setUserData(userData: UserData)
     func simulateNetworkError()
     func simulatePermanentAuthTokenIssue()
     func simulateTemporaryAuthTokenIssue()
@@ -716,6 +717,14 @@ public class FirefoxAccount: FirefoxAccountProtocol {
         )
     }
 
+    public func setUserData(userData: UserData) {
+        try!
+            rustCall {
+                uniffi_fxa_client_fn_method_firefoxaccount_set_user_data(self.pointer,
+                                                                         FfiConverterTypeUserData.lower(userData), $0)
+            }
+    }
+
     public func simulateNetworkError() {
         try!
             rustCall {
@@ -1801,6 +1810,73 @@ public func FfiConverterTypeTabHistoryEntry_lower(_ value: TabHistoryEntry) -> R
     return FfiConverterTypeTabHistoryEntry.lower(value)
 }
 
+public struct UserData {
+    public var sessionToken: String
+    public var uid: String
+    public var email: String
+    public var verified: Bool
+
+    // Default memberwise initializers are never public by default, so we
+    // declare one manually.
+    public init(sessionToken: String, uid: String, email: String, verified: Bool) {
+        self.sessionToken = sessionToken
+        self.uid = uid
+        self.email = email
+        self.verified = verified
+    }
+}
+
+extension UserData: Equatable, Hashable {
+    public static func == (lhs: UserData, rhs: UserData) -> Bool {
+        if lhs.sessionToken != rhs.sessionToken {
+            return false
+        }
+        if lhs.uid != rhs.uid {
+            return false
+        }
+        if lhs.email != rhs.email {
+            return false
+        }
+        if lhs.verified != rhs.verified {
+            return false
+        }
+        return true
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(sessionToken)
+        hasher.combine(uid)
+        hasher.combine(email)
+        hasher.combine(verified)
+    }
+}
+
+public struct FfiConverterTypeUserData: FfiConverterRustBuffer {
+    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> UserData {
+        return try UserData(
+            sessionToken: FfiConverterString.read(from: &buf),
+            uid: FfiConverterString.read(from: &buf),
+            email: FfiConverterString.read(from: &buf),
+            verified: FfiConverterBool.read(from: &buf)
+        )
+    }
+
+    public static func write(_ value: UserData, into buf: inout [UInt8]) {
+        FfiConverterString.write(value.sessionToken, into: &buf)
+        FfiConverterString.write(value.uid, into: &buf)
+        FfiConverterString.write(value.email, into: &buf)
+        FfiConverterBool.write(value.verified, into: &buf)
+    }
+}
+
+public func FfiConverterTypeUserData_lift(_ buf: RustBuffer) throws -> UserData {
+    return try FfiConverterTypeUserData.lift(buf)
+}
+
+public func FfiConverterTypeUserData_lower(_ value: UserData) -> RustBuffer {
+    return FfiConverterTypeUserData.lower(value)
+}
+
 // Note that we don't yet support `indirect` for enums.
 // See https://github.com/mozilla/uniffi-rs/issues/396 for further discussion.
 public enum AccountEvent {
@@ -2931,6 +3007,9 @@ private var initializationResult: InitializationResult {
     if uniffi_fxa_client_checksum_method_firefoxaccount_set_push_subscription() != 47048 {
         return InitializationResult.apiChecksumMismatch
     }
+    if uniffi_fxa_client_checksum_method_firefoxaccount_set_user_data() != 59605 {
+        return InitializationResult.apiChecksumMismatch
+    }
     if uniffi_fxa_client_checksum_method_firefoxaccount_simulate_network_error() != 61828 {
         return InitializationResult.apiChecksumMismatch
     }
diff --git a/swift-source/all/Generated/fxa_clientFFI.h b/swift-source/all/Generated/fxa_clientFFI.h
@@ -133,6 +133,8 @@ RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_set_device_name(void*_Nonn
 );
 RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_set_push_subscription(void*_Nonnull ptr, RustBuffer subscription, RustCallStatus *_Nonnull out_status
 );
+void uniffi_fxa_client_fn_method_firefoxaccount_set_user_data(void*_Nonnull ptr, RustBuffer user_data, RustCallStatus *_Nonnull out_status
+);
 void uniffi_fxa_client_fn_method_firefoxaccount_simulate_network_error(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
 void uniffi_fxa_client_fn_method_firefoxaccount_simulate_permanent_auth_token_issue(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
@@ -363,6 +365,9 @@ uint16_t uniffi_fxa_client_checksum_method_firefoxaccount_set_device_name(void
 );
 uint16_t uniffi_fxa_client_checksum_method_firefoxaccount_set_push_subscription(void
     
+);
+uint16_t uniffi_fxa_client_checksum_method_firefoxaccount_set_user_data(void
+    
 );
 uint16_t uniffi_fxa_client_checksum_method_firefoxaccount_simulate_network_error(void
     
diff --git a/swift-source/focus/Generated/Metrics/Metrics.swift b/swift-source/focus/Generated/Metrics/Metrics.swift
@@ -25,7 +25,7 @@ extension GleanMetrics {
             // Intentionally left private, no external user can instantiate a new global object.
         }
 
-        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 3, day: 9, hour: 5, minute: 15, second: 43))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 3, day: 13, hour: 5, minute: 11, second: 53))
     }
 
     enum NimbusEvents {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ extension GleanMetrics {`
`25`	`25`	`// Intentionally left private, no external user can instantiate a new global object.`
`26`	`26`	`}`
`27`	`27`
`28`		`- public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 3, day: 9, hour: 5, minute: 15, second: 40))`
	`28`	`+ public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2024, month: 3, day: 13, hour: 5, minute: 11, second: 50))`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`enum NimbusEvents {`