Updated struct.

ivanvorobei · ivanvorobei · commit 5af4767139af · 2024-05-13T19:18:50.000+03:00
diff --git a/Package.swift b/Package.swift
@@ -9,10 +9,6 @@ let package = Package(
     defaultLocalization: "en",
     platforms: [.iOS(.v13), .macCatalyst(.v13), .macOS(.v10_13), .tvOS(.v12), .watchOS(.v7)],
     products: [
-        /*.library(
-            name: "FirebaseWrapper",
-            targets: ["FirebaseWrapper"]
-        ),*/
         .library(
             name: "FirewrapAuth",
             targets: ["FirewrapAuth"]
@@ -57,7 +53,7 @@ let package = Package(
         .target(
             name: "FirewrapRemoteConfig",
             dependencies: [
-                .product(name: "FirewrapRemoteConfig", package: "firebase-ios-sdk"),
+                .product(name: "FirebaseRemoteConfig", package: "firebase-ios-sdk"),
                 .target(name: "Firewrap")
             ]
         )
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# FirebaseWrapper 
+# Firewrap (Firebase Wrapper) 
 
 - Auth
 - Analytics
diff --git a/Sources/Firewrap/Firewrap.swift b/Sources/Firewrap/Firewrap.swift
@@ -2,7 +2,7 @@ import Foundation
 import FirebaseCore
 import SwiftBoost
 
-open class FirebaseWrapper {
+open class Firewrap {
     
     public static func configure(with options: FirebaseOptions) {
         FirebaseApp.configure(options: options)
diff --git a/Sources/FirewrapAuth/Error/FirewrapAuthSignInError.swift b/Sources/FirewrapAuth/Error/FirewrapAuthSignInError.swift
@@ -1,7 +1,7 @@
 import Foundation
 import FirebaseAuth
 
-public enum FWAuthSignInError: Error {
+public enum FirewrapAuthSignInError: Error {
     
     case cantPresent
     case mustConfirmViaEmail
diff --git a/Sources/FirewrapAuth/Error/FirewrapDeleteProfileError.swift b/Sources/FirewrapAuth/Error/FirewrapDeleteProfileError.swift
@@ -1,13 +1,13 @@
 import Foundation
 import FirebaseAuth
 
-public enum FWADeleteProfileError: Error {
+public enum FirewrapDeleteProfileError: Error {
     
     case requiredLogin
     case faildSignInConfirm
     case failed
     
-    public static func get(by error: Error) -> FWADeleteProfileError? {
+    public static func get(by error: Error) -> FirewrapDeleteProfileError? {
         let error = error as NSError
         guard error.domain == AuthErrorDomain else{
             return nil
diff --git a/Sources/FirewrapAuth/FirewrapAuth.swift b/Sources/FirewrapAuth/FirewrapAuth.swift
@@ -1,11 +1,11 @@
 import UIKit
 import FirebaseCore
-import FirebaseWrapper
+import Firewrap
 import FirebaseAuth
 import GoogleSignIn
 import SwiftBoost
 
-public class FirebaseWrapperAuth {
+public class FirewrapAuth {
     
     public static func configure(authDidChangedWork: (() -> Void)? = nil) {
         // Logs
@@ -49,11 +49,11 @@ public class FirebaseWrapperAuth {
     public static var userName: String? { Auth.auth().currentUser?.displayName }
     public static var userEmail: String? { Auth.auth().currentUser?.email }
     
-    public static var providers: [FirebaseAuthProvider] {
+    public static var providers: [FirewrapAuthProvider] {
         guard let providerData = Auth.auth().currentUser?.providerData else { return [] }
-        var providers: [FirebaseAuthProvider] = []
+        var providers: [FirewrapAuthProvider] = []
         for providerMeta in providerData {
-            if let provider = FirebaseAuthProvider.getByBaseURL(providerMeta.providerID) {
+            if let provider = FirewrapAuthProvider.getByBaseURL(providerMeta.providerID) {
                 providers.append(provider)
             }
         }
@@ -70,7 +70,7 @@ public class FirebaseWrapperAuth {
     
     // MARK: - Actions
     
-    public static func signInWithApple(on controller: UIViewController, completion: ((SignInWithAppleData?, FWAuthSignInError?) -> Void)?) {
+    public static func signInWithApple(on controller: UIViewController, completion: ((SignInWithAppleData?, FirewrapAuthSignInError?) -> Void)?) {
         printConsole("Sign in with Apple...")
         guard let window = controller.view.window else {
             completion?(nil, .cantPresent)
@@ -103,7 +103,7 @@ public class FirebaseWrapperAuth {
         }
     }
     
-    public static func signInWithGoogle(on controller: UIViewController, completion: ((FWAuthSignInError?) -> Void)?) {
+    public static func signInWithGoogle(on controller: UIViewController, completion: ((FirewrapAuthSignInError?) -> Void)?) {
         printConsole("Sign in with Google...")
         GoogleAuthService.signIn(on: controller) { data, googleError in
             if let googleError {
@@ -131,7 +131,7 @@ public class FirebaseWrapperAuth {
     /**
      Firebase asking about Dynamic Links, but its will depicated. Observing how shoud change it
      */
-    public static func signInWithEmail(email: String, handleURL: URL, completion: ((FWAuthSignInError?) -> Void)?) {
+    public static func signInWithEmail(email: String, handleURL: URL, completion: ((FirewrapAuthSignInError?) -> Void)?) {
         printConsole("Sign in with Email...")
         EmailAuthService.signIn(email: email, handleURL: handleURL) { emailError in
             if let emailError {
@@ -145,7 +145,7 @@ public class FirebaseWrapperAuth {
         }
     }
     
-    static func handleSignInWithEmailURL(_ url: URL, completion: ((FWAuthSignInError?) -> Void)?) -> Bool {
+    static func handleSignInWithEmailURL(_ url: URL, completion: ((FirewrapAuthSignInError?) -> Void)?) -> Bool {
         guard Auth.auth().isSignIn(withEmailLink: url.absoluteString) else {
             completion?(nil)
             return false
@@ -182,12 +182,12 @@ public class FirebaseWrapperAuth {
         Auth.auth().revokeToken(withAuthorizationCode: authorizationCode)
     }
     
-    public static func delete(completion: @escaping (FWADeleteProfileError?)->Void) {
+    public static func delete(completion: @escaping (FirewrapDeleteProfileError?)->Void) {
         printConsole("Deleting Profile...")
         Auth.auth().currentUser?.delete(completion: { deleteError in
-            let unwrapDeleteError: FWADeleteProfileError? = {
+            let unwrapDeleteError: FirewrapDeleteProfileError? = {
                 if let deleteError {
-                    return FWADeleteProfileError.get(by: deleteError) ?? .failed
+                    return FirewrapDeleteProfileError.get(by: deleteError) ?? .failed
                 } else {
                     return nil
                 }
@@ -206,13 +206,13 @@ public class FirebaseWrapperAuth {
     }
     
     private static func printConsole(_ text: String) {
-        debug("FirebaseWrapper, Auth: " + text)
+        debug("Firewrap, Auth: " + text)
     }
     
     // MARK: - Singltone
     
     private var observer: AuthStateDidChangeListenerHandle?
-    private static let shared = FirebaseWrapperAuth()
-    private var completionSignInViaEmail: ((FWAuthSignInError?) -> Void)? = nil
+    private static let shared = FirewrapAuth()
+    private var completionSignInViaEmail: ((FirewrapAuthSignInError?) -> Void)? = nil
     private init() {}
 }
diff --git a/Sources/FirewrapAuth/FirewrapAuthProvider.swift b/Sources/FirewrapAuth/FirewrapAuthProvider.swift
@@ -1,20 +1,20 @@
 import Foundation
 
-public enum FirebaseAuthProvider: String, CaseIterable {
+public enum FirewrapAuthProvider: String, CaseIterable {
     
     case apple
     case google
     case email
     
     public var id: String { rawValue }
     
-    static func getByBaseURL(_ url: String) -> FirebaseAuthProvider? {
+    static func getByBaseURL(_ url: String) -> FirewrapAuthProvider? {
         for provider in Self.allCases {
             if url == provider.baseURL {
                 return provider
             }
         }
-        print("FirebaseWrapper: Can't get provider by web url \(url)")
+        print("Firewrap: Can't get provider by web url \(url)")
         return nil
     }
     
diff --git a/Sources/FirewrapAuth/Services/AppleAuthService.swift b/Sources/FirewrapAuth/Services/AppleAuthService.swift
@@ -26,7 +26,7 @@ class AppleAuthService: NSObject, ASAuthorizationControllerDelegate, ASAuthoriza
             let authorizationCodeString = String(data: authorizationCode, encoding: .utf8)
         else {
             // todo parse
-            completion?(nil, FWAuthSignInError.failed)
+            completion?(nil, FirewrapAuthSignInError.failed)
             return
         }
         
diff --git a/Sources/FirewrapAuth/Services/GoogleAuthService.swift b/Sources/FirewrapAuth/Services/GoogleAuthService.swift
@@ -4,7 +4,7 @@ import GoogleSignIn
 
 class GoogleAuthService {
  
-    public static func signIn(on controller: UIViewController, completion: ((SignInWithGoogleData?, FWAuthSignInError?) -> Void)?) {
+    public static func signIn(on controller: UIViewController, completion: ((SignInWithGoogleData?, FirewrapAuthSignInError?) -> Void)?) {
         guard let clientID = FirebaseApp.app()?.options.clientID else {
             completion?(nil, .failed)
             return
diff --git a/Sources/FirewrapDatabase/FirewrapCollection.swift b/Sources/FirewrapDatabase/FirewrapCollection.swift
@@ -0,0 +1,21 @@
+import Foundation
+import FirebaseFirestore
+
+class FirewrapCollection {
+    
+    func getDocument(id: String) -> FirewrapDocument? {
+        return nil
+    }
+    
+    func getDocument(where field: String, equal: Any) -> FirewrapDocument? {
+        return nil
+    }
+    
+    func getDocuments() -> [FirewrapDocument]? {
+        return nil
+    }
+    
+    func observe(_ handler: () -> Void) {
+        
+    }
+}
diff --git a/Sources/FirewrapDatabase/FirewrapDocument.swift b/Sources/FirewrapDatabase/FirewrapDocument.swift
@@ -16,7 +16,7 @@ public enum FWFirestoreSource {
     }
 }
 
-public class FirebaseDocument {
+public class FirewrapDocument {
     
     public let path: String
     
@@ -51,22 +51,3 @@ public class FirebaseDocument {
         
     }
 }
-
-class FirebaseCollection {
-    
-    func getDocument(id: String) -> FirebaseDocument? {
-        return nil
-    }
-    
-    func getDocument(where field: String, equal: Any) -> FirebaseDocument? {
-        return nil
-    }
-    
-    func getDocuments() -> [FirebaseDocument]? {
-        return nil
-    }
-    
-    func observe(_ handler: () -> Void) {
-        
-    }
-}
diff --git a/Sources/FirewrapDatabase/FirewrapSource.swift b/Sources/FirewrapDatabase/FirewrapSource.swift
@@ -0,0 +1,17 @@
+import Foundation
+import FirebaseFirestore
+
+public enum FirewrapSource {
+    
+    case `default`
+    case server
+    case cache
+    
+    var firebaseValue: FirestoreSource {
+        switch self {
+        case .default: return .default
+        case .server: return .server
+        case .cache: return .cache
+        }
+    }
+}
diff --git a/Sources/FirewrapRemoteConfig/FirebaseWrapperRemoteConfig.swift b/Sources/FirewrapRemoteConfig/FirebaseWrapperRemoteConfig.swift
@@ -1,29 +1,29 @@
 import Foundation
-import FirebaseWrapper
+import Firewrap
 import FirebaseRemoteConfig
 import SwiftBoost
 
-class FirebaseRemoteConfigWrapper {
+class FirewrapRemoteConfig {
     
     public static func configure(
         defaults: [String : NSObject]? = nil,
         updatedHandler: (() -> Void)? = nil
     ) {
-        debug("FirebaseWrapper: RemoteConfig configure")
+        printConsole("RemoteConfig configure")
         shared.updatedHandler = updatedHandler
         
         let settings = RemoteConfigSettings()
         settings.minimumFetchInterval = 0
         shared.remoteConfig.configSettings = settings
         shared.remoteConfig.setDefaults(defaults ?? [:])
         
-        debug("FirebaseWrapper: RemoteConfig fetchAndActivate")
+        printConsole("RemoteConfig fetchAndActivate")
         shared.remoteConfig.fetch { updateStatus, getError in
             switch updateStatus {
             case .success:
                 activateNewConfig()
             case .failure, .noFetchYet, .throttled:
-                error("FirebaseWrapper: RemoteConfig initial get with error, " + (getError?.localizedDescription ?? .empty))
+                printConsole("RemoteConfig initial get with error, " + (getError?.localizedDescription ?? .empty))
                 break
             @unknown default:
                 break
@@ -32,18 +32,18 @@ class FirebaseRemoteConfigWrapper {
         
         shared.remoteConfig.addOnConfigUpdateListener { configUpdate, listnerError in
             guard listnerError == nil else {
-                error("FirebaseWrapper: RemoteConfig got update in listner with error, " + (listnerError?.localizedDescription ?? .empty))
+                printConsole("RemoteConfig got update in listner with error, " + (listnerError?.localizedDescription ?? .empty))
                 return
             }
-            debug("FirebaseWrapper: RemoteConfig activate after got new in listner")
+            printConsole("RemoteConfig activate after got new in listner")
             activateNewConfig()
         }
     }
     
     private static func activateNewConfig() {
         shared.remoteConfig.activate { changed, activateError in
             guard activateError == nil else {
-                error("FirebaseWrapper: RemoteConfig can't activate after got new in listner, " + (activateError?.localizedDescription ?? .empty))
+                printConsole("RemoteConfig can't activate after got new in listner, " + (activateError?.localizedDescription ?? .empty))
                 return
             }
             
@@ -56,8 +56,12 @@ class FirebaseRemoteConfigWrapper {
         shared.remoteConfig.configValue(forKey: key).boolValue
     }
     
+    private static func printConsole(_ text: String) {
+        debug("Firewrap, Auth: " + text)
+    }
+    
     private var updatedHandler: (() -> Void)? = nil
-    private static let shared = FirebaseRemoteConfigWrapper()
+    private static let shared = FirewrapRemoteConfig()
     private let remoteConfig = FirebaseRemoteConfig.RemoteConfig.remoteConfig()
     private init() {}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# FirebaseWrapper`
	`1`	`+# Firewrap (Firebase Wrapper)`
`2`	`2`
`3`	`3`	`- Auth`
`4`	`4`	`- Analytics`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`import Foundation`
`2`	`2`
`3`		`-public enum FirebaseAuthProvider: String, CaseIterable {`
	`3`	`+public enum FirewrapAuthProvider: String, CaseIterable {`
`4`	`4`
`5`	`5`	`case apple`
`6`	`6`	`case google`
`7`	`7`	`case email`
`8`	`8`
`9`	`9`	`public var id: String { rawValue }`
`10`	`10`
`11`		`- static func getByBaseURL(_ url: String) -> FirebaseAuthProvider? {`
	`11`	`+ static func getByBaseURL(_ url: String) -> FirewrapAuthProvider? {`
`12`	`12`	`for provider in Self.allCases {`
`13`	`13`	`if url == provider.baseURL {`
`14`	`14`	`return provider`
`15`	`15`	`}`
`16`	`16`	`}`
`17`		`- print("FirebaseWrapper: Can't get provider by web url \(url)")`
	`17`	`+ print("Firewrap: Can't get provider by web url \(url)")`
`18`	`18`	`return nil`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class AppleAuthService: NSObject, ASAuthorizationControllerDelegate, ASAuthoriza`
`26`	`26`	`let authorizationCodeString = String(data: authorizationCode, encoding: .utf8)`
`27`	`27`	`else {`
`28`	`28`	`// todo parse`
`29`		`- completion?(nil, FWAuthSignInError.failed)`
	`29`	`+ completion?(nil, FirewrapAuthSignInError.failed)`
`30`	`30`	`return`
`31`	`31`	`}`
`32`	`32`