Nightly auto-update (122.0.20231129050345)

Firefox Sync Engineering · Firefox Sync Engineering · commit 52359b8622d1 · 2023-11-29T08:03:14.000Z
diff --git a/Package.swift b/Package.swift
@@ -1,13 +1,13 @@
 // swift-tools-version:5.4
 import PackageDescription
 
-let checksum = "bce3fdcdcda71eb293131c901d63bb479146c0d04cc1231a4e058ed91dace5fc"
-let version = "122.0.20231128050327"
-let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231128050327/artifacts/public/build/MozillaRustComponents.xcframework.zip"
+let checksum = "2ac11b6bce2fd7ab2d822294cd9686b0f5be8859af7a80177fdfe44e57a1cca9"
+let version = "122.0.20231129050345"
+let url = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231129050345/artifacts/public/build/MozillaRustComponents.xcframework.zip"
 
 // Focus xcframework
-let focusChecksum = "103204e390127183bdca13bfc60973280df0cc2964781eb4ba8c79fb354f36bd"
-let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231128050327/artifacts/public/build/FocusRustComponents.xcframework.zip"
+let focusChecksum = "442761386cbb0dbfc73d377359f23e85e2547317d2451c0097f7634d235d6bbd"
+let focusUrl = "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/project.application-services.v2.swift.122.20231129050345/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
@@ -99,16 +99,14 @@ open class FxAccountManager {
     /// `finishAuthentication(...)` to complete the flow.
     public func beginAuthentication(
         entrypoint: String,
-        metrics: MetricsParams = MetricsParams(parameters: [:]),
         completionHandler: @escaping (Result<URL, Error>) -> Void
     ) {
         FxALog.info("beginAuthentication")
         DispatchQueue.global().async {
             let result = self.updatingLatestAuthState { account in
                 try account.beginOAuthFlow(
                     scopes: self.applicationScopes,
-                    entrypoint: entrypoint,
-                    metrics: metrics
+                    entrypoint: entrypoint
                 )
             }
             DispatchQueue.main.async { completionHandler(result) }
@@ -127,16 +125,14 @@ open class FxAccountManager {
     public func beginPairingAuthentication(
         pairingUrl: String,
         entrypoint: String,
-        metrics: MetricsParams = MetricsParams(parameters: [:]),
         completionHandler: @escaping (Result<URL, Error>) -> Void
     ) {
         DispatchQueue.global().async {
             let result = self.updatingLatestAuthState { account in
                 try account.beginPairingFlow(
                     pairingUrl: pairingUrl,
                     scopes: self.applicationScopes,
-                    entrypoint: entrypoint,
-                    metrics: metrics
+                    entrypoint: entrypoint
                 )
             }
             DispatchQueue.main.async { completionHandler(result) }
diff --git a/swift-source/all/FxAClient/PersistedFirefoxAccount.swift b/swift-source/all/FxAClient/PersistedFirefoxAccount.swift
@@ -54,14 +54,12 @@ class PersistedFirefoxAccount {
 
     public func beginOAuthFlow(
         scopes: [String],
-        entrypoint: String,
-        metrics: MetricsParams = MetricsParams(parameters: [:])
+        entrypoint: String
     ) throws -> URL {
         return try notifyAuthErrors {
             try URL(string: self.inner.beginOauthFlow(
                 scopes: scopes,
-                entrypoint: entrypoint,
-                metrics: metrics
+                entrypoint: entrypoint
             ))!
         }
     }
@@ -73,14 +71,12 @@ class PersistedFirefoxAccount {
     public func beginPairingFlow(
         pairingUrl: String,
         scopes: [String],
-        entrypoint: String,
-        metrics: MetricsParams = MetricsParams(parameters: [:])
+        entrypoint: String
     ) throws -> URL {
         return try notifyAuthErrors {
             try URL(string: self.inner.beginPairingFlow(pairingUrl: pairingUrl,
                                                         scopes: scopes,
-                                                        entrypoint: entrypoint,
-                                                        metrics: metrics))!
+                                                        entrypoint: entrypoint))!
         }
     }
 
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: 2023, month: 11, day: 28, hour: 5, minute: 34, second: 54))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 29, hour: 5, minute: 29, second: 11))
     }
 
     enum NimbusEvents {
diff --git a/swift-source/all/Generated/fxa_client.swift b/swift-source/all/Generated/fxa_client.swift
@@ -368,9 +368,9 @@ private struct FfiConverterString: FfiConverter {
 
 public protocol FirefoxAccountProtocol {
     func toJson() throws -> String
-    func beginOauthFlow(scopes: [String], entrypoint: String, metrics: MetricsParams?) throws -> String
+    func beginOauthFlow(scopes: [String], entrypoint: String) throws -> String
     func getPairingAuthorityUrl() throws -> String
-    func beginPairingFlow(pairingUrl: String, scopes: [String], entrypoint: String, metrics: MetricsParams?) throws -> String
+    func beginPairingFlow(pairingUrl: String, scopes: [String], entrypoint: String) throws -> String
     func completeOauthFlow(code: String, state: String) throws
     func checkAuthorizationStatus() throws -> AuthorizationInfo
     func disconnect()
@@ -440,13 +440,12 @@ public class FirefoxAccount: FirefoxAccountProtocol {
         )
     }
 
-    public func beginOauthFlow(scopes: [String], entrypoint: String, metrics: MetricsParams?) throws -> String {
+    public func beginOauthFlow(scopes: [String], entrypoint: String) throws -> String {
         return try FfiConverterString.lift(
             rustCallWithError(FfiConverterTypeFxaError.lift) {
                 uniffi_fxa_client_fn_method_firefoxaccount_begin_oauth_flow(self.pointer,
                                                                             FfiConverterSequenceString.lower(scopes),
-                                                                            FfiConverterString.lower(entrypoint),
-                                                                            FfiConverterOptionTypeMetricsParams.lower(metrics), $0)
+                                                                            FfiConverterString.lower(entrypoint), $0)
             }
         )
     }
@@ -459,14 +458,13 @@ public class FirefoxAccount: FirefoxAccountProtocol {
         )
     }
 
-    public func beginPairingFlow(pairingUrl: String, scopes: [String], entrypoint: String, metrics: MetricsParams?) throws -> String {
+    public func beginPairingFlow(pairingUrl: String, scopes: [String], entrypoint: String) throws -> String {
         return try FfiConverterString.lift(
             rustCallWithError(FfiConverterTypeFxaError.lift) {
                 uniffi_fxa_client_fn_method_firefoxaccount_begin_pairing_flow(self.pointer,
                                                                               FfiConverterString.lower(pairingUrl),
                                                                               FfiConverterSequenceString.lower(scopes),
-                                                                              FfiConverterString.lower(entrypoint),
-                                                                              FfiConverterOptionTypeMetricsParams.lower(metrics), $0)
+                                                                              FfiConverterString.lower(entrypoint), $0)
             }
         )
     }
@@ -1362,49 +1360,6 @@ public func FfiConverterTypeLocalDevice_lower(_ value: LocalDevice) -> RustBuffe
     return FfiConverterTypeLocalDevice.lower(value)
 }
 
-public struct MetricsParams {
-    public var parameters: [String: String]
-
-    // Default memberwise initializers are never public by default, so we
-    // declare one manually.
-    public init(parameters: [String: String]) {
-        self.parameters = parameters
-    }
-}
-
-extension MetricsParams: Equatable, Hashable {
-    public static func == (lhs: MetricsParams, rhs: MetricsParams) -> Bool {
-        if lhs.parameters != rhs.parameters {
-            return false
-        }
-        return true
-    }
-
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(parameters)
-    }
-}
-
-public struct FfiConverterTypeMetricsParams: FfiConverterRustBuffer {
-    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> MetricsParams {
-        return try MetricsParams(
-            parameters: FfiConverterDictionaryStringString.read(from: &buf)
-        )
-    }
-
-    public static func write(_ value: MetricsParams, into buf: inout [UInt8]) {
-        FfiConverterDictionaryStringString.write(value.parameters, into: &buf)
-    }
-}
-
-public func FfiConverterTypeMetricsParams_lift(_ buf: RustBuffer) throws -> MetricsParams {
-    return try FfiConverterTypeMetricsParams.lift(buf)
-}
-
-public func FfiConverterTypeMetricsParams_lower(_ value: MetricsParams) -> RustBuffer {
-    return FfiConverterTypeMetricsParams.lower(value)
-}
-
 public struct Profile {
     public var uid: String
     public var email: String
@@ -2116,27 +2071,6 @@ private struct FfiConverterOptionTypeDevicePushSubscription: FfiConverterRustBuf
     }
 }
 
-private struct FfiConverterOptionTypeMetricsParams: FfiConverterRustBuffer {
-    typealias SwiftType = MetricsParams?
-
-    public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
-        guard let value = value else {
-            writeInt(&buf, Int8(0))
-            return
-        }
-        writeInt(&buf, Int8(1))
-        FfiConverterTypeMetricsParams.write(value, into: &buf)
-    }
-
-    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
-        switch try readInt(&buf) as Int8 {
-        case 0: return nil
-        case 1: return try FfiConverterTypeMetricsParams.read(from: &buf)
-        default: throw UniffiInternalError.unexpectedOptionalTag
-        }
-    }
-}
-
 private struct FfiConverterOptionTypeScopedKey: FfiConverterRustBuffer {
     typealias SwiftType = ScopedKey?
 
@@ -2311,29 +2245,6 @@ private struct FfiConverterSequenceTypeIncomingDeviceCommand: FfiConverterRustBu
     }
 }
 
-private struct FfiConverterDictionaryStringString: FfiConverterRustBuffer {
-    public static func write(_ value: [String: String], into buf: inout [UInt8]) {
-        let len = Int32(value.count)
-        writeInt(&buf, len)
-        for (key, value) in value {
-            FfiConverterString.write(key, into: &buf)
-            FfiConverterString.write(value, into: &buf)
-        }
-    }
-
-    public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> [String: String] {
-        let len: Int32 = try readInt(&buf)
-        var dict = [String: String]()
-        dict.reserveCapacity(Int(len))
-        for _ in 0 ..< len {
-            let key = try FfiConverterString.read(from: &buf)
-            let value = try FfiConverterString.read(from: &buf)
-            dict[key] = value
-        }
-        return dict
-    }
-}
-
 private enum InitializationResult {
     case ok
     case contractVersionMismatch
@@ -2353,13 +2264,13 @@ private var initializationResult: InitializationResult {
     if uniffi_fxa_client_checksum_method_firefoxaccount_to_json() != 52613 {
         return InitializationResult.apiChecksumMismatch
     }
-    if uniffi_fxa_client_checksum_method_firefoxaccount_begin_oauth_flow() != 4486 {
+    if uniffi_fxa_client_checksum_method_firefoxaccount_begin_oauth_flow() != 6930 {
         return InitializationResult.apiChecksumMismatch
     }
     if uniffi_fxa_client_checksum_method_firefoxaccount_get_pairing_authority_url() != 63297 {
         return InitializationResult.apiChecksumMismatch
     }
-    if uniffi_fxa_client_checksum_method_firefoxaccount_begin_pairing_flow() != 10680 {
+    if uniffi_fxa_client_checksum_method_firefoxaccount_begin_pairing_flow() != 37847 {
         return InitializationResult.apiChecksumMismatch
     }
     if uniffi_fxa_client_checksum_method_firefoxaccount_complete_oauth_flow() != 56647 {
diff --git a/swift-source/all/Generated/fxa_clientFFI.h b/swift-source/all/Generated/fxa_clientFFI.h
@@ -73,11 +73,11 @@ void*_Nonnull uniffi_fxa_client_fn_constructor_firefoxaccount_from_json(RustBuff
 );
 RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_to_json(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_begin_oauth_flow(void*_Nonnull ptr, RustBuffer scopes, RustBuffer entrypoint, RustBuffer metrics, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_begin_oauth_flow(void*_Nonnull ptr, RustBuffer scopes, RustBuffer entrypoint, RustCallStatus *_Nonnull out_status
 );
 RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_get_pairing_authority_url(void*_Nonnull ptr, RustCallStatus *_Nonnull out_status
 );
-RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_begin_pairing_flow(void*_Nonnull ptr, RustBuffer pairing_url, RustBuffer scopes, RustBuffer entrypoint, RustBuffer metrics, RustCallStatus *_Nonnull out_status
+RustBuffer uniffi_fxa_client_fn_method_firefoxaccount_begin_pairing_flow(void*_Nonnull ptr, RustBuffer pairing_url, RustBuffer scopes, RustBuffer entrypoint, RustCallStatus *_Nonnull out_status
 );
 void uniffi_fxa_client_fn_method_firefoxaccount_complete_oauth_flow(void*_Nonnull ptr, RustBuffer code, RustBuffer state, RustCallStatus *_Nonnull out_status
 );
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: 2023, month: 11, day: 28, hour: 5, minute: 34, second: 57))
+        public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 29, hour: 5, minute: 29, second: 14))
     }
 
     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: 2023, month: 11, day: 28, hour: 5, minute: 34, second: 54))`
	`28`	`+ public static let info = BuildInfo(buildDate: DateComponents(calendar: Calendar.current, timeZone: TimeZone(abbreviation: "UTC"), year: 2023, month: 11, day: 29, hour: 5, minute: 29, second: 11))`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`enum NimbusEvents {`