Skip to content

initWithAuthUI: Auth Fix #997

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 3 commits into from
Aug 10, 2021
Merged

initWithAuthUI: Auth Fix #997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec27faf
initWithAuthUI: Auth Fix
wimbledon Aug 5, 2021
2b991ee
Fixed the Failing Tests.
wimbledon Aug 10, 2021
83c5fc4
More Tests Fixes
wimbledon Aug 10, 2021
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
14 changes: 7 additions & 7 deletions FirebaseOAuthUI/FirebaseOAuthUITests/FirebaseOAuthUITests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ - (void)setUp {

id appClass = OCMClassMock([FIRApp class]);
OCMStub([authClass app]).andReturn(appClass);

FIRAuth *auth = [FIRAuth auth];
self.authUI = [FUIAuth authUIWithAuth:auth];

self.mockOAuthProvider = OCMClassMock([FIROAuthProvider class]);
OCMStub(ClassMethod([_mockOAuthProvider providerWithProviderID:OCMOCK_ANY])).
OCMStub(ClassMethod([_mockOAuthProvider providerWithProviderID:OCMOCK_ANY auth:self.authUI.auth])).
andReturn(_mockOAuthProvider);

FIRAuth *auth = [FIRAuth auth];
self.authUI = [FUIAuth authUIWithAuth:auth];
}

- (void)tearDown {
Expand Down Expand Up @@ -78,7 +78,7 @@ - (void)testProviderValidity {
XCTAssertNil(self.provider.accessToken);
XCTAssertNil(self.provider.idToken);

OCMVerify([self.mockOAuthProvider providerWithProviderID:@"dummy"]);
OCMVerify([self.mockOAuthProvider providerWithProviderID:@"dummy" auth:self.authUI.auth]);
}

- (void)testAppleUsesEmulatorCreatesOAuthProvider {
Expand All @@ -93,7 +93,7 @@ - (void)testAppleUsesEmulatorCreatesOAuthProvider {
scopes:@[]
customParameters:@{}
loginHintKey:nil];
OCMVerify([self.mockOAuthProvider providerWithProviderID:@"apple.com"]);
OCMVerify([self.mockOAuthProvider providerWithProviderID:@"apple.com" auth:self.authUI.auth]);
}

- (void)testAppleNoUseEmulatorNoOAuthProvider {
Expand All @@ -106,7 +106,7 @@ - (void)testAppleNoUseEmulatorNoOAuthProvider {
scopes:@[]
customParameters:@{}
loginHintKey:nil];
OCMVerify(never(), [self.mockOAuthProvider providerWithProviderID:@"apple.com"]);
OCMVerify(never(), [self.mockOAuthProvider providerWithProviderID:@"apple.com" auth:self.authUI.auth]);
}

@end
2 changes: 1 addition & 1 deletion FirebaseOAuthUI/Sources/FUIOAuth.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ - (instancetype)initWithAuthUI:(FUIAuth *)authUI
_customParameters = customParameters;
_loginHintKey = loginHintKey;
if ((_authUI.isEmulatorEnabled || ![_providerID isEqualToString:@"apple.com"]) && ![_providerID isEqualToString:@"facebook.com"]) {
_provider = [FIROAuthProvider providerWithProviderID:self.providerID];
_provider = [FIROAuthProvider providerWithProviderID:self.providerID auth:_authUI.auth];
}
}
return self;
Expand Down