-
Notifications
You must be signed in to change notification settings - Fork 289
feat(auth): Add API to look up users by federated ID. #340
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.
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
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5484ab1
Add API to look up users by federated ID.
nrsim debda03
Apply first round of feedback.
nrsim b3af254
Review feedback
rsgowman c29a802
Merge remote-tracking branch 'origin/master' into lookup-by-federatedid
rsgowman c1025e8
review feedback
rsgowman f9b69a0
review feedback
rsgowman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,6 +49,7 @@ | |
import com.google.firebase.auth.UserRecord.CreateRequest; | ||
import com.google.firebase.auth.UserRecord.UpdateRequest; | ||
import com.google.firebase.auth.hash.Scrypt; | ||
import com.google.firebase.internal.Nullable; | ||
import com.google.firebase.testing.IntegrationTestUtils; | ||
import java.io.IOException; | ||
import java.net.URLDecoder; | ||
|
@@ -140,37 +141,98 @@ public void testDeleteNonExistingUser() throws Exception { | |
@Test | ||
public void testCreateUserWithParams() throws Exception { | ||
RandomUser randomUser = RandomUser.create(); | ||
String phone = randomPhoneNumber(); | ||
CreateRequest user = new CreateRequest() | ||
.setUid(randomUser.uid) | ||
.setEmail(randomUser.email) | ||
.setPhoneNumber(phone) | ||
.setDisplayName("Random User") | ||
.setPhotoUrl("https://example.com/photo.png") | ||
.setEmailVerified(true) | ||
.setPassword("password"); | ||
|
||
UserRecord userRecord = auth.createUserAsync(user).get(); | ||
String randomPhoneNumber = randomPhoneNumber(); | ||
try { | ||
assertEquals(randomUser.uid, userRecord.getUid()); | ||
assertEquals("Random User", userRecord.getDisplayName()); | ||
assertEquals(randomUser.email, userRecord.getEmail()); | ||
assertEquals(phone, userRecord.getPhoneNumber()); | ||
assertEquals("https://example.com/photo.png", userRecord.getPhotoUrl()); | ||
assertTrue(userRecord.isEmailVerified()); | ||
assertFalse(userRecord.isDisabled()); | ||
|
||
assertEquals(2, userRecord.getProviderData().length); | ||
UserRecord user = createUser(randomUser.uid, randomPhoneNumber, randomUser.email); | ||
assertEquals(randomUser.uid, user.getUid()); | ||
assertEquals("Random User", user.getDisplayName()); | ||
assertEquals(randomUser.email, user.getEmail()); | ||
assertEquals(randomPhoneNumber, user.getPhoneNumber()); | ||
assertEquals("https://example.com/photo.png", user.getPhotoUrl()); | ||
assertTrue(user.isEmailVerified()); | ||
assertFalse(user.isDisabled()); | ||
|
||
assertEquals(2, user.getProviderData().length); | ||
List<String> providers = new ArrayList<>(); | ||
for (UserInfo provider : userRecord.getProviderData()) { | ||
for (UserInfo provider : user.getProviderData()) { | ||
providers.add(provider.getProviderId()); | ||
} | ||
assertTrue(providers.contains("password")); | ||
assertTrue(providers.contains("phone")); | ||
|
||
checkRecreate(randomUser.uid); | ||
checkRecreate(user.getUid()); | ||
} finally { | ||
auth.deleteUserAsync(userRecord.getUid()).get(); | ||
auth.deleteUserAsync(randomUser.uid).get(); | ||
} | ||
} | ||
|
||
@Test | ||
public void testLookupUserByPhone() throws Exception { | ||
RandomUser randomUser1 = RandomUser.create(); | ||
rsgowman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
String phoneNumber1 = null; | ||
rsgowman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
RandomUser randomUser2 = RandomUser.create(); | ||
String randomPhoneNumber2 = randomPhoneNumber(); | ||
RandomUser randomUser3 = RandomUser.create(); | ||
String randomPhoneNumber3 = randomPhoneNumber(); | ||
try { | ||
UserRecord user1 = createUser( | ||
randomUser1.uid, /* phoneNumber= */ null, randomUser1.email); | ||
UserRecord user2 = createUser( | ||
randomUser2.uid, randomPhoneNumber2, randomUser2.email); | ||
UserImportResult user3 = importUser( | ||
randomUser3.uid, randomPhoneNumber3, randomUser3.email, "google.com"); | ||
|
||
UserRecord lookedUpRecord = auth.getUserByPhoneNumberAsync(randomPhoneNumber2).get(); | ||
assertEquals(lookedUpRecord.getUid(), randomUser2.uid); | ||
rsgowman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
lookedUpRecord = auth.getUserByPhoneNumberAsync(randomPhoneNumber3).get(); | ||
assertEquals(lookedUpRecord.getUid(), randomUser3.uid); | ||
} finally { | ||
auth.deleteUserAsync(randomUser1.uid).get(); | ||
auth.deleteUserAsync(randomUser2.uid).get(); | ||
auth.deleteUserAsync(randomUser3.uid).get(); | ||
} | ||
} | ||
|
||
@Test | ||
public void testLookupUserByFederatedId() throws Exception { | ||
hiranya911 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
RandomUser randomUser1 = RandomUser.create(); | ||
String phoneNumber1 = null; | ||
rsgowman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
RandomUser randomUser2 = RandomUser.create(); | ||
String randomPhoneNumber2 = randomPhoneNumber(); | ||
RandomUser randomUser3 = RandomUser.create(); | ||
String randomPhoneNumber3 = randomPhoneNumber(); | ||
try { | ||
UserRecord user1 = createUser( | ||
randomUser1.uid, /* phoneNumber= */ null, randomUser1.email); | ||
UserRecord user2 = createUser( | ||
randomUser2.uid, randomPhoneNumber2, randomUser2.email); | ||
UserImportResult user3 = importUser( | ||
randomUser3.uid, randomPhoneNumber3, randomUser3.email, "google.com"); | ||
|
||
UserRecord lookedUpRecord = auth.getUserByFederatedIdAsync( | ||
randomUser3.uid + "_google.com", "google.com").get(); | ||
rsgowman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
assertEquals(lookedUpRecord.getUid(), randomUser3.uid); | ||
assertEquals(2, lookedUpRecord.getProviderData().length); | ||
List<String> providers = new ArrayList<>(); | ||
for (UserInfo provider : lookedUpRecord.getProviderData()) { | ||
providers.add(provider.getProviderId()); | ||
} | ||
assertTrue(providers.contains("phone")); | ||
assertTrue(providers.contains("google.com")); | ||
|
||
try { | ||
// Verify that lookup by federated identifier does not accept "phone". | ||
lookedUpRecord = auth.getUserByFederatedIdAsync( | ||
randomPhoneNumber3, "phone").get(); | ||
fail("No error thrown for non-federated provider"); | ||
} catch (IllegalArgumentException ignored) { | ||
// expected | ||
rsgowman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
} finally { | ||
auth.deleteUserAsync(randomUser1.uid).get(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We should use bulk delete for this when it becomes available. Add a TODO so we don't forget. |
||
auth.deleteUserAsync(randomUser2.uid).get(); | ||
auth.deleteUserAsync(randomUser3.uid).get(); | ||
} | ||
} | ||
|
||
|
@@ -590,6 +652,52 @@ public void testGenerateSignInWithEmailLink() throws Exception { | |
} | ||
} | ||
|
||
private UserRecord createUser( | ||
hiranya911 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
String uid, | ||
@Nullable String phoneNumber, | ||
@Nullable String email) throws Exception { | ||
RandomUser randomUser = RandomUser.create(); | ||
rsgowman marked this conversation as resolved.
Show resolved
Hide resolved
|
||
CreateRequest user = new CreateRequest() | ||
.setUid(uid) | ||
.setDisplayName("Random User") | ||
.setPhotoUrl("https://example.com/photo.png") | ||
.setPassword("password"); | ||
if (phoneNumber != null) { | ||
user.setPhoneNumber(phoneNumber); | ||
} | ||
if (email != null) { | ||
user.setEmail(email); | ||
user.setEmailVerified(true); | ||
} | ||
return auth.createUserAsync(user).get(); | ||
} | ||
|
||
private UserImportResult importUser( | ||
hiranya911 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
String uid, | ||
@Nullable String phoneNumber, | ||
@Nullable String email, | ||
String providerId) throws Exception { | ||
ImportUserRecord.Builder builder = ImportUserRecord.builder() | ||
.setUid(uid) | ||
.setDisabled(false) | ||
.setUserMetadata( | ||
new UserMetadata(/* creationTimestamp= */ 20L, /* lastSignInTimestamp= */ 20L)) | ||
.addUserProvider( | ||
UserProvider.builder() | ||
.setProviderId(providerId) | ||
.setUid(uid + "_" + providerId) | ||
.build()); | ||
if (phoneNumber != null) { | ||
builder.setPhoneNumber(phoneNumber); | ||
} | ||
if (email != null) { | ||
builder.setEmail(email); | ||
builder.setEmailVerified(true); | ||
} | ||
ImportUserRecord user = builder.build(); | ||
return auth.importUsersAsync(ImmutableList.of(user)).get(); | ||
} | ||
|
||
private Map<String, String> parseLinkParameters(String link) throws Exception { | ||
Map<String, String> result = new HashMap<>(); | ||
int queryBegin = link.indexOf('?'); | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(also below)