- Golden Path: Return Code Execution if an Error occurs instead of if/else

annanna · annanna · commit 59a6b557fe6f · 2023-02-22T13:55:13.000+01:00
diff --git a/Sources/AuthenticationManager/Authentication/Sign In/Anonymous/Anonymous.swift b/Sources/AuthenticationManager/Authentication/Sign In/Anonymous/Anonymous.swift
@@ -24,11 +24,12 @@ extension AuthenticationManager {
         auth.signInAnonymously { _, error in
             if let error {
                 completion(AuthenticationError.firebase(error: error))
-            } else {
-                print("Created account for anonymous user with id \(userId ?? "")")
-                self.currentProvider = .anonymous
-                completion(nil)
+                return
             }
+            
+            print("Created account for anonymous user with id \(userId ?? "")")
+            self.currentProvider = .anonymous
+            completion(nil)
         }
     }
 }
diff --git a/Sources/AuthenticationManager/Authentication/Sign In/EmailPassword/EmailPassword.swift b/Sources/AuthenticationManager/Authentication/Sign In/EmailPassword/EmailPassword.swift
@@ -19,11 +19,12 @@ extension AuthenticationManager {
         auth.createUser(withEmail: email, password: password) { _, error in
             if let error {
                 completion(AuthenticationError.firebase(error: error))
-            } else {
-                print("Welcome user with id \(userId ?? "")")
-                self.currentProvider = .emailPassword
-                completion(nil)
+                return
             }
+            
+            print("Welcome user with id \(userId ?? "")")
+            self.currentProvider = .emailPassword
+            completion(nil)
         }
     }
     
@@ -36,11 +37,12 @@ extension AuthenticationManager {
         auth.signIn(withEmail: email, password: password) { _, error in
             if let error {
                 completion(AuthenticationError.firebase(error: error))
-            } else {
-                print("Welcome user with id \(userId ?? "")")
-                self.currentProvider = .emailPassword
-                completion(nil)
+                return
             }
+            
+            print("Welcome user with id \(userId ?? "")")
+            self.currentProvider = .emailPassword
+            completion(nil)
         }
     }
     
@@ -109,7 +111,7 @@ extension AuthenticationManager {
         
         reauthenticateWithEmail(password: currentPassword) { error in
             currentUser.delete { error in
-                if let error = error {
+                if let error {
                     completion(AuthenticationError.firebase(error: error))
                     return
                 }
diff --git a/Sources/AuthenticationManager/AuthenticationProvider.swift b/Sources/AuthenticationManager/AuthenticationProvider.swift
@@ -34,18 +34,19 @@ extension AuthenticationManager {
      If a user is already signed in but the provider key is missing (e.g. because of earlier version), we need to deduct the provider by checking the login methods
      */
     private static func setDefaultProviderKey() {
-        if hasUser {
-            if userIsAuthenticated {
-                if authorizationKey != nil {
-                    currentProvider = .signInWithApple
-                } else {
-                    currentProvider = .emailPassword
-                }
+        guard hasUser else {
+            currentProvider = nil
+            return
+        }
+         
+        if userIsAuthenticated {
+            if authorizationKey != nil {
+                currentProvider = .signInWithApple
             } else {
-                currentProvider = .anonymous
+                currentProvider = .emailPassword
             }
         } else {
-            currentProvider = nil
+            currentProvider = .anonymous
         }
     }
 }
diff --git a/Sources/AuthenticationManager/Errors/ErrorHandling.swift b/Sources/AuthenticationManager/Errors/ErrorHandling.swift
@@ -31,10 +31,11 @@ extension AuthenticationManager {
                 auth.signIn(with: linkedCredential) { result, error in
                     if let error {
                         self.handleError(error, completion: completion)
-                    } else {
-                        self.currentProvider = .signInWithApple
-                        completion(nil)
+                        return
                     }
+                    
+                    self.currentProvider = .signInWithApple
+                    completion(nil)
                 }
             }
         default:
diff --git a/Sources/FirestoreManager/CollectionRepository.swift b/Sources/FirestoreManager/CollectionRepository.swift
@@ -61,9 +61,10 @@ open class CollectionRepository<T: Codable>: ObservableObject {
         FirestoreManager.deleteDocument(id: id, reference: ref) { error in
             if let error {
                 self.didReceiveError(error)
-            } else {
-                print("Object deleted \(self.getPath(id: id))!")
+                return
             }
+            
+            print("Object deleted \(self.getPath(id: id))!")
         }
     }
     
diff --git a/Sources/FirestoreManager/FirestoreCRUD/Create.swift b/Sources/FirestoreManager/FirestoreCRUD/Create.swift
@@ -59,9 +59,10 @@ extension FirestoreManager {
         batch.commit { error in
             if let error {
                 completion(.fail(error: error, action: .batchCreate, reference: reference, id: nil))
-            } else {
-                completion(nil)
+                return
             }
+            
+            completion(nil)
         }
     }
 }
diff --git a/Sources/FirestoreManager/FirestoreCRUD/Delete.swift b/Sources/FirestoreManager/FirestoreCRUD/Delete.swift
@@ -20,9 +20,10 @@ extension FirestoreManager {
             try reference.reference().document(id).delete { error in
                 if let error {
                     completion?(.fail(error: error, action: .delete, reference: reference, id: id))
-                } else {
-                    completion?(nil)
+                    return
                 }
+                
+                completion?(nil)
             }
         } catch {
             completion?(.incompleteReference(reference: reference))
diff --git a/Sources/FirestoreManager/FirestoreCRUD/Update.swift b/Sources/FirestoreManager/FirestoreCRUD/Update.swift
@@ -48,9 +48,10 @@ extension FirestoreManager {
             try reference.reference().document(id).setData(newValues, merge: true) { error in
                 if let error {
                     completion(.failure(.fail(error: error, action: .update, reference: reference, id: id)))
-                } else {
-                    completion(.success(id))
+                    return
                 }
+                
+                completion(.success(id))
             }
         } catch {
             completion(.failure(.incompleteReference(reference: reference)))
diff --git a/Sources/StorageManager/FirebaseStorageManager.swift b/Sources/StorageManager/FirebaseStorageManager.swift
@@ -19,6 +19,7 @@ open class FirebaseStorageManager {
             let taskReference = storageRef.putFile(from: localFile, metadata: nil) { metadata, error in
                 if let error {
                     promise(.failure(.upload(error: error)))
+                    return
                 }
                 promise(.success(true))
             }

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,12 @@ extension AuthenticationManager {`
`24`	`24`	`auth.signInAnonymously { _, error in`
`25`	`25`	`if let error {`
`26`	`26`	`completion(AuthenticationError.firebase(error: error))`
`27`		`- } else {`
`28`		`- print("Created account for anonymous user with id \(userId ?? "")")`
`29`		`- self.currentProvider = .anonymous`
`30`		`- completion(nil)`
	`27`	`+ return`
`31`	`28`	`}`
	`29`	`+`
	`30`	`+ print("Created account for anonymous user with id \(userId ?? "")")`
	`31`	`+ self.currentProvider = .anonymous`
	`32`	`+ completion(nil)`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,12 @@ extension AuthenticationManager {`
`19`	`19`	`auth.createUser(withEmail: email, password: password) { _, error in`
`20`	`20`	`if let error {`
`21`	`21`	`completion(AuthenticationError.firebase(error: error))`
`22`		`- } else {`
`23`		`- print("Welcome user with id \(userId ?? "")")`
`24`		`- self.currentProvider = .emailPassword`
`25`		`- completion(nil)`
	`22`	`+ return`
`26`	`23`	`}`
	`24`	`+`
	`25`	`+ print("Welcome user with id \(userId ?? "")")`
	`26`	`+ self.currentProvider = .emailPassword`
	`27`	`+ completion(nil)`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
`@@ -36,11 +37,12 @@ extension AuthenticationManager {`
`36`	`37`	`auth.signIn(withEmail: email, password: password) { _, error in`
`37`	`38`	`if let error {`
`38`	`39`	`completion(AuthenticationError.firebase(error: error))`
`39`		`- } else {`
`40`		`- print("Welcome user with id \(userId ?? "")")`
`41`		`- self.currentProvider = .emailPassword`
`42`		`- completion(nil)`
	`40`	`+ return`
`43`	`41`	`}`
	`42`	`+`
	`43`	`+ print("Welcome user with id \(userId ?? "")")`
	`44`	`+ self.currentProvider = .emailPassword`
	`45`	`+ completion(nil)`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`
`@@ -109,7 +111,7 @@ extension AuthenticationManager {`
`109`	`111`
`110`	`112`	`reauthenticateWithEmail(password: currentPassword) { error in`
`111`	`113`	`currentUser.delete { error in`
`112`		`- if let error = error {`
	`114`	`+ if let error {`
`113`	`115`	`completion(AuthenticationError.firebase(error: error))`
`114`	`116`	`return`
`115`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,11 @@ extension AuthenticationManager {`
`31`	`31`	`auth.signIn(with: linkedCredential) { result, error in`
`32`	`32`	`if let error {`
`33`	`33`	`self.handleError(error, completion: completion)`
`34`		`- } else {`
`35`		`- self.currentProvider = .signInWithApple`
`36`		`- completion(nil)`
	`34`	`+ return`
`37`	`35`	`}`
	`36`	`+`
	`37`	`+ self.currentProvider = .signInWithApple`
	`38`	`+ completion(nil)`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,10 @@ open class CollectionRepository<T: Codable>: ObservableObject {`
`61`	`61`	`FirestoreManager.deleteDocument(id: id, reference: ref) { error in`
`62`	`62`	`if let error {`
`63`	`63`	`self.didReceiveError(error)`
`64`		`- } else {`
`65`		`- print("Object deleted \(self.getPath(id: id))!")`
	`64`	`+ return`
`66`	`65`	`}`
	`66`	`+`
	`67`	`+ print("Object deleted \(self.getPath(id: id))!")`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,10 @@ extension FirestoreManager {`
`59`	`59`	`batch.commit { error in`
`60`	`60`	`if let error {`
`61`	`61`	`completion(.fail(error: error, action: .batchCreate, reference: reference, id: nil))`
`62`		`- } else {`
`63`		`- completion(nil)`
	`62`	`+ return`
`64`	`63`	`}`
	`64`	`+`
	`65`	`+ completion(nil)`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,10 @@ extension FirestoreManager {`
`20`	`20`	`try reference.reference().document(id).delete { error in`
`21`	`21`	`if let error {`
`22`	`22`	`completion?(.fail(error: error, action: .delete, reference: reference, id: id))`
`23`		`- } else {`
`24`		`- completion?(nil)`
	`23`	`+ return`
`25`	`24`	`}`
	`25`	`+`
	`26`	`+ completion?(nil)`
`26`	`27`	`}`
`27`	`28`	`} catch {`
`28`	`29`	`completion?(.incompleteReference(reference: reference))`
Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,10 @@ extension FirestoreManager {`
`48`	`48`	`try reference.reference().document(id).setData(newValues, merge: true) { error in`
`49`	`49`	`if let error {`
`50`	`50`	`completion(.failure(.fail(error: error, action: .update, reference: reference, id: id)))`
`51`		`- } else {`
`52`		`- completion(.success(id))`
	`51`	`+ return`
`53`	`52`	`}`
	`53`	`+`
	`54`	`+ completion(.success(id))`
`54`	`55`	`}`
`55`	`56`	`} catch {`
`56`	`57`	`completion(.failure(.incompleteReference(reference: reference)))`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ open class FirebaseStorageManager {`
`19`	`19`	`let taskReference = storageRef.putFile(from: localFile, metadata: nil) { metadata, error in`
`20`	`20`	`if let error {`
`21`	`21`	`promise(.failure(.upload(error: error)))`
	`22`	`+ return`
`22`	`23`	`}`
`23`	`24`	`promise(.success(true))`
`24`	`25`	`}`