Skip to content

Commit a92a86a

Browse files
committed
Added Async suffix to some method names; Updated docs
1 parent 15d8c43 commit a92a86a

File tree

4 files changed

+27
-20
lines changed

4 files changed

+27
-20
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unreleased
22

33
- [added] Implemented the `GetUserByEmailAsync()` and `GetUserByPhoneNumberAsync()`
4-
APIs in the `FirebaserAuth` class.
4+
APIs in the `FirebaseAuth` class.
55

66
# v1.5.0
77

FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseUserManagerTest.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public async Task GetUserById()
4545
};
4646
var userManager = this.CreateFirebaseUserManager(handler);
4747

48-
var userRecord = await userManager.GetUserById("user1");
48+
var userRecord = await userManager.GetUserByIdAsync("user1");
4949

5050
Assert.Equal("user1", userRecord.Uid);
5151
Assert.Null(userRecord.DisplayName);
@@ -102,7 +102,7 @@ public async Task GetUserByIdWithProperties()
102102
};
103103
var userManager = this.CreateFirebaseUserManager(handler);
104104

105-
var userRecord = await userManager.GetUserById("user1");
105+
var userRecord = await userManager.GetUserByIdAsync("user1");
106106

107107
Assert.Equal("user1", userRecord.Uid);
108108
Assert.Equal("Test User", userRecord.DisplayName);
@@ -154,22 +154,22 @@ public async Task GetUserByIdUserNotFound()
154154
var userManager = this.CreateFirebaseUserManager(handler);
155155

156156
var exception = await Assert.ThrowsAsync<FirebaseException>(
157-
async () => await userManager.GetUserById("user1"));
157+
async () => await userManager.GetUserByIdAsync("user1"));
158158
Assert.Equal("Failed to get user with uid: user1", exception.Message);
159159
}
160160

161161
[Fact]
162162
public async Task GetUserByIdNull()
163163
{
164164
var userManager = this.CreateFirebaseUserManager(new MockMessageHandler());
165-
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserById(null));
165+
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByIdAsync(null));
166166
}
167167

168168
[Fact]
169169
public async Task GetUserByIdEmpty()
170170
{
171171
var userManager = this.CreateFirebaseUserManager(new MockMessageHandler());
172-
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserById(string.Empty));
172+
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByIdAsync(string.Empty));
173173
}
174174

175175
[Fact]
@@ -185,7 +185,7 @@ public async Task GetUserByEmail()
185185
};
186186
var userManager = this.CreateFirebaseUserManager(handler);
187187

188-
var userRecord = await userManager.GetUserByEmail("user@example.com");
188+
var userRecord = await userManager.GetUserByEmailAsync("user@example.com");
189189

190190
Assert.Equal("user1", userRecord.Uid);
191191
Assert.Null(userRecord.DisplayName);
@@ -215,22 +215,22 @@ public async Task GetUserByEmailUserNotFound()
215215
var userManager = this.CreateFirebaseUserManager(handler);
216216

217217
var exception = await Assert.ThrowsAsync<FirebaseException>(
218-
async () => await userManager.GetUserByEmail("user@example.com"));
218+
async () => await userManager.GetUserByEmailAsync("user@example.com"));
219219
Assert.Equal("Failed to get user with email: user@example.com", exception.Message);
220220
}
221221

222222
[Fact]
223223
public async Task GetUserByEmailNull()
224224
{
225225
var userManager = this.CreateFirebaseUserManager(new MockMessageHandler());
226-
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByEmail(null));
226+
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByEmailAsync(null));
227227
}
228228

229229
[Fact]
230230
public async Task GetUserByEmailEmpty()
231231
{
232232
var userManager = this.CreateFirebaseUserManager(new MockMessageHandler());
233-
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByEmail(string.Empty));
233+
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByEmailAsync(string.Empty));
234234
}
235235

236236
[Fact]
@@ -246,7 +246,7 @@ public async Task GetUserByPhoneNumber()
246246
};
247247
var userManager = this.CreateFirebaseUserManager(handler);
248248

249-
var userRecord = await userManager.GetUserByPhoneNumber("+1234567890");
249+
var userRecord = await userManager.GetUserByPhoneNumberAsync("+1234567890");
250250

251251
Assert.Equal("user1", userRecord.Uid);
252252
Assert.Null(userRecord.DisplayName);
@@ -276,22 +276,22 @@ public async Task GetUserByPhoneNumberUserNotFound()
276276
var userManager = this.CreateFirebaseUserManager(handler);
277277

278278
var exception = await Assert.ThrowsAsync<FirebaseException>(
279-
async () => await userManager.GetUserByPhoneNumber("+1234567890"));
279+
async () => await userManager.GetUserByPhoneNumberAsync("+1234567890"));
280280
Assert.Equal("Failed to get user with phone number: +1234567890", exception.Message);
281281
}
282282

283283
[Fact]
284284
public async Task GetUserByPhoneNumberNull()
285285
{
286286
var userManager = this.CreateFirebaseUserManager(new MockMessageHandler());
287-
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByPhoneNumber(null));
287+
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByPhoneNumberAsync(null));
288288
}
289289

290290
[Fact]
291291
public async Task GetUserByPhoneNumberEmpty()
292292
{
293293
var userManager = this.CreateFirebaseUserManager(new MockMessageHandler());
294-
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByPhoneNumber(string.Empty));
294+
await Assert.ThrowsAsync<ArgumentException>(() => userManager.GetUserByPhoneNumberAsync(string.Empty));
295295
}
296296

297297
[Fact]

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseAuth.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public async Task<UserRecord> GetUserAsync(
293293
{
294294
var userManager = this.IfNotDeleted(() => this.userManager.Value);
295295

296-
return await userManager.GetUserById(uid, cancellationToken);
296+
return await userManager.GetUserByIdAsync(uid, cancellationToken);
297297
}
298298

299299
/// <summary>
@@ -326,7 +326,7 @@ public async Task<UserRecord> GetUserByEmailAsync(
326326
{
327327
var userManager = this.IfNotDeleted(() => this.userManager.Value);
328328

329-
return await userManager.GetUserByEmail(email, cancellationToken);
329+
return await userManager.GetUserByEmailAsync(email, cancellationToken);
330330
}
331331

332332
/// <summary>
@@ -359,7 +359,7 @@ public async Task<UserRecord> GetUserByPhoneNumberAsync(
359359
{
360360
var userManager = this.IfNotDeleted(() => this.userManager.Value);
361361

362-
return await userManager.GetUserByPhoneNumber(phoneNumber, cancellationToken);
362+
return await userManager.GetUserByPhoneNumberAsync(phoneNumber, cancellationToken);
363363
}
364364

365365
/// <summary>

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseUserManager.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ internal static FirebaseUserManager Create(FirebaseApp app)
7373
/// <param name="cancellationToken">A cancellation token to monitor the asynchronous
7474
/// operation.</param>
7575
/// <returns>A record of user with the queried id if one exists.</returns>
76-
internal async Task<UserRecord> GetUserById(
76+
internal async Task<UserRecord> GetUserByIdAsync(
7777
string uid, CancellationToken cancellationToken = default(CancellationToken))
7878
{
7979
if (string.IsNullOrEmpty(uid))
@@ -97,7 +97,7 @@ internal async Task<UserRecord> GetUserById(
9797
/// <param name="cancellationToken">A cancellation token to monitor the asynchronous
9898
/// operation.</param>
9999
/// <returns>A record of user with the queried email if one exists.</returns>
100-
internal async Task<UserRecord> GetUserByEmail(
100+
internal async Task<UserRecord> GetUserByEmailAsync(
101101
string email, CancellationToken cancellationToken = default(CancellationToken))
102102
{
103103
if (string.IsNullOrEmpty(email))
@@ -120,7 +120,7 @@ internal async Task<UserRecord> GetUserByEmail(
120120
/// <param name="cancellationToken">A cancellation token to monitor the asynchronous
121121
/// operation.</param>
122122
/// <returns>A record of user with the queried phone number if one exists.</returns>
123-
internal async Task<UserRecord> GetUserByPhoneNumber(
123+
internal async Task<UserRecord> GetUserByPhoneNumberAsync(
124124
string phoneNumber, CancellationToken cancellationToken = default(CancellationToken))
125125
{
126126
if (string.IsNullOrEmpty(phoneNumber))
@@ -249,6 +249,13 @@ private async Task<string> SendAsync(
249249
}
250250
}
251251

252+
/// <summary>
253+
/// Represents a query that can be executed against the Firebase Auth service to retrieve user records.
254+
/// A query mainly consists of a <see cref="UserQuery.Field"/> and a <see cref="UserQuery.Value"/> (e.g.
255+
/// <c>Field = localId</c> and <c>Value = alice</c>). Additionally, a query may also specify a more
256+
/// human-readable <see cref="UserQuery.Label"/> for the field, which will appear on any error messages
257+
/// produced by the query.
258+
/// </summary>
252259
private class UserQuery
253260
{
254261
internal string Field { get; set; }

0 commit comments

Comments
 (0)