Skip to content

Commit 702572a

Browse files
committed
Fixed a failing CI test.
1 parent 5e5e0ed commit 702572a

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseUserManagerTest.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,14 @@ public async Task UpdateUser()
123123
{
124124
var handler = new MockMessageHandler()
125125
{
126-
Response = new UserRecord("user1"),
126+
Response = new GetAccountInfoResponse()
127+
{
128+
Kind = "identitytoolkit#GetAccountInfoResponse",
129+
Users = new List<GetAccountInfoResponse.User>()
130+
{
131+
new GetAccountInfoResponse.User() { UserID = "user1" },
132+
},
133+
},
127134
};
128135
var factory = new MockHttpClientFactory(handler);
129136
var userManager = new FirebaseUserManager(

FirebaseAdmin/FirebaseAdmin/Auth/FirebaseUserManager.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,13 @@ public async Task<UserRecord> GetUserById(
8989
throw new FirebaseException($"Failed to get user: {uid}");
9090
}
9191

92-
return new UserRecord(response.Users[0]);
92+
var user = response.Users[0];
93+
if (user == null || user.UserID != uid)
94+
{
95+
throw new FirebaseException($"Failed to get user: {uid}");
96+
}
97+
98+
return new UserRecord(user);
9399
}
94100

95101
/// <summary>
@@ -103,9 +109,15 @@ public async Task UpdateUserAsync(
103109
UserRecord user, CancellationToken cancellationToken = default(CancellationToken))
104110
{
105111
const string updatePath = "accounts:update";
106-
var response = await this.PostAndDeserializeAsync<JObject>(
112+
var response = await this.PostAndDeserializeAsync<GetAccountInfoResponse>(
107113
updatePath, user, cancellationToken).ConfigureAwait(false);
108-
if (user.Uid != (string)response["localId"])
114+
if (response == null || response.Users == null || response.Users.Count == 0)
115+
{
116+
throw new FirebaseException($"Failed to get user: {user.Uid}");
117+
}
118+
119+
var updatedUser = response.Users[0];
120+
if (updatedUser == null || updatedUser.UserID != user.Uid)
109121
{
110122
throw new FirebaseException($"Failed to update user: {user.Uid}");
111123
}

0 commit comments

Comments
 (0)