Improve/use shorthand syntax for unwrapping optionals and fix typos (#…

…12369)
firebase · May 3, 2024 · e8a12e0 · e8a12e0
1 parent 477bb2a
commit e8a12e0
Show file tree

Hide file tree

Showing 86 changed files with 266 additions and 266 deletions.
diff --git a/Example/tvOSSample/tvOSSample/AuthViewController.swift b/Example/tvOSSample/tvOSSample/AuthViewController.swift
@@ -55,7 +55,7 @@ class AuthViewController: UIViewController {
   // MARK: - Internal Helpers
 
   private func setUserSignedIn(_ user: User?) {
-    if let user = user {
+    if let user {
       providers.isHidden = true
       signedIn.isHidden = false
 

diff --git a/Example/watchOSSample/ServiceExtension/NotificationService.swift b/Example/watchOSSample/ServiceExtension/NotificationService.swift
@@ -25,7 +25,7 @@ class NotificationService: UNNotificationServiceExtension {
     self.contentHandler = contentHandler
     bestAttemptContent = (request.content.mutableCopy() as? UNMutableNotificationContent)
 
-    if let bestAttemptContent = bestAttemptContent {
+    if let bestAttemptContent {
       // Modify the notification content here...
       bestAttemptContent.title = "\(bestAttemptContent.title) 👩‍💻"
 
@@ -39,7 +39,7 @@ class NotificationService: UNNotificationServiceExtension {
     // Called just before the extension will be terminated by the system.
     // Use this as an opportunity to deliver your "best attempt" at modified content, otherwise the
     // original push payload will be used.
-    if let contentHandler = contentHandler, let bestAttemptContent = bestAttemptContent {
+    if let contentHandler, let bestAttemptContent {
       contentHandler(bestAttemptContent)
     }
   }

diff --git a/FirebaseAnalyticsSwift/README.md b/FirebaseAnalyticsSwift/README.md
@@ -90,11 +90,11 @@ extension View {
     func analyticsScreen(name: String, class screenClass: String? = nil, extraParameters: [String: Any]? = nil) -> some View {
         onAppear {
             var params: [String: Any] = [AnalyticsParameterScreenName: name]
-            if let screenClass = screenClass {
+            if let screenClass {
                 params[AnalyticsParameterScreenClass] = screenClass
             }
-            if let extraParams = extraParameters {
-                params.merge(extraParams) { _, new in new }
+            if let extraParameters {
+                params.merge(extraParameters) { _, new in new }
             }
             Analytics.logEvent(AnalyticsEventScreenView, parameters: params)
         }

diff --git a/FirebaseAppCheck/Apps/FIRAppCheckTestApp/FIRAppCheckTestApp/AppDelegate.swift b/FirebaseAppCheck/Apps/FIRAppCheckTestApp/FIRAppCheckTestApp/AppDelegate.swift
@@ -72,11 +72,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     DeviceCheckProvider(app: firebaseApp)?.getToken { token, error in
-      if let token = token {
+      if let token {
         print("DeviceCheck token: \(token.token), expiration date: \(token.expirationDate)")
       }
 
-      if let error = error {
+      if let error {
         print("DeviceCheck error: \((error as NSError).userInfo)")
       }
     }
@@ -91,11 +91,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
       print("Debug token: \(debugProvider.currentDebugToken())")
 
       debugProvider.getToken { token, error in
-        if let token = token {
+        if let token {
           print("Debug FAC token: \(token.token), expiration date: \(token.expirationDate)")
         }
 
-        if let error = error {
+        if let error {
           print("Debug error: \(error)")
         }
       }
@@ -106,11 +106,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
   func requestLimitedUseToken() {
     AppCheck.appCheck().limitedUseToken { result, error in
-      if let result = result {
+      if let result {
         print("FAC limited-use token: \(result.token), expiration date: \(result.expirationDate)")
       }
 
-      if let error = error {
+      if let error {
         print("Error: \(String(describing: error))")
       }
     }
@@ -128,11 +128,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 
     appAttestProvider.getToken { token, error in
-      if let token = token {
+      if let token {
         print("App Attest FAC token: \(token.token), expiration date: \(token.expirationDate)")
       }
 
-      if let error = error {
+      if let error {
         print("App Attest error: \(error)")
       }
     }

diff --git a/FirebaseAppCheck/Tests/Unit/Swift/AppCheckAPITests.swift b/FirebaseAppCheck/Tests/Unit/Swift/AppCheckAPITests.swift
@@ -119,7 +119,7 @@ final class AppCheckAPITests {
     // MARK: - AppCheckErrors
 
     AppCheck.appCheck().token(forcingRefresh: false) { _, error in
-      if let error = error {
+      if let error {
         switch error {
         case AppCheckErrorCode.unknown:
           break

diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/AccountInfoTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/AccountInfoTests.swift
@@ -43,7 +43,7 @@ class AccountInfoTests: TestsBase {
     let auth = Auth.auth()
     let expectation1 = expectation(description: "Created account with email and password.")
     auth.createUser(withEmail: kOldUserEmail, password: "password") { user, error in
-      if let error = error {
+      if let error {
         XCTAssertEqual((error as NSError).code,
                        AuthErrorCode.emailAlreadyInUse.rawValue,
                        "Created a user despite it already exiting.")

diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/EmailPasswordTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/EmailPasswordTests.swift
@@ -29,7 +29,7 @@ class EmailPasswordTests: TestsBase {
     let auth = Auth.auth()
     let expectation = self.expectation(description: "Created account with email and password.")
     auth.createUser(withEmail: kNewEmailToCreateUser, password: "password") { result, error in
-      if let error = error {
+      if let error {
         print("createUserWithEmail has error: \(error)")
       }
       expectation.fulfill()

diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/FacebookTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/FacebookTests.swift
@@ -30,7 +30,7 @@ import XCTest
 //    let credential = FacebookAuthProvider.credential(withAccessToken: facebookAccessToken)
 //    let expectation = self.expectation(description: "Signing in with Facebook finished.")
 //    auth.signIn(with: credential) { result, error in
-//      if let error = error {
+//      if let error {
 //        XCTFail("Signing in with Facebook had error: \(error)")
 //      } else {
 //        XCTAssertEqual(auth.currentUser?.displayName, Credentials.kFacebookUserName)
@@ -69,7 +69,7 @@ import XCTest
 //    let credential = FacebookAuthProvider.credential(withAccessToken: facebookAccessToken)
 //    let expectation = self.expectation(description: "Facebook linking finished.")
 //    auth.currentUser?.link(with: credential, completion: { result, error in
-//      if let error = error {
+//      if let error {
 //        XCTFail("Link to Firebase error: \(error)")
 //      } else {
 //        guard let providers = (auth.currentUser?.providerData) else {
@@ -124,7 +124,7 @@ import XCTest
 //    fetcher.setRequestValue("text/plain", forHTTPHeaderField: "Content-Type")
 //    let expectation = self.expectation(description: "Creating Facebook account finished.")
 //    fetcher.beginFetch { data, error in
-//      if let error = error {
+//      if let error {
 //        let error = error as NSError
 //        if let message = String(data: error.userInfo["data"] as! Data, encoding: .utf8) {
 //          // May get transient errors here for too many api calls when tests run frequently.
@@ -181,7 +181,7 @@ import XCTest
 //    fetcher.setRequestValue("text/plain", forHTTPHeaderField: "Content-Type")
 //    let expectation = self.expectation(description: "Deleting Facebook account finished.")
 //    fetcher.beginFetch { data, error in
-//      if let error = error {
+//      if let error {
 //        XCTFail("Deleting Facebook account failed with error: \(error)")
 //      }
 //      expectation.fulfill()

diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/GoogleTests.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/GoogleTests.swift
@@ -29,7 +29,7 @@ class GoogleTests: TestsBase {
                                                    accessToken: googleAccessToken)
     let expectation = self.expectation(description: "Signing in with Google finished.")
     auth.signIn(with: credential) { result, error in
-      if let error = error {
+      if let error {
         print("Signing in with Google had error: \(error)")
       }
       expectation.fulfill()
@@ -65,7 +65,7 @@ class GoogleTests: TestsBase {
     fetcher.setRequestValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
     let expectation = self.expectation(description: "Exchanging Google account tokens finished.")
     fetcher.beginFetch { data, error in
-      if let error = error {
+      if let error {
         XCTFail("Exchanging Google account tokens finished with error: \(error)")
       } else {
         do {

diff --git a/FirebaseAuth/Tests/Sample/SwiftApiTests/TestsBase.swift b/FirebaseAuth/Tests/Sample/SwiftApiTests/TestsBase.swift
@@ -38,7 +38,7 @@ class TestsBase: XCTestCase {
 
     let expectation = self.expectation(description: "Anonymous sign-in finished.")
     auth.signInAnonymously { result, error in
-      if let error = error {
+      if let error {
         print("Anonymous sign in error: \(error)")
       }
       expectation.fulfill()
@@ -59,7 +59,7 @@ class TestsBase: XCTestCase {
     let auth = Auth.auth()
     let expectation = self.expectation(description: "Delete current user finished.")
     auth.currentUser?.delete { error in
-      if let error = error {
+      if let error {
         print("Anonymous sign in error: \(error)")
       }
       expectation.fulfill()

diff --git a/FirebaseCombineSwift/DECISIONS.md b/FirebaseCombineSwift/DECISIONS.md
@@ -28,9 +28,9 @@ extension Auth {
                            password: String) -> Future<AuthDataResult, Error> {
       Future<AuthDataResult, Error> { /* [weak self]  <-- not required */ promise in
         self?.createUser(withEmail: email, password: password) { authDataResult, error in
-          if let error = error {
+          if let error {
             promise(.failure(error))
-          } else if let authDataResult = authDataResult {
+          } else if let authDataResult {
             promise(.success(authDataResult))
           }
         }
@@ -59,4 +59,4 @@ Using the same method and parameter names for one-shot asynchronous methods resu
 
 ![image](https://user-images.githubusercontent.com/232107/99672274-76f05680-2a73-11eb-880a-3563f293de7d.png)
 
-To achieve the same for methods that return a stream of events, we'd have to name those `addXzyListener`. This would be in contrast to Apple's naming scheme (e.g. `dataTask(with:completionHandler)` -> `dataTaskPublisher(for:)`
+To achieve the same for methods that return a stream of events, we'd have to name those `addXzyListener`. This would be in contrast to Apple's naming scheme (e.g. `dataTask(with:completionHandler)` -> `dataTaskPublisher(for:)`
diff --git a/FirebaseCombineSwift/README.md b/FirebaseCombineSwift/README.md
@@ -78,7 +78,7 @@ In the `sign(_:didSignInFor:withError:)` method, get a Google ID token and Googl
 ```swift
   func sign(_ signIn: GIDSignIn!, didSignInFor user: GIDGoogleUser!, withError error: Error?) {
     // ...
-    if let error = error {
+    if let error {
       // ...
       return
     }

diff --git a/FirebaseCombineSwift/Sources/Auth/Auth+Combine.swift b/FirebaseCombineSwift/Sources/Auth/Auth+Combine.swift
@@ -86,7 +86,7 @@ public extension Auth {
   func updateCurrentUser(_ user: User) -> Future<Void, Error> {
     Future<Void, Error> { promise in
       self.updateCurrentUser(user) { error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
         } else {
           promise(.success(()))
@@ -117,9 +117,9 @@ public extension Auth {
   func signInAnonymously() -> Future<AuthDataResult, Error> {
     Future<AuthDataResult, Error> { promise in
       self.signInAnonymously { authDataResult, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let authDataResult = authDataResult {
+        } else if let authDataResult {
           promise(.success(authDataResult))
         }
       }
@@ -155,9 +155,9 @@ public extension Auth {
                   password: String) -> Future<AuthDataResult, Error> {
     Future<AuthDataResult, Error> { promise in
       self.createUser(withEmail: email, password: password) { authDataResult, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let authDataResult = authDataResult {
+        } else if let authDataResult {
           promise(.success(authDataResult))
         }
       }
@@ -189,9 +189,9 @@ public extension Auth {
               password: String) -> Future<AuthDataResult, Error> {
     Future<AuthDataResult, Error> { promise in
       self.signIn(withEmail: email, password: password) { authDataResult, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let authDataResult = authDataResult {
+        } else if let authDataResult {
           promise(.success(authDataResult))
         }
       }
@@ -224,9 +224,9 @@ public extension Auth {
               link: String) -> Future<AuthDataResult, Error> {
     Future<AuthDataResult, Error> { promise in
       self.signIn(withEmail: email, link: link) { authDataResult, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let authDataResult = authDataResult {
+        } else if let authDataResult {
           promise(.success(authDataResult))
         }
       }
@@ -249,7 +249,7 @@ public extension Auth {
                       actionCodeSettings: ActionCodeSettings) -> Future<Void, Error> {
     Future<Void, Error> { promise in
       self.sendSignInLink(toEmail: email, actionCodeSettings: actionCodeSettings) { error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
         } else {
           promise(.success(()))
@@ -274,9 +274,9 @@ public extension Auth {
   func fetchSignInMethods(forEmail email: String) -> Future<[String], Error> {
     Future<[String], Error> { promise in
       self.fetchSignInMethods(forEmail: email) { signInMethods, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let signInMethods = signInMethods {
+        } else if let signInMethods {
           promise(.success(signInMethods))
         }
       }
@@ -309,7 +309,7 @@ public extension Auth {
                             newPassword: String) -> Future<Void, Error> {
     Future<Void, Error> { promise in
       self.confirmPasswordReset(withCode: code, newPassword: newPassword) { error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
         } else {
           promise(.success(()))
@@ -332,9 +332,9 @@ public extension Auth {
   func verifyPasswordResetCode(_ code: String) -> Future<String, Error> {
     Future<String, Error> { promise in
       self.verifyPasswordResetCode(code) { email, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let email = email {
+        } else if let email {
           promise(.success(email))
         }
       }
@@ -353,9 +353,9 @@ public extension Auth {
   func checkActionCode(code: String) -> Future<ActionCodeInfo, Error> {
     Future<ActionCodeInfo, Error> { promise in
       self.checkActionCode(code) { actionCodeInfo, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let actionCodeInfo = actionCodeInfo {
+        } else if let actionCodeInfo {
           promise(.success(actionCodeInfo))
         }
       }
@@ -376,7 +376,7 @@ public extension Auth {
   func applyActionCode(code: String) -> Future<Void, Error> {
     Future<Void, Error> { promise in
       self.applyActionCode(code) { error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
         } else {
           promise(.success(()))
@@ -405,7 +405,7 @@ public extension Auth {
   func sendPasswordReset(withEmail email: String) -> Future<Void, Error> {
     Future<Void, Error> { promise in
       self.sendPasswordReset(withEmail: email) { error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
         } else {
           promise(.success(()))
@@ -448,7 +448,7 @@ public extension Auth {
                          actionCodeSettings: ActionCodeSettings) -> Future<Void, Error> {
     Future<Void, Error> { promise in
       self.sendPasswordReset(withEmail: email, actionCodeSettings: actionCodeSettings) { error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
         } else {
           promise(.success(()))
@@ -506,9 +506,9 @@ public extension Auth {
                 uiDelegate: AuthUIDelegate?) -> Future<AuthDataResult, Error> {
       Future<AuthDataResult, Error> { promise in
         self.signIn(with: provider, uiDelegate: uiDelegate) { authDataResult, error in
-          if let error = error {
+          if let error {
             promise(.failure(error))
-          } else if let authDataResult = authDataResult {
+          } else if let authDataResult {
             promise(.success(authDataResult))
           }
         }
@@ -534,9 +534,9 @@ public extension Auth {
   func signIn(withCustomToken token: String) -> Future<AuthDataResult, Error> {
     Future<AuthDataResult, Error> { promise in
       self.signIn(withCustomToken: token) { authDataResult, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let authDataResult = authDataResult {
+        } else if let authDataResult {
           promise(.success(authDataResult))
         }
       }
@@ -583,9 +583,9 @@ public extension Auth {
   func signIn(with credential: AuthCredential) -> Future<AuthDataResult, Error> {
     Future<AuthDataResult, Error> { promise in
       self.signIn(with: credential) { authDataResult, error in
-        if let error = error {
+        if let error {
           promise(.failure(error))
-        } else if let authDataResult = authDataResult {
+        } else if let authDataResult {
           promise(.success(authDataResult))
         }
       }