Skip to content

fix: email auth link sign-in and flashing content when app loads #1294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 5, 2025
Merged

fix: email auth link sign-in and flashing content when app loads #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d9d8dc
fix: just use onChange to stop flashes of different screens
russellwheatley Nov 5, 2025
f06928b
fix: email link fix to decoding link
russellwheatley Nov 5, 2025
fe28cfe
chore: example app setup
russellwheatley Nov 5, 2025
f544498
chore: update associated domains to example app
russellwheatley Nov 5, 2025
356da89
chore: example app setup
russellwheatley Nov 5, 2025
482a0fc
Merge branch 'development' into clean-up-bugs
russellwheatley Nov 5, 2025
a48098a
chore: update wording
russellwheatley Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ public protocol AuthProviderUI {

public protocol PhoneAuthProviderSwift: AuthProviderSwift {
@MainActor func verifyPhoneNumber(phoneNumber: String) async throws -> String
@MainActor func createAuthCredential(verificationId: String, verificationCode: String) async throws -> AuthCredential
@MainActor func createAuthCredential(verificationId: String,
verificationCode: String) async throws -> AuthCredential
}

public enum AuthenticationState {
Expand Down Expand Up @@ -109,7 +110,10 @@ public final class AuthService {
public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth()) {
self.auth = auth
self.configuration = configuration
string = StringUtils(bundle: configuration.customStringsBundle ?? Bundle.module, languageCode: configuration.languageCode)
string = StringUtils(
bundle: configuration.customStringsBundle ?? Bundle.module,
languageCode: configuration.languageCode
)
listenerManager = AuthListenerManager(auth: auth, authEnvironment: self)
FirebaseApp.registerLibrary("firebase-ui-ios", withVersion: FirebaseAuthSwiftUIVersion.version)
}
Expand Down Expand Up @@ -427,7 +431,19 @@ public extension AuthService {
throw AuthServiceError
.invalidEmailLink("email address is missing from app storage. Is this the same device?")
}
let link = url.absoluteString
let urlString = url.absoluteString

guard let originalLink = CommonUtils.getQueryParamValue(from: urlString, paramName: "link")
else {
throw AuthServiceError
.invalidEmailLink("'link' parameter is missing from the email link URL")
}

guard let link = originalLink.removingPercentEncoding else {
throw AuthServiceError
.invalidEmailLink("Failed to decode Link URL")
}

guard let continueUrl = CommonUtils.getQueryParamValue(from: link, paramName: "continueUrl")
else {
throw AuthServiceError
Expand Down
2 changes: 1 addition & 1 deletion samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"FirebaseSwiftUIExample/Preview Content\"";
DEVELOPMENT_TEAM = 3G33A99C47;
DEVELOPMENT_TEAM = YYX2P3XVJ7;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = FirebaseSwiftUIExample/Info.plist;
Expand Down
8 changes: 2 additions & 6 deletions samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/App/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@ struct ContentView: View {
Auth.auth().signInAnonymously()
let actionCodeSettings = ActionCodeSettings()
actionCodeSettings.handleCodeInApp = true
actionCodeSettings
.url = URL(string: "https://flutterfire-e2e-tests.firebaseapp.com")
actionCodeSettings.linkDomain = "flutterfire-e2e-tests.firebaseapp.com"
actionCodeSettings.url = URL(string: "https://flutterfire-e2e-tests.firebaseapp.com")
actionCodeSettings.setIOSBundleID(Bundle.main.bundleIdentifier!)
actionCodeSettings.linkDomain = "flutterfire-e2e-tests.firebaseapp.com"
let configuration = AuthConfiguration(
shouldAutoUpgradeAnonymousUsers: true,
tosUrl: URL(string: "https://example.com/tos"),
Expand Down Expand Up @@ -110,9 +109,6 @@ struct ContentView: View {
}
.navigationTitle("Firebase UI Demo")
}
.onAppear {
authService.isPresented = authService.authenticationState == .unauthenticated
}
.onChange(of: authService.authenticationState) { _, newValue in
debugPrint("authService.authenticationState - \(newValue)")
if newValue != .authenticating {
Expand Down
1 change: 1 addition & 0 deletions ...swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/FirebaseSwiftUIExample.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:flutterfire-e2e-tests.firebaseapp.com</string>
<string>applinks:flutterfiretests.page.link</string>
</array>
</dict>
</plist>
Loading