Skip to content

Commit 7f02c75

Browse files
fix(pr): make emulator project fallback lookups resilient
1 parent ae771b5 commit 7f02c75

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/MFAEnrolmentUITests.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,10 +498,14 @@ private func getLastSmsCode(specificPhone: String? = nil) async throws -> String
498498
continue
499499
}
500500

501-
let (data, _) = try await URLSession.shared.data(from: url)
501+
guard let (data, _) = try? await URLSession.shared.data(from: url) else {
502+
continue
503+
}
502504

503505
let decoder = JSONDecoder()
504-
let codesResponse = try decoder.decode(VerificationCodesResponse.self, from: data)
506+
guard let codesResponse = try? decoder.decode(VerificationCodesResponse.self, from: data) else {
507+
continue
508+
}
505509

506510
guard let codes = codesResponse.verificationCodes, !codes.isEmpty else {
507511
continue

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/TestUtils.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,14 @@ func authEmulatorCandidateProjectIDs(preferredProjectID: String? = nil,
216216

217217
for candidateProjectID in candidateProjectIDs {
218218
let oobURL = URL(string: "\(base)/emulator/v1/projects/\(candidateProjectID)/oobCodes")!
219-
let (oobData, oobResp) = try await URLSession.shared.data(from: oobURL)
220-
guard (oobResp as? HTTPURLResponse)?.statusCode == 200 else {
221-
throw NSError(domain: "EmulatorError", code: 2,
222-
userInfo: [NSLocalizedDescriptionKey: "Failed to fetch OOB codes"])
219+
guard let (oobData, oobResp) = try? await URLSession.shared.data(from: oobURL),
220+
(oobResp as? HTTPURLResponse)?.statusCode == 200 else {
221+
continue
223222
}
224223

225-
let envelope = try JSONDecoder().decode(OobEnvelope.self, from: oobData)
224+
guard let envelope = try? JSONDecoder().decode(OobEnvelope.self, from: oobData) else {
225+
continue
226+
}
226227

227228
let iso = ISO8601DateFormatter()
228229
codeItem = envelope.oobCodes

0 commit comments

Comments
 (0)