Skip to content

Commit 6721314

Browse files
russellwheatleyrussellwheatley
authored
Merge branch 'main' into auto-upgrade-anonymous
2 parents a014c7a + bf922dd commit 6721314

File tree

25 files changed

+774
-216
lines changed

25 files changed

+774
-216
lines changed

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthConfiguration.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ public struct AuthConfiguration {
66
let interactiveDismissEnabled: Bool
77
let shouldAutoUpgradeAnonymousUsers: Bool
88
let customStringsBundle: Bundle?
9-
let tosUrl: URL
10-
let privacyPolicyUrl: URL
9+
let tosUrl: URL?
10+
let privacyPolicyUrl: URL?
1111
let emailLinkSignInActionCodeSettings: ActionCodeSettings?
1212
let verifyEmailActionCodeSettings: ActionCodeSettings?
1313

1414
public init(shouldHideCancelButton: Bool = false,
1515
interactiveDismissEnabled: Bool = true,
1616
shouldAutoUpgradeAnonymousUsers: Bool = false,
1717
customStringsBundle: Bundle? = nil,
18-
tosUrl: URL = URL(string: "https://example.com/tos")!,
19-
privacyPolicyUrl: URL = URL(string: "https://example.com/privacy")!,
18+
tosUrl: URL? = nil,
19+
privacyPolicyUrl: URL? = nil,
2020
emailLinkSignInActionCodeSettings: ActionCodeSettings? = nil,
2121
verifyEmailActionCodeSettings: ActionCodeSettings? = nil) {
2222
self.shouldHideCancelButton = shouldHideCancelButton

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import SwiftUI
33

44
public protocol ExternalAuthProvider {
5-
associatedtype ButtonType: View
6-
@MainActor var authButton: ButtonType { get }
5+
var id: String { get }
6+
@MainActor func authButton() -> AnyView
77
}
88

99
public protocol GoogleProviderAuthUIProtocol: ExternalAuthProvider {
@@ -65,15 +65,9 @@ private final class AuthListenerManager {
6565
@MainActor
6666
@Observable
6767
public final class AuthService {
68-
public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth(),
69-
googleProvider: (any GoogleProviderAuthUIProtocol)? = nil,
70-
facebookProvider: (any FacebookProviderAuthUIProtocol)? = nil,
71-
phoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)? = nil) {
68+
public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth()) {
7269
self.auth = auth
7370
self.configuration = configuration
74-
self.googleProvider = googleProvider
75-
self.facebookProvider = facebookProvider
76-
self.phoneAuthProvider = phoneAuthProvider
7771
string = StringUtils(bundle: configuration.customStringsBundle ?? Bundle.module)
7872
listenerManager = AuthListenerManager(auth: auth, authEnvironment: self)
7973
}
@@ -96,6 +90,21 @@ public final class AuthService {
9690
private var listenerManager: AuthListenerManager?
9791
private var signedInCredential: AuthCredential?
9892

93+
private var providers: [ExternalAuthProvider] = []
94+
public func register(provider: ExternalAuthProvider) {
95+
providers.append(provider)
96+
}
97+
98+
public func renderButtons(spacing: CGFloat = 16) -> AnyView {
99+
AnyView(
100+
VStack(spacing: spacing) {
101+
ForEach(providers, id: \.id) { provider in
102+
provider.authButton()
103+
}
104+
}
105+
)
106+
}
107+
99108
private var safeGoogleProvider: any GoogleProviderAuthUIProtocol {
100109
get throws {
101110
guard let provider = googleProvider else {

‎FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Strings/Localizable.xcstrings‎

Lines changed: 86 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"sourceLanguage" : "en",
33
"strings" : {
4+
"%@" : {
5+
6+
},
47
"AccountDisabledError" : {
58
"comment" : "Error message displayed when the account is disabled. Use short/abbreviated translation for 'email' which is less than 15 chars.",
69
"extractionState" : "migrated",
@@ -250,6 +253,18 @@
250253
}
251254
}
252255
},
256+
"ConfirmPasswordInputLabel" : {
257+
"comment" : "Input label for confirming password when signing up",
258+
"extractionState" : "manual",
259+
"localizations" : {
260+
"en" : {
261+
"stringUnit" : {
262+
"state" : "translated",
263+
"value" : "Confirm Password"
264+
}
265+
}
266+
}
267+
},
253268
"Delete" : {
254269
"comment" : "Text of Delete action button.",
255270
"extractionState" : "manual",
@@ -261,9 +276,6 @@
261276
}
262277
}
263278
}
264-
},
265-
"Delete account" : {
266-
267279
},
268280
"DeleteAccountBody" : {
269281
"comment" : "Alert message body shown to confirm account deletion action.",
@@ -317,7 +329,14 @@
317329

318330
},
319331
"Don't have an account yet?" : {
320-
332+
"localizations" : {
333+
"en" : {
334+
"stringUnit" : {
335+
"state" : "translated",
336+
"value" : "Don't have an account yet?"
337+
}
338+
}
339+
}
321340
},
322341
"EditEmailTitle" : {
323342
"comment" : "Controller title shown when editing account email. Use short/abbreviated translation for 'email' which is less than 15 chars.",
@@ -367,9 +386,6 @@
367386
}
368387
}
369388
},
370-
"Email" : {
371-
"comment" : "Label next to a email text field. Use short/abbreviated translation for 'email' which is less than 15 chars."
372-
},
373389
"EmailAlreadyInUseError" : {
374390
"comment" : "Error message displayed when the email address is already in use. Use short/abbreviated translation for 'email' which is less than 15 chars.",
375391
"extractionState" : "migrated",
@@ -382,6 +398,30 @@
382398
}
383399
}
384400
},
401+
"EmailLinkSignInLabel" : {
402+
"comment" : "Button label to push user to email link sign-in",
403+
"extractionState" : "manual",
404+
"localizations" : {
405+
"en" : {
406+
"stringUnit" : {
407+
"state" : "translated",
408+
"value" : "Prefer Email link sign-in?"
409+
}
410+
}
411+
}
412+
},
413+
"EmailLinkSignInTitle" : {
414+
"comment" : "Sign in with email link View title",
415+
"extractionState" : "manual",
416+
"localizations" : {
417+
"en" : {
418+
"stringUnit" : {
419+
"state" : "translated",
420+
"value" : "Sign in with email link"
421+
}
422+
}
423+
}
424+
},
385425
"EmailsDontMatch" : {
386426
"comment" : "Error message displayed when after re-authorization current user's email and re-authorized user's email doesn't match. Use short/abbreviated translation for 'email' which is less than 15 chars.",
387427
"extractionState" : "manual",
@@ -405,9 +445,6 @@
405445
}
406446
}
407447
}
408-
},
409-
"Enter Password" : {
410-
411448
},
412449
"EnterYourEmail" : {
413450
"comment" : "Title for email entry screen, email text field placeholder. Use short/abbreviated translation for 'email' which is less than 15 chars.",
@@ -492,9 +529,6 @@
492529
}
493530
}
494531
}
495-
},
496-
"Forgotten Password?" : {
497-
498532
},
499533
"Instructions" : {
500534

@@ -525,12 +559,16 @@
525559
},
526560
"Log in" : {
527561

528-
},
529-
"Log in with password" : {
530-
531562
},
532563
"Login" : {
533-
564+
"localizations" : {
565+
"en" : {
566+
"stringUnit" : {
567+
"state" : "translated",
568+
"value" : "Login"
569+
}
570+
}
571+
}
534572
},
535573
"Name" : {
536574
"comment" : "Label next to a name text field.",
@@ -569,9 +607,6 @@
569607
}
570608
},
571609
"Password" : {
572-
"comment" : "Label next to a password text field."
573-
},
574-
"Password Recovery" : {
575610

576611
},
577612
"PasswordRecoveryEmailSentMessage" : {
@@ -693,18 +728,9 @@
693728
}
694729
}
695730
}
696-
},
697-
"Please check your email for email sign-in link." : {
698-
699-
},
700-
"Please check your email for password recovery instructions." : {
701-
702731
},
703732
"Please check your email for verification link." : {
704733

705-
},
706-
"Prefer Email link sign-in?" : {
707-
708734
},
709735
"PrivacyPolicy" : {
710736
"comment" : "Text linked to a web page with the Privacy Policy content.",
@@ -826,20 +852,20 @@
826852
}
827853
}
828854
},
829-
"Send email sign-in link" : {
830-
831-
},
832-
"Sign in with email link" : {
833-
834-
},
835-
"Sign out" : {
836-
855+
"SendEmailSignInLinkButtonLabel" : {
856+
"comment" : "Button label for sending email sign-in link",
857+
"extractionState" : "manual",
858+
"localizations" : {
859+
"en" : {
860+
"stringUnit" : {
861+
"state" : "translated",
862+
"value" : "Send email sign-in link"
863+
}
864+
}
865+
}
837866
},
838867
"Sign up" : {
839868

840-
},
841-
"Signed in" : {
842-
843869
},
844870
"SignedIn" : {
845871
"comment" : "Title of successfully signed in label.",
@@ -936,9 +962,6 @@
936962
}
937963
}
938964
}
939-
},
940-
"Submit" : {
941-
942965
},
943966
"TermsOfService" : {
944967
"comment" : "Text linked to a web page with the Terms of Service content.",
@@ -1048,6 +1071,17 @@
10481071
}
10491072
}
10501073
},
1074+
"Update password" : {
1075+
"comment" : "Update password button label",
1076+
"localizations" : {
1077+
"en" : {
1078+
"stringUnit" : {
1079+
"state" : "translated",
1080+
"value" : "Update password"
1081+
}
1082+
}
1083+
}
1084+
},
10511085
"UpdateEmailAlertMessage" : {
10521086
"comment" : "Alert action message shown before updating email action. Use short/abbreviated translation for 'email' which is less than 15 chars.",
10531087
"extractionState" : "manual",
@@ -1071,9 +1105,6 @@
10711105
}
10721106
}
10731107
}
1074-
},
1075-
"User: %@" : {
1076-
10771108
},
10781109
"UserNotFoundError" : {
10791110
"comment" : "Error message displayed when there's no account matching the email address. Use short/abbreviated translation for 'email' which is less than 15 chars.",
@@ -1088,7 +1119,15 @@
10881119
}
10891120
},
10901121
"Verify email address?" : {
1091-
1122+
"comment" : "Label for sending email verification to user.",
1123+
"localizations" : {
1124+
"en" : {
1125+
"stringUnit" : {
1126+
"state" : "translated",
1127+
"value" : "Verify email address?"
1128+
}
1129+
}
1130+
}
10921131
},
10931132
"VerifyItsYou" : {
10941133
"comment" : "Alert message title show for re-authorization.",

0 commit comments

Comments
 (0)