From 2b31a9f6ad35ecc381e492f250e42b5bdabbcc26 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Thu, 5 Dec 2024 15:49:34 +0530 Subject: [PATCH 01/13] adding mfa ui test (enforce mode) --- .../AuthenticationExampleUITests.swift | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift index ac8d7953ae3..913524251d9 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift @@ -182,6 +182,44 @@ class AuthenticationExampleUITests: XCTestCase { ) } + func testPhoneMultiFactorEnrollUnenrollTest() { + // login with email password + app.staticTexts["Email & Password Login"].tap() + let testEmail = "sample.auth.ios@gmail.com" + app.textFields["Email"].tap() + app.typeText(testEmail) + app.buttons["return"].tap() // Dismiss keyboard + let testPassword = "sampleauthios" + app.textFields["Password"].tap() + app.typeText(testPassword) + app.buttons["return"].tap() // Dismiss keyboard + app.buttons["Login"].tap() + // enroll with phone + app.tabBars.buttons["Authentication"].tap() + app.tables.cells.staticTexts["Phone Enroll"].tap() + let testPhone = "+11234567890" + app.typeText(testPhone) + app.buttons["Save"].tap() + let testVerificationCode = "123456" + app.typeText(testVerificationCode) + app.buttons["Save"].tap() + let testPhoneSecondFactorDisplayName = "phone1" + app.typeText(testPhoneSecondFactorDisplayName) + app.buttons["Save"].tap() + // unenroll + app.swipeUp(velocity: .fast) + app.tables.cells.staticTexts["Multifactor unenroll"].tap() + XCTAssertTrue(app.buttons["phone1"].exists) // enrollment successful + app.buttons["phone1"].tap() + app.swipeUp(velocity: .fast) + app.tables.cells.staticTexts["Multifactor unenroll"].tap() + XCTAssertFalse(app.buttons["phone1"].exists) // unenrollment successful + app.buttons["Cancel"].tap() + // Sign out explicitly after unenroll + app.tabBars.buttons["Current User"].tap() + app.tabBars.firstMatch.buttons.element(boundBy: 1).tap() + } + func DRAFT_testGoogleSignInAndLinkAccount() { let interruptionMonitor = addUIInterruptionMonitor(withDescription: "Sign in with Google") { alert -> Bool in From 555854c0d2ebe0c2445fb63595bf92054e4963d7 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Fri, 6 Dec 2024 19:29:13 +0530 Subject: [PATCH 02/13] sign in with second factor mfa test (enforce mode) --- .../AuthenticationExampleUITests.swift | 45 ++++++++++++++++--- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift index 913524251d9..625a6af5d69 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift @@ -182,7 +182,7 @@ class AuthenticationExampleUITests: XCTestCase { ) } - func testPhoneMultiFactorEnrollUnenrollTest() { + func testPhoneMultiFactorEnrollUnenroll() { // login with email password app.staticTexts["Email & Password Login"].tap() let testEmail = "sample.auth.ios@gmail.com" @@ -194,11 +194,11 @@ class AuthenticationExampleUITests: XCTestCase { app.typeText(testPassword) app.buttons["return"].tap() // Dismiss keyboard app.buttons["Login"].tap() - // enroll with phone + // enroll multifactor with phone app.tabBars.buttons["Authentication"].tap() app.tables.cells.staticTexts["Phone Enroll"].tap() - let testPhone = "+11234567890" - app.typeText(testPhone) + let testSecondFactorPhone = "+11234567890" + app.typeText(testSecondFactorPhone) app.buttons["Save"].tap() let testVerificationCode = "123456" app.typeText(testVerificationCode) @@ -206,7 +206,7 @@ class AuthenticationExampleUITests: XCTestCase { let testPhoneSecondFactorDisplayName = "phone1" app.typeText(testPhoneSecondFactorDisplayName) app.buttons["Save"].tap() - // unenroll + // unenroll multifactor app.swipeUp(velocity: .fast) app.tables.cells.staticTexts["Multifactor unenroll"].tap() XCTAssertTrue(app.buttons["phone1"].exists) // enrollment successful @@ -215,11 +215,44 @@ class AuthenticationExampleUITests: XCTestCase { app.tables.cells.staticTexts["Multifactor unenroll"].tap() XCTAssertFalse(app.buttons["phone1"].exists) // unenrollment successful app.buttons["Cancel"].tap() - // Sign out explicitly after unenroll + // Sign out after unenroll app.tabBars.buttons["Current User"].tap() app.tabBars.firstMatch.buttons.element(boundBy: 1).tap() } + func testPhoneSecondFactorSignIn() { + // login with email password + app.staticTexts["Email & Password Login"].tap() + let testEmail = "sample.ios.auth@gmail.com" + app.textFields["Email"].tap() + app.typeText(testEmail) + app.buttons["return"].tap() // Dismiss keyboard + let testPassword = "sampleios123" + app.textFields["Password"].tap() + app.typeText(testPassword) + app.buttons["return"].tap() // Dismiss keyboard + app.buttons["Login"].tap() + // login with second factor + XCTAssertTrue(app.staticTexts["Choose a second factor to continue."].waitForExistence(timeout: 5)) + let secondFactor = app.staticTexts["phone2"] // Select 'phone2' from the modal list + XCTAssertTrue(secondFactor.exists, "'phone2' option should be visible in the modal.") + secondFactor.tap() + app.buttons["Send Verification Code"].tap() + let verificationCodeInput = app.textFields["Enter verification code."] + XCTAssertTrue(verificationCodeInput.waitForExistence(timeout: 2), "OTP input field should appear.") // Wait for the OTP input field to appear + verificationCodeInput.tap() + let testVerificationCode = "123456" + verificationCodeInput.typeText(testVerificationCode) + let signInButton = app.buttons["Sign in"] + XCTAssertTrue(signInButton.waitForExistence(timeout: 2), "'Sign in' button should be visible.") + signInButton.tap() + // sign out + let signOutButton = app.buttons["Sign Out"] + if signOutButton.exists { + signOutButton.tap() + } + } + func DRAFT_testGoogleSignInAndLinkAccount() { let interruptionMonitor = addUIInterruptionMonitor(withDescription: "Sign in with Google") { alert -> Bool in From 3fa8761a350ffacab6b21a7c020648b620ebd5b2 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Sat, 7 Dec 2024 00:54:10 +0530 Subject: [PATCH 03/13] lint fixes --- .../AuthenticationExampleUITests.swift | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift index 625a6af5d69..2c9cf54550a 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift @@ -188,11 +188,11 @@ class AuthenticationExampleUITests: XCTestCase { let testEmail = "sample.auth.ios@gmail.com" app.textFields["Email"].tap() app.typeText(testEmail) - app.buttons["return"].tap() // Dismiss keyboard + app.buttons["return"].tap() // dismiss keyboard let testPassword = "sampleauthios" app.textFields["Password"].tap() app.typeText(testPassword) - app.buttons["return"].tap() // Dismiss keyboard + app.buttons["return"].tap() // dismiss keyboard app.buttons["Login"].tap() // enroll multifactor with phone app.tabBars.buttons["Authentication"].tap() @@ -215,7 +215,7 @@ class AuthenticationExampleUITests: XCTestCase { app.tables.cells.staticTexts["Multifactor unenroll"].tap() XCTAssertFalse(app.buttons["phone1"].exists) // unenrollment successful app.buttons["Cancel"].tap() - // Sign out after unenroll + // sign out after unenroll app.tabBars.buttons["Current User"].tap() app.tabBars.firstMatch.buttons.element(boundBy: 1).tap() } @@ -226,20 +226,24 @@ class AuthenticationExampleUITests: XCTestCase { let testEmail = "sample.ios.auth@gmail.com" app.textFields["Email"].tap() app.typeText(testEmail) - app.buttons["return"].tap() // Dismiss keyboard + app.buttons["return"].tap() // dismiss keyboard let testPassword = "sampleios123" app.textFields["Password"].tap() app.typeText(testPassword) - app.buttons["return"].tap() // Dismiss keyboard + app.buttons["return"].tap() // dismiss keyboard app.buttons["Login"].tap() // login with second factor - XCTAssertTrue(app.staticTexts["Choose a second factor to continue."].waitForExistence(timeout: 5)) - let secondFactor = app.staticTexts["phone2"] // Select 'phone2' from the modal list + XCTAssertTrue(app.staticTexts["Choose a second factor to continue."] + .waitForExistence(timeout: 5)) + let secondFactor = app.staticTexts["phone2"] // select 'phone2' as second factor XCTAssertTrue(secondFactor.exists, "'phone2' option should be visible in the modal.") secondFactor.tap() app.buttons["Send Verification Code"].tap() let verificationCodeInput = app.textFields["Enter verification code."] - XCTAssertTrue(verificationCodeInput.waitForExistence(timeout: 2), "OTP input field should appear.") // Wait for the OTP input field to appear + XCTAssertTrue( + verificationCodeInput.waitForExistence(timeout: 2), + "Verification code input field should appear." + ) // wait for the verification code input field to appear verificationCodeInput.tap() let testVerificationCode = "123456" verificationCodeInput.typeText(testVerificationCode) @@ -249,7 +253,7 @@ class AuthenticationExampleUITests: XCTestCase { // sign out let signOutButton = app.buttons["Sign Out"] if signOutButton.exists { - signOutButton.tap() + signOutButton.tap() } } From dddb6a6f7bc0a9d0fdad8056342239a47edb4483 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Sat, 7 Dec 2024 01:25:28 +0530 Subject: [PATCH 04/13] fixes --- .../AuthenticationExampleUITests.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift index 2c9cf54550a..319ac9456e1 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift @@ -188,11 +188,11 @@ class AuthenticationExampleUITests: XCTestCase { let testEmail = "sample.auth.ios@gmail.com" app.textFields["Email"].tap() app.typeText(testEmail) - app.buttons["return"].tap() // dismiss keyboard +// app.buttons["return"].tap() // dismiss keyboard let testPassword = "sampleauthios" app.textFields["Password"].tap() app.typeText(testPassword) - app.buttons["return"].tap() // dismiss keyboard +// app.buttons["return"].tap() // dismiss keyboard app.buttons["Login"].tap() // enroll multifactor with phone app.tabBars.buttons["Authentication"].tap() @@ -240,10 +240,6 @@ class AuthenticationExampleUITests: XCTestCase { secondFactor.tap() app.buttons["Send Verification Code"].tap() let verificationCodeInput = app.textFields["Enter verification code."] - XCTAssertTrue( - verificationCodeInput.waitForExistence(timeout: 2), - "Verification code input field should appear." - ) // wait for the verification code input field to appear verificationCodeInput.tap() let testVerificationCode = "123456" verificationCodeInput.typeText(testVerificationCode) From cf206cb5c666215d2c50c0d273404ef724d8f30b Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Sat, 7 Dec 2024 01:49:43 +0530 Subject: [PATCH 05/13] adding project file to pass failed checks --- .../project.pbxproj | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index feb55512ba4..6be28d8cfe9 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -7,7 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; + B8431C602D03857A0093ED41 /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C5E2D03857A0093ED41 /* GoogleService-Info_multi.plist */; }; + B8431C612D03857A0093ED41 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C5F2D03857A0093ED41 /* GoogleService-Info.plist */; }; + B8431C642D0385980093ED41 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = B8431C632D0385980093ED41 /* RecaptchaEnterprise */; }; DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B636E2BEC2DC300607B82 /* FirebaseAuth */; }; DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63712BEC2FB900607B82 /* GoogleSignIn */; }; DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */; }; @@ -31,9 +33,8 @@ DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; }; DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; }; DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; - DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; EA062D5D24A0FEB6006714D3 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = EA062D5C24A0FEB6006714D3 /* README.md */; }; @@ -88,7 +89,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 8848764F29D3149200780FA6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; }; + B8431C5E2D03857A0093ED41 /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info_multi.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info_multi.plist"; sourceTree = ""; }; + B8431C5F2D03857A0093ED41 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info.plist"; sourceTree = ""; }; DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SwiftApplication.plist; sourceTree = ""; }; DE8FD4682A7D660A00B6831A /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = ""; }; DE8FD4692A7D660A00B6831A /* AccountInfoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountInfoTests.swift; sourceTree = ""; }; @@ -110,7 +112,6 @@ DE8FD4972A7DB00600B6831A /* AuthCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthCredentials.h; sourceTree = ""; }; DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; - DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; }; DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUITests.swift; sourceTree = ""; }; EA02F68424A000E00079D000 /* UserActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActions.swift; sourceTree = ""; }; EA02F68C24A063E90079D000 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = ""; }; @@ -159,11 +160,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */, + B8431C642D0385980093ED41 /* RecaptchaEnterprise in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -308,7 +310,8 @@ EAE4CBC324855E3A00245E92 /* AuthenticationExample */ = { isa = PBXGroup; children = ( - DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */, + B8431C5E2D03857A0093ED41 /* GoogleService-Info_multi.plist */, + B8431C5F2D03857A0093ED41 /* GoogleService-Info.plist */, DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */, EA062D5C24A0FEB6006714D3 /* README.md */, EA20B506249CA63300B5E581 /* AuthenticationExample.entitlements */, @@ -319,7 +322,6 @@ EA20B47724973BB100B5E581 /* CustomViews */, EAB3A17A2494626F00385291 /* Utility */, EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, - 8848764F29D3149200780FA6 /* GoogleService-Info.plist */, EA217894248979E200736757 /* LaunchScreen.storyboard */, DEC2E5DE2A9583CA0090260A /* AppManager.swift */, ); @@ -393,7 +395,7 @@ DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, DE8B63762BEC302200607B82 /* FacebookLogin */, - DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, + B8431C632D0385980093ED41 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; productReference = EAE4CBC124855E3A00245E92 /* AuthenticationExample.app */; @@ -481,6 +483,7 @@ DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, DE8B63752BEC302200607B82 /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */, + B8431C622D0385980093ED41 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */, ); productRefGroup = EAE4CBC224855E3A00245E92 /* Products */; projectDirPath = ""; @@ -507,8 +510,8 @@ buildActionMask = 2147483647; files = ( EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */, - 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */, - DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */, + B8431C602D03857A0093ED41 /* GoogleService-Info_multi.plist in Resources */, + B8431C612D03857A0093ED41 /* GoogleService-Info.plist in Resources */, EAE4CBCE24855E3D00245E92 /* Assets.xcassets in Resources */, EA062D5D24A0FEB6006714D3 /* README.md in Resources */, ); @@ -978,6 +981,14 @@ /* End XCLocalSwiftPackageReference section */ /* Begin XCRemoteSwiftPackageReference section */ + B8431C622D0385980093ED41 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 18.6.0; + }; + }; DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git"; @@ -1005,6 +1016,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + B8431C632D0385980093ED41 /* RecaptchaEnterprise */ = { + isa = XCSwiftPackageProductDependency; + package = B8431C622D0385980093ED41 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */; + productName = RecaptchaEnterprise; + }; DE8B636E2BEC2DC300607B82 /* FirebaseAuth */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAuth; From f265c80e4b6fd0f8826152ffe1a6f8a0f3cb6eb6 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Fri, 6 Dec 2024 21:11:34 +0000 Subject: [PATCH 06/13] plist file fixes --- .../project.pbxproj | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index 6be28d8cfe9..5a5a80da7f7 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -7,8 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - B8431C602D03857A0093ED41 /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C5E2D03857A0093ED41 /* GoogleService-Info_multi.plist */; }; - B8431C612D03857A0093ED41 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C5F2D03857A0093ED41 /* GoogleService-Info.plist */; }; + 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; B8431C642D0385980093ED41 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = B8431C632D0385980093ED41 /* RecaptchaEnterprise */; }; DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B636E2BEC2DC300607B82 /* FirebaseAuth */; }; DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63712BEC2FB900607B82 /* GoogleSignIn */; }; @@ -32,9 +31,10 @@ DE8FD4902A7D997A00B6831A /* GoogleAuthTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD48E2A7D997A00B6831A /* GoogleAuthTests.m */; }; DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; }; DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; }; - DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; + DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; + DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; EA062D5D24A0FEB6006714D3 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = EA062D5C24A0FEB6006714D3 /* README.md */; }; @@ -89,8 +89,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - B8431C5E2D03857A0093ED41 /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info_multi.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info_multi.plist"; sourceTree = ""; }; - B8431C5F2D03857A0093ED41 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info.plist"; sourceTree = ""; }; + 8848764F29D3149200780FA6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; }; DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SwiftApplication.plist; sourceTree = ""; }; DE8FD4682A7D660A00B6831A /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = ""; }; DE8FD4692A7D660A00B6831A /* AccountInfoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountInfoTests.swift; sourceTree = ""; }; @@ -111,7 +110,8 @@ DE8FD4962A7DAFEE00B6831A /* FIRAuthApiTestsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRAuthApiTestsBase.h; sourceTree = ""; }; DE8FD4972A7DB00600B6831A /* AuthCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthCredentials.h; sourceTree = ""; }; DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; - DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; + DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; + DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; }; DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUITests.swift; sourceTree = ""; }; EA02F68424A000E00079D000 /* UserActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActions.swift; sourceTree = ""; }; EA02F68C24A063E90079D000 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = ""; }; @@ -160,7 +160,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, @@ -310,8 +310,7 @@ EAE4CBC324855E3A00245E92 /* AuthenticationExample */ = { isa = PBXGroup; children = ( - B8431C5E2D03857A0093ED41 /* GoogleService-Info_multi.plist */, - B8431C5F2D03857A0093ED41 /* GoogleService-Info.plist */, + DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */, DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */, EA062D5C24A0FEB6006714D3 /* README.md */, EA20B506249CA63300B5E581 /* AuthenticationExample.entitlements */, @@ -321,7 +320,8 @@ EA20B47524973B5100B5E581 /* ViewControllers */, EA20B47724973BB100B5E581 /* CustomViews */, EAB3A17A2494626F00385291 /* Utility */, - EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, + EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, + 8848764F29D3149200780FA6 /* GoogleService-Info.plist */, EA217894248979E200736757 /* LaunchScreen.storyboard */, DEC2E5DE2A9583CA0090260A /* AppManager.swift */, ); @@ -394,7 +394,8 @@ DE8B636E2BEC2DC300607B82 /* FirebaseAuth */, DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, - DE8B63762BEC302200607B82 /* FacebookLogin */, + DE8B63762BEC302200607B82 /* FacebookLogin */, + DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, B8431C632D0385980093ED41 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; @@ -510,8 +511,8 @@ buildActionMask = 2147483647; files = ( EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */, - B8431C602D03857A0093ED41 /* GoogleService-Info_multi.plist in Resources */, - B8431C612D03857A0093ED41 /* GoogleService-Info.plist in Resources */, + 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */, + DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */, EAE4CBCE24855E3D00245E92 /* Assets.xcassets in Resources */, EA062D5D24A0FEB6006714D3 /* README.md in Resources */, ); From dcd3e5dd8a7b06d45b7565eb36ba0452dc835db1 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Mon, 9 Dec 2024 13:51:46 +0530 Subject: [PATCH 07/13] updating project file --- .../project.pbxproj | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index 5a5a80da7f7..4c3047340b9 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -7,8 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; B8431C642D0385980093ED41 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = B8431C632D0385980093ED41 /* RecaptchaEnterprise */; }; + B8431C6A2D06DFD50093ED41 /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C682D06DFD50093ED41 /* GoogleService-Info_multi.plist */; }; + B8431C6B2D06DFD50093ED41 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C692D06DFD50093ED41 /* GoogleService-Info.plist */; }; DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B636E2BEC2DC300607B82 /* FirebaseAuth */; }; DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63712BEC2FB900607B82 /* GoogleSignIn */; }; DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */; }; @@ -31,10 +32,9 @@ DE8FD4902A7D997A00B6831A /* GoogleAuthTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD48E2A7D997A00B6831A /* GoogleAuthTests.m */; }; DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; }; DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; }; - DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; - DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; + DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; EA062D5D24A0FEB6006714D3 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = EA062D5C24A0FEB6006714D3 /* README.md */; }; @@ -89,7 +89,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 8848764F29D3149200780FA6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; }; + B8431C682D06DFD50093ED41 /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info_multi.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info_multi.plist"; sourceTree = ""; }; + B8431C692D06DFD50093ED41 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info.plist"; sourceTree = ""; }; DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SwiftApplication.plist; sourceTree = ""; }; DE8FD4682A7D660A00B6831A /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = ""; }; DE8FD4692A7D660A00B6831A /* AccountInfoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountInfoTests.swift; sourceTree = ""; }; @@ -110,8 +111,7 @@ DE8FD4962A7DAFEE00B6831A /* FIRAuthApiTestsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRAuthApiTestsBase.h; sourceTree = ""; }; DE8FD4972A7DB00600B6831A /* AuthCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthCredentials.h; sourceTree = ""; }; DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; - DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; - DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; }; + DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUITests.swift; sourceTree = ""; }; EA02F68424A000E00079D000 /* UserActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActions.swift; sourceTree = ""; }; EA02F68C24A063E90079D000 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = ""; }; @@ -160,7 +160,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, @@ -310,7 +310,8 @@ EAE4CBC324855E3A00245E92 /* AuthenticationExample */ = { isa = PBXGroup; children = ( - DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */, + B8431C682D06DFD50093ED41 /* GoogleService-Info_multi.plist */, + B8431C692D06DFD50093ED41 /* GoogleService-Info.plist */, DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */, EA062D5C24A0FEB6006714D3 /* README.md */, EA20B506249CA63300B5E581 /* AuthenticationExample.entitlements */, @@ -320,8 +321,7 @@ EA20B47524973B5100B5E581 /* ViewControllers */, EA20B47724973BB100B5E581 /* CustomViews */, EAB3A17A2494626F00385291 /* Utility */, - EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, - 8848764F29D3149200780FA6 /* GoogleService-Info.plist */, + EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, EA217894248979E200736757 /* LaunchScreen.storyboard */, DEC2E5DE2A9583CA0090260A /* AppManager.swift */, ); @@ -394,8 +394,7 @@ DE8B636E2BEC2DC300607B82 /* FirebaseAuth */, DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, - DE8B63762BEC302200607B82 /* FacebookLogin */, - DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, + DE8B63762BEC302200607B82 /* FacebookLogin */, B8431C632D0385980093ED41 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; @@ -511,8 +510,8 @@ buildActionMask = 2147483647; files = ( EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */, - 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */, - DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */, + B8431C6A2D06DFD50093ED41 /* GoogleService-Info_multi.plist in Resources */, + B8431C6B2D06DFD50093ED41 /* GoogleService-Info.plist in Resources */, EAE4CBCE24855E3D00245E92 /* Assets.xcassets in Resources */, EA062D5D24A0FEB6006714D3 /* README.md in Resources */, ); From 2a7c98962133ad74102df11cafa11742b5c26bc7 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Mon, 9 Dec 2024 16:28:20 +0530 Subject: [PATCH 08/13] update project.pbxproj --- .../project.pbxproj | 38 ++++++------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index 4c3047340b9..feb55512ba4 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -7,9 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - B8431C642D0385980093ED41 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = B8431C632D0385980093ED41 /* RecaptchaEnterprise */; }; - B8431C6A2D06DFD50093ED41 /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C682D06DFD50093ED41 /* GoogleService-Info_multi.plist */; }; - B8431C6B2D06DFD50093ED41 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8431C692D06DFD50093ED41 /* GoogleService-Info.plist */; }; + 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B636E2BEC2DC300607B82 /* FirebaseAuth */; }; DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63712BEC2FB900607B82 /* GoogleSignIn */; }; DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */; }; @@ -33,8 +31,9 @@ DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; }; DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; }; DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; + DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; EA062D5D24A0FEB6006714D3 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = EA062D5C24A0FEB6006714D3 /* README.md */; }; @@ -89,8 +88,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - B8431C682D06DFD50093ED41 /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info_multi.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info_multi.plist"; sourceTree = ""; }; - B8431C692D06DFD50093ED41 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../../../firebase-ios-auth-sample/GoogleService-Info.plist"; sourceTree = ""; }; + 8848764F29D3149200780FA6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; }; DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SwiftApplication.plist; sourceTree = ""; }; DE8FD4682A7D660A00B6831A /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = ""; }; DE8FD4692A7D660A00B6831A /* AccountInfoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountInfoTests.swift; sourceTree = ""; }; @@ -112,6 +110,7 @@ DE8FD4972A7DB00600B6831A /* AuthCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthCredentials.h; sourceTree = ""; }; DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; + DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; }; DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUITests.swift; sourceTree = ""; }; EA02F68424A000E00079D000 /* UserActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActions.swift; sourceTree = ""; }; EA02F68C24A063E90079D000 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = ""; }; @@ -160,12 +159,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */, - B8431C642D0385980093ED41 /* RecaptchaEnterprise in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -310,8 +308,7 @@ EAE4CBC324855E3A00245E92 /* AuthenticationExample */ = { isa = PBXGroup; children = ( - B8431C682D06DFD50093ED41 /* GoogleService-Info_multi.plist */, - B8431C692D06DFD50093ED41 /* GoogleService-Info.plist */, + DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */, DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */, EA062D5C24A0FEB6006714D3 /* README.md */, EA20B506249CA63300B5E581 /* AuthenticationExample.entitlements */, @@ -322,6 +319,7 @@ EA20B47724973BB100B5E581 /* CustomViews */, EAB3A17A2494626F00385291 /* Utility */, EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, + 8848764F29D3149200780FA6 /* GoogleService-Info.plist */, EA217894248979E200736757 /* LaunchScreen.storyboard */, DEC2E5DE2A9583CA0090260A /* AppManager.swift */, ); @@ -395,7 +393,7 @@ DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, DE8B63762BEC302200607B82 /* FacebookLogin */, - B8431C632D0385980093ED41 /* RecaptchaEnterprise */, + DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; productReference = EAE4CBC124855E3A00245E92 /* AuthenticationExample.app */; @@ -483,7 +481,6 @@ DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, DE8B63752BEC302200607B82 /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */, - B8431C622D0385980093ED41 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */, ); productRefGroup = EAE4CBC224855E3A00245E92 /* Products */; projectDirPath = ""; @@ -510,8 +507,8 @@ buildActionMask = 2147483647; files = ( EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */, - B8431C6A2D06DFD50093ED41 /* GoogleService-Info_multi.plist in Resources */, - B8431C6B2D06DFD50093ED41 /* GoogleService-Info.plist in Resources */, + 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */, + DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */, EAE4CBCE24855E3D00245E92 /* Assets.xcassets in Resources */, EA062D5D24A0FEB6006714D3 /* README.md in Resources */, ); @@ -981,14 +978,6 @@ /* End XCLocalSwiftPackageReference section */ /* Begin XCRemoteSwiftPackageReference section */ - B8431C622D0385980093ED41 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 18.6.0; - }; - }; DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git"; @@ -1016,11 +1005,6 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - B8431C632D0385980093ED41 /* RecaptchaEnterprise */ = { - isa = XCSwiftPackageProductDependency; - package = B8431C622D0385980093ED41 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */; - productName = RecaptchaEnterprise; - }; DE8B636E2BEC2DC300607B82 /* FirebaseAuth */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAuth; From 040e973a939c873d49976274ff81a2a4e29d82f9 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Tue, 10 Dec 2024 05:42:16 +0530 Subject: [PATCH 09/13] updating tests to pass failed checks --- .../AuthenticationExampleUITests.swift | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift index 319ac9456e1..e34f1232be6 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift @@ -188,14 +188,15 @@ class AuthenticationExampleUITests: XCTestCase { let testEmail = "sample.auth.ios@gmail.com" app.textFields["Email"].tap() app.typeText(testEmail) -// app.buttons["return"].tap() // dismiss keyboard let testPassword = "sampleauthios" app.textFields["Password"].tap() app.typeText(testPassword) -// app.buttons["return"].tap() // dismiss keyboard app.buttons["Login"].tap() // enroll multifactor with phone - app.tabBars.buttons["Authentication"].tap() + let authenticationButton = app.tabBars.buttons["Authentication"] + let exists = authenticationButton.waitForExistence(timeout: 5) + XCTAssertTrue(exists, "Authentication button did not appear in time.") + authenticationButton.tap() app.tables.cells.staticTexts["Phone Enroll"].tap() let testSecondFactorPhone = "+11234567890" app.typeText(testSecondFactorPhone) @@ -226,11 +227,9 @@ class AuthenticationExampleUITests: XCTestCase { let testEmail = "sample.ios.auth@gmail.com" app.textFields["Email"].tap() app.typeText(testEmail) - app.buttons["return"].tap() // dismiss keyboard let testPassword = "sampleios123" app.textFields["Password"].tap() app.typeText(testPassword) - app.buttons["return"].tap() // dismiss keyboard app.buttons["Login"].tap() // login with second factor XCTAssertTrue(app.staticTexts["Choose a second factor to continue."] From 57eccd3b7065bddfbc22f72e35376537465ece24 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Wed, 11 Dec 2024 02:26:53 +0530 Subject: [PATCH 10/13] check --- .../AuthenticationExampleUITests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift index e34f1232be6..bc319e3b45f 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExampleUITests/AuthenticationExampleUITests.swift @@ -235,7 +235,7 @@ class AuthenticationExampleUITests: XCTestCase { XCTAssertTrue(app.staticTexts["Choose a second factor to continue."] .waitForExistence(timeout: 5)) let secondFactor = app.staticTexts["phone2"] // select 'phone2' as second factor - XCTAssertTrue(secondFactor.exists, "'phone2' option should be visible in the modal.") + XCTAssertTrue(secondFactor.exists, "'phone2' option should be visible.") secondFactor.tap() app.buttons["Send Verification Code"].tap() let verificationCodeInput = app.textFields["Enter verification code."] From 0ab033ca46dc138e4b79e88cabd60e8e3c9402e1 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Fri, 13 Dec 2024 16:37:00 +0530 Subject: [PATCH 11/13] adding project file --- .../project.pbxproj | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index feb55512ba4..ffadae43daf 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -7,7 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; + B8B417C92D0C4C4800CF9098 /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8B417C82D0C4C4800CF9098 /* GoogleService-Info_multi.plist */; }; + B8B417CA2D0C4C4800CF9098 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8B417C72D0C4C4800CF9098 /* GoogleService-Info.plist */; }; + B8B417CD2D0C4C7200CF9098 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = B8B417CC2D0C4C7200CF9098 /* RecaptchaEnterprise */; }; DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B636E2BEC2DC300607B82 /* FirebaseAuth */; }; DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63712BEC2FB900607B82 /* GoogleSignIn */; }; DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */; }; @@ -31,9 +33,8 @@ DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; }; DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; }; DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; - DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; EA062D5D24A0FEB6006714D3 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = EA062D5C24A0FEB6006714D3 /* README.md */; }; @@ -88,7 +89,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 8848764F29D3149200780FA6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; }; + B8B417C72D0C4C4800CF9098 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; + B8B417C82D0C4C4800CF9098 /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info_multi.plist"; sourceTree = ""; }; DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SwiftApplication.plist; sourceTree = ""; }; DE8FD4682A7D660A00B6831A /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = ""; }; DE8FD4692A7D660A00B6831A /* AccountInfoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountInfoTests.swift; sourceTree = ""; }; @@ -110,7 +112,6 @@ DE8FD4972A7DB00600B6831A /* AuthCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthCredentials.h; sourceTree = ""; }; DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; - DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; }; DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUITests.swift; sourceTree = ""; }; EA02F68424A000E00079D000 /* UserActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActions.swift; sourceTree = ""; }; EA02F68C24A063E90079D000 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = ""; }; @@ -159,11 +160,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, + DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */, + B8B417CD2D0C4C7200CF9098 /* RecaptchaEnterprise in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -308,7 +310,8 @@ EAE4CBC324855E3A00245E92 /* AuthenticationExample */ = { isa = PBXGroup; children = ( - DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */, + B8B417C72D0C4C4800CF9098 /* GoogleService-Info.plist */, + B8B417C82D0C4C4800CF9098 /* GoogleService-Info_multi.plist */, DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */, EA062D5C24A0FEB6006714D3 /* README.md */, EA20B506249CA63300B5E581 /* AuthenticationExample.entitlements */, @@ -319,7 +322,6 @@ EA20B47724973BB100B5E581 /* CustomViews */, EAB3A17A2494626F00385291 /* Utility */, EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, - 8848764F29D3149200780FA6 /* GoogleService-Info.plist */, EA217894248979E200736757 /* LaunchScreen.storyboard */, DEC2E5DE2A9583CA0090260A /* AppManager.swift */, ); @@ -393,7 +395,7 @@ DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, DE8B63762BEC302200607B82 /* FacebookLogin */, - DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, + B8B417CC2D0C4C7200CF9098 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; productReference = EAE4CBC124855E3A00245E92 /* AuthenticationExample.app */; @@ -481,6 +483,7 @@ DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, DE8B63752BEC302200607B82 /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */, + B8B417CB2D0C4C7200CF9098 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */, ); productRefGroup = EAE4CBC224855E3A00245E92 /* Products */; projectDirPath = ""; @@ -507,9 +510,9 @@ buildActionMask = 2147483647; files = ( EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */, - 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */, - DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */, EAE4CBCE24855E3D00245E92 /* Assets.xcassets in Resources */, + B8B417C92D0C4C4800CF9098 /* GoogleService-Info_multi.plist in Resources */, + B8B417CA2D0C4C4800CF9098 /* GoogleService-Info.plist in Resources */, EA062D5D24A0FEB6006714D3 /* README.md in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -978,6 +981,14 @@ /* End XCLocalSwiftPackageReference section */ /* Begin XCRemoteSwiftPackageReference section */ + B8B417CB2D0C4C7200CF9098 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 18.6.0; + }; + }; DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git"; @@ -1005,6 +1016,11 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + B8B417CC2D0C4C7200CF9098 /* RecaptchaEnterprise */ = { + isa = XCSwiftPackageProductDependency; + package = B8B417CB2D0C4C7200CF9098 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */; + productName = RecaptchaEnterprise; + }; DE8B636E2BEC2DC300607B82 /* FirebaseAuth */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAuth; From aa318e8f72d7504f590235a831d9cac45bf6fc00 Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Fri, 13 Dec 2024 16:56:16 +0530 Subject: [PATCH 12/13] updating project.pbxproj to add rce --- .../project.pbxproj | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index ffadae43daf..4c2f37f581a 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -7,8 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - B8B417C92D0C4C4800CF9098 /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8B417C82D0C4C4800CF9098 /* GoogleService-Info_multi.plist */; }; - B8B417CA2D0C4C4800CF9098 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = B8B417C72D0C4C4800CF9098 /* GoogleService-Info.plist */; }; + 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; B8B417CD2D0C4C7200CF9098 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = B8B417CC2D0C4C7200CF9098 /* RecaptchaEnterprise */; }; DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B636E2BEC2DC300607B82 /* FirebaseAuth */; }; DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63712BEC2FB900607B82 /* GoogleSignIn */; }; @@ -33,7 +32,7 @@ DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; }; DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; }; DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; - DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; +DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; @@ -89,8 +88,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - B8B417C72D0C4C4800CF9098 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - B8B417C82D0C4C4800CF9098 /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info_multi.plist"; sourceTree = ""; }; + 8848764F29D3149200780FA6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; }; DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = SwiftApplication.plist; sourceTree = ""; }; DE8FD4682A7D660A00B6831A /* Credentials.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Credentials.swift; sourceTree = ""; }; DE8FD4692A7D660A00B6831A /* AccountInfoTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountInfoTests.swift; sourceTree = ""; }; @@ -112,7 +110,7 @@ DE8FD4972A7DB00600B6831A /* AuthCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthCredentials.h; sourceTree = ""; }; DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; - DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUITests.swift; sourceTree = ""; }; + DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; }; EA02F68424A000E00079D000 /* UserActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActions.swift; sourceTree = ""; }; EA02F68C24A063E90079D000 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = ""; }; EA062D5C24A0FEB6006714D3 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; }; @@ -310,8 +308,7 @@ EAE4CBC324855E3A00245E92 /* AuthenticationExample */ = { isa = PBXGroup; children = ( - B8B417C72D0C4C4800CF9098 /* GoogleService-Info.plist */, - B8B417C82D0C4C4800CF9098 /* GoogleService-Info_multi.plist */, + DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */, DE4D8E1F2A8B0311001952B6 /* SwiftApplication.plist */, EA062D5C24A0FEB6006714D3 /* README.md */, EA20B506249CA63300B5E581 /* AuthenticationExample.entitlements */, @@ -322,7 +319,7 @@ EA20B47724973BB100B5E581 /* CustomViews */, EAB3A17A2494626F00385291 /* Utility */, EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, - EA217894248979E200736757 /* LaunchScreen.storyboard */, + 8848764F29D3149200780FA6 /* GoogleService-Info.plist */,EA217894248979E200736757 /* LaunchScreen.storyboard */, DEC2E5DE2A9583CA0090260A /* AppManager.swift */, ); path = AuthenticationExample; @@ -510,9 +507,9 @@ buildActionMask = 2147483647; files = ( EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */, + 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */, + DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */, EAE4CBCE24855E3D00245E92 /* Assets.xcassets in Resources */, - B8B417C92D0C4C4800CF9098 /* GoogleService-Info_multi.plist in Resources */, - B8B417CA2D0C4C4800CF9098 /* GoogleService-Info.plist in Resources */, EA062D5D24A0FEB6006714D3 /* README.md in Resources */, ); runOnlyForDeploymentPostprocessing = 0; From 8dc2cc79fd3d7317907f55bbd71b258c2ac1d21e Mon Sep 17 00:00:00 2001 From: Srushti Vaidya Date: Fri, 13 Dec 2024 20:34:02 +0530 Subject: [PATCH 13/13] discarding changes in project.pbxproj --- .../project.pbxproj | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj index 4c2f37f581a..feb55512ba4 100644 --- a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj +++ b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 8848765129D314A400780FA6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8848764F29D3149200780FA6 /* GoogleService-Info.plist */; }; - B8B417CD2D0C4C7200CF9098 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = B8B417CC2D0C4C7200CF9098 /* RecaptchaEnterprise */; }; DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B636E2BEC2DC300607B82 /* FirebaseAuth */; }; DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63712BEC2FB900607B82 /* GoogleSignIn */; }; DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */; }; @@ -32,8 +31,9 @@ DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; }; DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; }; DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; }; -DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; + DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; }; + DED37F632AB0C4F7003A67E4 /* SettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */; }; + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */ = {isa = PBXBuildFile; productRef = DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */; }; EA02F68524A000E00079D000 /* UserActions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68424A000E00079D000 /* UserActions.swift */; }; EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA02F68C24A063E90079D000 /* LoginDelegate.swift */; }; EA062D5D24A0FEB6006714D3 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = EA062D5C24A0FEB6006714D3 /* README.md */; }; @@ -111,6 +111,7 @@ DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {is DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = ""; }; DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = ""; }; DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; }; + DED37F622AB0C4F7003A67E4 /* SettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsUITests.swift; sourceTree = ""; }; EA02F68424A000E00079D000 /* UserActions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserActions.swift; sourceTree = ""; }; EA02F68C24A063E90079D000 /* LoginDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginDelegate.swift; sourceTree = ""; }; EA062D5C24A0FEB6006714D3 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; }; @@ -158,12 +159,11 @@ DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {is isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DEE261C52C21E9F500EECAC5 /* (null) in Frameworks */, + DEE261C52C21E9F500EECAC5 /* RecaptchaEnterprise in Frameworks */, DE8B63772BEC302200607B82 /* FacebookLogin in Frameworks */, DE8B63742BEC2FB900607B82 /* GoogleSignInSwift in Frameworks */, DE8B636F2BEC2DC300607B82 /* FirebaseAuth in Frameworks */, DE8B63722BEC2FB900607B82 /* GoogleSignIn in Frameworks */, - B8B417CD2D0C4C7200CF9098 /* RecaptchaEnterprise in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -319,7 +319,8 @@ DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {is EA20B47724973BB100B5E581 /* CustomViews */, EAB3A17A2494626F00385291 /* Utility */, EAE4CBCD24855E3D00245E92 /* Assets.xcassets */, - 8848764F29D3149200780FA6 /* GoogleService-Info.plist */,EA217894248979E200736757 /* LaunchScreen.storyboard */, + 8848764F29D3149200780FA6 /* GoogleService-Info.plist */, + EA217894248979E200736757 /* LaunchScreen.storyboard */, DEC2E5DE2A9583CA0090260A /* AppManager.swift */, ); path = AuthenticationExample; @@ -392,7 +393,7 @@ DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {is DE8B63712BEC2FB900607B82 /* GoogleSignIn */, DE8B63732BEC2FB900607B82 /* GoogleSignInSwift */, DE8B63762BEC302200607B82 /* FacebookLogin */, - B8B417CC2D0C4C7200CF9098 /* RecaptchaEnterprise */, + DEE261C42C21E9F500EECAC5 /* RecaptchaEnterprise */, ); productName = "Swifty Auth"; productReference = EAE4CBC124855E3A00245E92 /* AuthenticationExample.app */; @@ -480,7 +481,6 @@ DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {is DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, DE8B63752BEC302200607B82 /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */, DE8B63782BEC342000607B82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */, - B8B417CB2D0C4C7200CF9098 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */, ); productRefGroup = EAE4CBC224855E3A00245E92 /* Products */; projectDirPath = ""; @@ -978,14 +978,6 @@ DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {is /* End XCLocalSwiftPackageReference section */ /* Begin XCRemoteSwiftPackageReference section */ - B8B417CB2D0C4C7200CF9098 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 18.6.0; - }; - }; DE8B63702BEC2FB900607B82 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/google/GoogleSignIn-iOS.git"; @@ -1013,11 +1005,6 @@ DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {is /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - B8B417CC2D0C4C7200CF9098 /* RecaptchaEnterprise */ = { - isa = XCSwiftPackageProductDependency; - package = B8B417CB2D0C4C7200CF9098 /* XCRemoteSwiftPackageReference "recaptcha-enterprise-mobile-sdk" */; - productName = RecaptchaEnterprise; - }; DE8B636E2BEC2DC300607B82 /* FirebaseAuth */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAuth;