Skip to content

Commit e3bc607

Browse files
hiranya911hiranya911
committed
Fixed a bug in user provider data parsing; Added more tests
1 parent 081b0a7 commit e3bc607

File tree

3 files changed

+182
-54
lines changed

3 files changed

+182
-54
lines changed

‎FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseUserManagerTest.cs‎

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,21 @@ public class FirebaseUserManagerTest
3232
private static readonly GoogleCredential MockCredential =
3333
GoogleCredential.FromAccessToken("test-token");
3434

35-
[Fact]
36-
public void UserRecordWithNullResponse()
37-
{
38-
Assert.Throws<ArgumentException>(() => new UserRecord(null));
39-
}
40-
4135
[Fact]
4236
public async Task GetUserById()
4337
{
4438
var handler = new MockMessageHandler()
4539
{
46-
Response = new GetAccountInfoResponse()
47-
{
48-
Kind = "identitytoolkit#GetAccountInfoResponse",
49-
Users = new List<GetAccountInfoResponse.User>()
40+
Response = @"{""users"": [
5041
{
51-
new GetAccountInfoResponse.User() { UserId = "user1" },
52-
},
53-
},
42+
""localId"": ""user1""
43+
}
44+
]}",
5445
};
5546
var userManager = this.CreateFirebaseUserManager(handler);
5647

5748
var userRecord = await userManager.GetUserById("user1");
49+
5850
Assert.Equal("user1", userRecord.Uid);
5951
Assert.Null(userRecord.DisplayName);
6052
Assert.Null(userRecord.Email);
@@ -75,48 +67,40 @@ public async Task GetUserByIdWithProperties()
7567
{
7668
var handler = new MockMessageHandler()
7769
{
78-
Response = new GetAccountInfoResponse()
79-
{
80-
Kind = "identitytoolkit#GetAccountInfoResponse",
81-
Users = new List<GetAccountInfoResponse.User>()
70+
Response = @"{""users"": [
8271
{
83-
new GetAccountInfoResponse.User()
84-
{
85-
UserId = "user1",
86-
DisplayName = "Test User",
87-
Email = "[email protected]",
88-
PhoneNumber = "+11234567890",
89-
PhotoUrl = "https://domain.com/user.png",
90-
Disabled = true,
91-
EmailVerified = true,
92-
ValidSince = 3600,
93-
CreatedAt = 100,
94-
LastLoginAt = 150,
95-
CustomClaims = @"{""admin"": true, ""level"": 10}",
96-
Providers = new List<GetAccountInfoResponse.Provider>()
72+
""localId"": ""user1"",
73+
""displayName"": ""Test User"",
74+
""email"": ""[email protected]"",
75+
""phoneNumber"": ""+11234567890"",
76+
""photoUrl"": ""https://domain.com/user.png"",
77+
""disabled"": true,
78+
""emailVerified"": true,
79+
""validSince"": 3600,
80+
""customAttributes"": ""{\""admin\"": true, \""level\"": 10}"",
81+
""providerUserInfo"": [
9782
{
98-
new GetAccountInfoResponse.Provider()
99-
{
100-
ProviderID = "google.com",
101-
UserId = "googleuid",
102-
},
103-
new GetAccountInfoResponse.Provider()
104-
{
105-
ProviderID = "other.com",
106-
UserId = "otheruid",
107-
DisplayName = "Other Name",
108-
Email = "[email protected]",
109-
PhotoUrl = "https://other.com/user.png",
110-
PhoneNumber = "+10987654321",
111-
},
83+
""rawId"": ""googleuid"",
84+
""providerId"": ""google.com""
11285
},
113-
},
114-
},
115-
},
86+
{
87+
""rawId"": ""otheruid"",
88+
""providerId"": ""other.com"",
89+
""displayName"": ""Other Name"",
90+
""email"": ""[email protected]"",
91+
""phoneNumber"": ""+10987654321"",
92+
""photoUrl"": ""https://other.com/user.png""
93+
}
94+
],
95+
""createdAt"": 100,
96+
""lastLoginAt"": 150,
97+
}
98+
]}",
11699
};
117100
var userManager = this.CreateFirebaseUserManager(handler);
118101

119102
var userRecord = await userManager.GetUserById("user1");
103+
120104
Assert.Equal("user1", userRecord.Uid);
121105
Assert.Equal("Test User", userRecord.DisplayName);
122106
Assert.Equal("[email protected]", userRecord.Email);
@@ -372,7 +356,7 @@ public async Task UpdateUserIncorrectResponseObject()
372356
{
373357
var handler = new MockMessageHandler()
374358
{
375-
Response = new object(),
359+
Response = "{}",
376360
};
377361
var userManager = this.CreateFirebaseUserManager(handler);
378362
var customClaims = new Dictionary<string, object>()
@@ -435,10 +419,7 @@ public async Task DeleteUser()
435419
{
436420
var handler = new MockMessageHandler()
437421
{
438-
Response = new Dictionary<string, string>()
439-
{
440-
{ "kind", "identitytoolkit#DeleteAccountResponse" },
441-
},
422+
Response = @"{""kind"": ""identitytoolkit#DeleteAccountResponse""}",
442423
};
443424
var userManager = this.CreateFirebaseUserManager(handler);
444425

‎FirebaseAdmin/FirebaseAdmin.Tests/Auth/UserRecordTest.cs‎

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
// Copyright 2019, Google Inc. All rights reserved.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
using System;
16+
using System.Collections.Generic;
17+
using Xunit;
18+
19+
namespace FirebaseAdmin.Auth.Tests
20+
{
21+
public class UserRecordTest
22+
{
23+
[Fact]
24+
public void NullResponse()
25+
{
26+
Assert.Throws<ArgumentException>(() => new UserRecord(null));
27+
}
28+
29+
[Fact]
30+
public void NullUid()
31+
{
32+
Assert.Throws<ArgumentException>(() => new UserRecord(new GetAccountInfoResponse.User()
33+
{
34+
UserId = null,
35+
}));
36+
}
37+
38+
[Fact]
39+
public void EmptyUid()
40+
{
41+
Assert.Throws<ArgumentException>(() => new UserRecord(new GetAccountInfoResponse.User()
42+
{
43+
UserId = string.Empty,
44+
}));
45+
}
46+
47+
[Fact]
48+
public void UidOnly()
49+
{
50+
var user = new UserRecord(new GetAccountInfoResponse.User()
51+
{
52+
UserId = "user1",
53+
});
54+
55+
Assert.Equal("user1", user.Uid);
56+
Assert.Null(user.DisplayName);
57+
Assert.Null(user.Email);
58+
Assert.Null(user.PhoneNumber);
59+
Assert.Null(user.PhotoUrl);
60+
Assert.Equal("firebase", user.ProviderId);
61+
Assert.False(user.Disabled);
62+
Assert.False(user.EmailVerified);
63+
Assert.Equal(UserRecord.UnixEpoch, user.TokensValidAfterTimestamp);
64+
Assert.Empty(user.CustomClaims);
65+
Assert.Empty(user.ProviderData);
66+
Assert.NotNull(user.UserMetaData);
67+
Assert.Equal(DateTime.MinValue, user.UserMetaData.CreationTimestamp);
68+
Assert.Equal(DateTime.MinValue, user.UserMetaData.LastSignInTimestamp);
69+
}
70+
71+
[Fact]
72+
public void AllProperties()
73+
{
74+
var response = new GetAccountInfoResponse.User()
75+
{
76+
UserId = "user1",
77+
DisplayName = "Test User",
78+
Email = "[email protected]",
79+
PhoneNumber = "+11234567890",
80+
PhotoUrl = "https://domain.com/user.png",
81+
Disabled = true,
82+
EmailVerified = true,
83+
ValidSince = 3600,
84+
CreatedAt = 100,
85+
LastLoginAt = 150,
86+
CustomClaims = @"{""admin"": true, ""level"": 10}",
87+
Providers = new List<GetAccountInfoResponse.Provider>()
88+
{
89+
new GetAccountInfoResponse.Provider()
90+
{
91+
ProviderID = "google.com",
92+
UserId = "googleuid",
93+
},
94+
new GetAccountInfoResponse.Provider()
95+
{
96+
ProviderID = "other.com",
97+
UserId = "otheruid",
98+
DisplayName = "Other Name",
99+
Email = "[email protected]",
100+
PhotoUrl = "https://other.com/user.png",
101+
PhoneNumber = "+10987654321",
102+
},
103+
},
104+
};
105+
var user = new UserRecord(response);
106+
107+
Assert.Equal("user1", user.Uid);
108+
Assert.Equal("Test User", user.DisplayName);
109+
Assert.Equal("[email protected]", user.Email);
110+
Assert.Equal("+11234567890", user.PhoneNumber);
111+
Assert.Equal("https://domain.com/user.png", user.PhotoUrl);
112+
Assert.Equal("firebase", user.ProviderId);
113+
Assert.True(user.Disabled);
114+
Assert.True(user.EmailVerified);
115+
Assert.Equal(UserRecord.UnixEpoch.AddSeconds(3600), user.TokensValidAfterTimestamp);
116+
117+
var claims = new Dictionary<string, object>()
118+
{
119+
{ "admin", true },
120+
{ "level", 10L },
121+
};
122+
Assert.Equal(claims, user.CustomClaims);
123+
124+
Assert.Equal(2, user.ProviderData.Length);
125+
var provider = user.ProviderData[0];
126+
Assert.Equal("google.com", provider.ProviderId);
127+
Assert.Equal("googleuid", provider.Uid);
128+
Assert.Null(provider.DisplayName);
129+
Assert.Null(provider.Email);
130+
Assert.Null(provider.PhoneNumber);
131+
Assert.Null(provider.PhotoUrl);
132+
133+
provider = user.ProviderData[1];
134+
Assert.Equal("other.com", provider.ProviderId);
135+
Assert.Equal("otheruid", provider.Uid);
136+
Assert.Equal("Other Name", provider.DisplayName);
137+
Assert.Equal("[email protected]", provider.Email);
138+
Assert.Equal("+10987654321", provider.PhoneNumber);
139+
Assert.Equal("https://other.com/user.png", provider.PhotoUrl);
140+
141+
var metadata = user.UserMetaData;
142+
Assert.NotNull(metadata);
143+
Assert.Equal(UserRecord.UnixEpoch.AddMilliseconds(100), metadata.CreationTimestamp);
144+
Assert.Equal(UserRecord.UnixEpoch.AddMilliseconds(150), metadata.LastSignInTimestamp);
145+
}
146+
}
147+
}

‎FirebaseAdmin/FirebaseAdmin/Auth/GetAccountInfoResponse.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ internal sealed class Provider
108108
/// <summary>
109109
/// Gets or sets the user's ID.
110110
/// </summary>
111-
[JsonProperty(PropertyName = "uid")]
111+
[JsonProperty(PropertyName = "rawId")]
112112
public string UserId { get; set; }
113113

114114
/// <summary>

0 commit comments

Comments
 (0)