Skip to content

Commit 3f1d3b3

Browse files
russellwheatleyrussellwheatley
committed
refactor: update implementation to more idiomatic Swift code
1 parent 3dd1117 commit 3f1d3b3

File tree

5 files changed

+98
-175
lines changed

5 files changed

+98
-175
lines changed

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Actions.swift‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/FirebaseAuthSwiftUI.swift‎

Lines changed: 43 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -2,101 +2,62 @@
22
// https://docs.swift.org/swift-book
33
import SwiftUI
44
import FirebaseAuth
5+
import FirebaseCore
56
import Combine
67

8+
public protocol FUIAuthProvider {
9+
var providerId: String { get }
10+
}
11+
12+
public class FirebaseAuthSwiftUI {
13+
private var auth: Auth
14+
private var authProviders: [FUIAuthProvider] = []
15+
16+
public init(auth: Auth? = nil) {
17+
// Use the provided Auth instance or default
18+
self.auth = auth ?? Auth.auth()
19+
}
720

8-
public protocol AuthListenerProtocol {
9-
func onError(_ error: Error)
10-
func onBeforeSignIn()
11-
func onSignedIn(_ user: User)
12-
func onCanceled()
13-
func onCredentialReceived(_ credential: AuthCredential)
14-
func onCredentialLinked(_ credential: AuthCredential)
15-
// TODO - add when I get to this point
16-
// func onMFARequired(_ resolver: MultiFactorResolver)
21+
public func authProviders(providers: [FUIAuthProvider]) {
22+
self.authProviders = providers
23+
}
1724
}
1825

19-
public protocol AuthProviderProtocol {
20-
associatedtype Listener: AuthListenerProtocol
21-
associatedtype Credential: AuthCredential
22-
23-
var auth: Auth { get }
24-
var authListener: Listener { get set }
25-
var providerId: String { get }
26+
// main auth view - can be composed of custom views or fallback to default views. We can also pass state upwards as opposed to callback.
27+
// Negates the need for a delegate used in UIKit
28+
public struct FUIAuthView: View {
29+
private var FUIAuth: FirebaseAuthSwiftUI
30+
private var authPickerView: any AuthPickerView
2631

27-
func signInWithCredential(_ credential: Credential)
28-
func linkWithCredential(_ credential: Credential)
29-
}
3032

31-
public enum AuthAction {
32-
/// Performs user sign in
33-
case signIn
33+
public init(FUIAuth: FirebaseAuthSwiftUI,_authPickerView: some AuthPickerView = FUIAuthPicker()) {
34+
self.FUIAuth = FUIAuth
35+
self.authPickerView = _authPickerView
3436

35-
/// Creates a new account with for a provided credential
36-
case signUp
37+
}
38+
39+
public var body: some View {
40+
VStack {
41+
AnyView(authPickerView)
42+
}
43+
}
44+
}
3745

38-
/// Links a provided credential with currently signed in user account
39-
case link
4046

41-
/// Disables automatic credential handling.
42-
/// It's up to the user to decide what to do with the obtained credential.
43-
case none
47+
public protocol AuthPickerView: View {
48+
var title: String { get }
4449
}
4550

46-
open class AuthProvider<Listener: AuthListenerProtocol>: AuthProviderProtocol {
47-
public var auth: Auth = Auth.auth()
48-
public var authListener: Listener
49-
public var providerId: String
50-
51-
public init(listener: Listener, providerId: String) {
52-
self.authListener = listener
53-
self.providerId = providerId
54-
}
55-
56-
var shouldUpgradeAnonymous: Bool {
57-
return Auth.auth().currentUser?.isAnonymous ?? false
51+
public struct FUIAuthPicker: AuthPickerView {
52+
public init(title: String? = nil) {
53+
self.title = title ?? "Auth Picker View"
5854
}
59-
60-
public func signInWithCredential(_ credential: AuthCredential) {
61-
authListener.onBeforeSignIn()
62-
auth.signIn(with: credential) { [weak self] result, error in
63-
if let error = error {
64-
self?.authListener.onError(error)
65-
} else if let user = result?.user {
66-
self?.authListener.onSignedIn(user)
67-
}
55+
public var title: String = "Main View"
56+
public var body: some View {
57+
VStack {
58+
Text(title)
59+
.font(.largeTitle)
60+
.padding()
6861
}
6962
}
70-
71-
public func linkWithCredential(_ credential: AuthCredential) {
72-
authListener.onCredentialReceived(credential)
73-
guard let user = auth.currentUser else { return }
74-
75-
user.link(with: credential) { [weak self] result, error in
76-
if let error = error {
77-
self?.authListener.onError(error)
78-
} else {
79-
self?.authListener.onCredentialLinked(credential)
80-
}
81-
}
82-
}
83-
84-
func onCredentialReceived(credential: AuthCredential, action: AuthAction) {
85-
switch action {
86-
case .link:
87-
linkWithCredential(credential)
88-
case .signIn, .signUp:
89-
// Only email provider has a different action for sign in and sign up
90-
// and implements its own sign up logic.
91-
if shouldUpgradeAnonymous {
92-
linkWithCredential(credential)
93-
} else {
94-
signInWithCredential(credential)
95-
}
96-
case .none:
97-
authListener.onCredentialReceived(credential)
98-
}
99-
}
100-
// TODO - fetchSignInMethodsForEmail/fetchProvidersForEmail is deprecated
10163
}
102-

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Scenes/SignInScene.swift‎

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,49 @@
1-
import SwiftUI
2-
3-
struct SignInScene: Scene {
4-
@available(iOS 14.0, *)
5-
var body: some Scene {
6-
WindowGroup {
7-
SignIn()
8-
}
9-
}
10-
}
11-
12-
struct SignIn: View {
13-
@State private var email: String = ""
14-
@State private var password: String = ""
15-
var actions: [FirebaseUIAction] = []
16-
17-
var body: some View {
18-
VStack {
19-
Text("Sign in")
20-
.font(.largeTitle)
21-
.padding()
22-
23-
TextField("Email", text: $email)
24-
.textFieldStyle(RoundedBorderTextFieldStyle())
25-
.padding()
26-
27-
SecureField("Password", text: $password)
28-
.textFieldStyle(RoundedBorderTextFieldStyle())
29-
.padding()
30-
31-
Button(action: {
32-
print("Register button tapped with email: \(email) and password: \(password)")
33-
// Add registration logic here
34-
}) {
35-
Text("Sign in")
36-
.font(.headline)
37-
.padding()
38-
.frame(maxWidth: .infinity)
39-
.background(Color.blue)
40-
.foregroundColor(.white)
41-
.cornerRadius(10)
42-
}
43-
.padding()
44-
}
45-
.padding()
46-
}
47-
}
1+
//import SwiftUI
2+
//
3+
//public struct SignInScene: Scene {
4+
// @available(iOS 14.0, *)
5+
// public var body: some Scene {
6+
// WindowGroup {
7+
// SignIn()
8+
// }
9+
// }
10+
//}
11+
//
12+
//public struct SignIn: View {
13+
// @State private var email: String = ""
14+
// @State private var password: String = ""
15+
// var actions: [FirebaseUIAction] = []
16+
//
17+
// public init() {}
18+
//
19+
// public var body: some View {
20+
// VStack {
21+
// Text("Sign in")
22+
// .font(.largeTitle)
23+
// .padding()
24+
//
25+
// TextField("Email", text: $email)
26+
// .textFieldStyle(RoundedBorderTextFieldStyle())
27+
// .padding()
28+
//
29+
// SecureField("Password", text: $password)
30+
// .textFieldStyle(RoundedBorderTextFieldStyle())
31+
// .padding()
32+
//
33+
// Button(action: {
34+
// print("Register button tapped with email: \(email) and password: \(password)")
35+
// // Add registration logic here
36+
// }) {
37+
// Text("Sign in")
38+
// .font(.headline)
39+
// .padding()
40+
// .frame(maxWidth: .infinity)
41+
// .background(Color.blue)
42+
// .foregroundColor(.white)
43+
// .cornerRadius(10)
44+
// }
45+
// .padding()
46+
// }
47+
// .padding()
48+
// }
49+
//}

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/FirebaseAuthSwiftUI/Views/FUIAuthPicker.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import SwiftUI
2+

‎FirebaseSwiftUI/FirebaseEmailAuthSwiftUI/Sources/FirebaseEmailAuthSwiftUI/FirebaseEmailAuthSwiftUI.swift‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,9 @@
44
import FirebaseAuthSwiftUI
55
import FirebaseAuth
66

7-
class EmailAuthProvider<Listener: AuthListenerProtocol>: AuthProvider<Listener> {
8-
init(listener: Listener) {
9-
super.init(listener: listener, providerId: "password")
10-
}
11-
12-
func signUpWithEmailAndPassword(email: String, password: String) {
13-
self.authListener.onBeforeSignIn()
14-
Auth.auth().createUser(withEmail: email, password: password) { authResult, error in
15-
if let error = error {
16-
// Handle error
17-
self.authListener.onError(error)
18-
} else if let authResult = authResult {
19-
// Notify listener on successful sign-in
20-
self.authListener.onSignedIn(authResult.user)
21-
}
22-
}
7+
class EmailAuthProvider: FUIAuthProvider {
8+
var providerId: String {
9+
return "password"
2310
}
11+
2412
}

0 commit comments

Comments
 (0)