Skip to content

Commit

Permalink
Update tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmaytak
pmaytak committed Feb 18, 2021
1 parent 720ee73 commit 55db5a8
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 82 deletions.
21 changes: 17 additions & 4 deletions src/client/Microsoft.Identity.Client/OAuth2/MsalTokenResponse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public long RefreshIn

[JsonIgnore]
public DateTimeOffset AccessTokenExpiresOn { get; private set; }

[JsonIgnore]
public DateTimeOffset AccessTokenExtendedExpiresOn { get; private set; }

Expand All @@ -125,9 +125,22 @@ public long RefreshIn
Scope = jObject[TokenResponseClaim.Scope]?.ToString();
ClientInfo = jObject[TokenResponseClaim.ClientInfo]?.ToString();
IdToken = jObject[TokenResponseClaim.IdToken]?.ToString();
ExpiresIn = TryParseLong(jObject[TokenResponseClaim.ExpiresIn]?.ToString());
ExtendedExpiresIn = TryParseLong(jObject[TokenResponseClaim.ExtendedExpiresIn]?.ToString());
RefreshIn = TryParseLong(jObject[TokenResponseClaim.RefreshIn]?.ToString());

if (jObject[TokenResponseClaim.ExpiresIn] != null)
{
ExpiresIn = TryParseLong(jObject[TokenResponseClaim.ExpiresIn].ToString());
}

if (jObject[TokenResponseClaim.ExtendedExpiresIn] != null)
{
ExtendedExpiresIn = TryParseLong(jObject[TokenResponseClaim.ExtendedExpiresIn].ToString());
}

if (jObject[TokenResponseClaim.RefreshIn] != null)
{
RefreshIn = TryParseLong(jObject[TokenResponseClaim.RefreshIn].ToString());
}

FamilyId = jObject[TokenResponseClaim.FamilyId]?.ToString();
base.DeserializeFromJson(json);

Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.Identity.Test.Integration.netfx/HeadlessTests/AuthorityTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public async Task KnownInstanceMetadataIsUpToDateAsync()
validDiscoveryUri)).ConfigureAwait(false);
string discoveryJson = await discoveryResponse.Content.ReadAsStringAsync().ConfigureAwait(false);

InstanceDiscoveryMetadataEntry[] actualMetadata = JsonHelper.DeserializeFromJson<InstanceDiscoveryResponse>(discoveryJson).Metadata;
InstanceDiscoveryMetadataEntry[] actualMetadata = JsonHelper.DeserializeNew<InstanceDiscoveryResponse>(discoveryJson).Metadata;
var processedMetadata = new Dictionary<string, InstanceDiscoveryMetadataEntry>();
foreach (InstanceDiscoveryMetadataEntry entry in actualMetadata)
{
Expand Down
6 changes: 3 additions & 3 deletions tests/Microsoft.Identity.Test.Unit/CacheTests/TokenCacheTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public void AccessToken_WithRefresh_FromMsalResponseJson()
string json = TestConstants.TokenResponseJson;
json = JsonTestUtils.AddKeyValue(json, "refresh_in", "1800");

var tokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(json);
var tokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(json);
var homeAccountId = ClientInfo.CreateFromJson(tokenResponse.ClientInfo).ToAccountIdentifier();

// Act
Expand Down Expand Up @@ -302,7 +302,7 @@ public void AccessToken_WithKidAndType_FromMsalResponseJson()
string json = TestConstants.TokenResponseJson;
json = JsonTestUtils.AddKeyValue(json, StorageJsonKeys.TokenType, "pop");

var tokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(json);
var tokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(json);
var homeAccountId = ClientInfo.CreateFromJson(tokenResponse.ClientInfo).ToAccountIdentifier();

// Act
Expand All @@ -324,7 +324,7 @@ public void AccessToken_WithNoRefresh_FromMsalResponseJson()
{
// Arrange
string json = TestConstants.TokenResponseJson;
var tokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(json);
var tokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(json);
var homeAccountId = ClientInfo.CreateFromJson(tokenResponse.ClientInfo).ToAccountIdentifier();

// Act
Expand Down
10 changes: 5 additions & 5 deletions tests/Microsoft.Identity.Test.Unit/CacheTests/UnifiedSchemaValidationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,35 +38,35 @@ public class UnifiedSchemaValidationTests : TestBase
private MsalTokenResponse CreateAadTestTokenResponse()
{
string jsonResponse = "{\"token_type\":\"Bearer\",\"scope\":\"Calendars.Read openid profile Tasks.Read User.Read email\",\"expires_in\":3600,\"ext_expires_in\":262800,\"access_token\":\"<removed_at>\",\"refresh_token\":\"<removed_rt>\",\"id_token\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJiNmM2OWEzNy1kZjk2LTRkYjAtOTA4OC0yYWI5NmUxZDgyMTUiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vZjY0NWFkOTItZTM4ZC00ZDFhLWI1MTAtZDFiMDlhNzRhOGNhL3YyLjAiLCJpYXQiOjE1Mzg1Mzg0MjIsIm5iZiI6MTUzODUzODQyMiwiZXhwIjoxNTM4NTQyMzIyLCJuYW1lIjoiQ2xvdWQgSURMQUIgQmFzaWMgVXNlciIsIm9pZCI6IjlmNDg4MGQ4LTgwYmEtNGM0MC05N2JjLWY3YTIzYzcwMzA4NCIsInByZWZlcnJlZF91c2VybmFtZSI6ImlkbGFiQG1zaWRsYWI0Lm9ubWljcm9zb2Z0LmNvbSIsInN1YiI6Ilk2WWtCZEhOTkxITm1US2VsOUtoUno4d3Jhc3hkTFJGaVAxNEJSUFdybjQiLCJ0aWQiOiJmNjQ1YWQ5Mi1lMzhkLTRkMWEtYjUxMC1kMWIwOWE3NGE4Y2EiLCJ1dGkiOiI2bmNpWDAyU01raTlrNzMtRjFzWkFBIiwidmVyIjoiMi4wIn0.\",\"client_info\":\"" + AadRawClientInfo + "\"}";
var msalTokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(jsonResponse);
var msalTokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(jsonResponse);
return msalTokenResponse;
}

private MsalTokenResponse CreateMsaTestTokenResponse()
{
string jsonResponse = "{\"token_type\":\"Bearer\",\"scope\":\"Tasks.Read User.Read openid profile\",\"expires_in\":3600,\"ext_expires_in\":262800,\"access_token\":\"<removed_at>\",\"refresh_token\":\"<removed_rt>\",\"id_token\":\"eyJ2ZXIiOiIyLjAiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vOTE4ODA0MGQtNmM2Ny00YzViLWIxMTItMzZhMzA0YjY2ZGFkL3YyLjAiLCJzdWIiOiJBQUFBQUFBQUFBQUFBQUFBQUFBQUFNTmVBRnBTTGdsSGlPVHI5SVpISkVBIiwiYXVkIjoiYjZjNjlhMzctZGY5Ni00ZGIwLTkwODgtMmFiOTZlMWQ4MjE1IiwiZXhwIjoxNTM4ODg1MjU0LCJpYXQiOjE1Mzg3OTg1NTQsIm5iZiI6MTUzODc5ODU1NCwibmFtZSI6IlRlc3QgVXNlcm5hbWUiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJtc2Fsc2RrdGVzdEBvdXRsb29rLmNvbSIsIm9pZCI6IjAwMDAwMDAwLTAwMDAtMDAwMC00MGMwLTNiYWMxODhkMDFkMSIsInRpZCI6IjkxODgwNDBkLTZjNjctNGM1Yi1iMTEyLTM2YTMwNGI2NmRhZCIsImFpbyI6IkRXZ0tubCFFc2ZWa1NVOGpGVmJ4TTZQaFphUjJFeVhzTUJ5bVJHU1h2UkV1NGkqRm1CVTFSQmw1aEh2TnZvR1NHbHFkQkpGeG5kQXNBNipaM3FaQnIwYzl2YUlSd1VwZUlDVipTWFpqdzghQiIsImFsZyI6IkhTMjU2In0.\",\"client_info\":\"" + MsaRawClientInfo + "\"}";
var msalTokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(jsonResponse);
var msalTokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(jsonResponse);
return msalTokenResponse;
}

private MsalTokenResponse CreateB2CTestTokenResponse()
{
string jsonResponse = "{\"access_token\":\"<removed_at>\",\"id_token\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1Mzg4MDQ4NjAsIm5iZiI6MTUzODgwMTI2MCwidmVyIjoiMS4wIiwiaXNzIjoiaHR0cHM6Ly9sb2dpbi5taWNyb3NvZnRvbmxpbmUuY29tL2JhNmMwZDk0LWE4ZGEtNDViMi04M2FlLTMzODcxZjljMmRkOC92Mi4wLyIsInN1YiI6ImFkMDIwZjhlLWIxYmEtNDRiMi1iZDY5LWMyMmJlODY3MzdmNSIsImF1ZCI6IjBhN2Y1MmRkLTI2MGUtNDMyZi05NGRlLWI0NzgyOGMzZjM3MiIsImlhdCI6MTUzODgwMTI2MCwiYXV0aF90aW1lIjoxNTM4ODAxMjYwLCJpZHAiOiJsaXZlLmNvbSIsIm5hbWUiOiJNU0FMIFNESyBUZXN0Iiwib2lkIjoiYWQwMjBmOGUtYjFiYS00NGIyLWJkNjktYzIyYmU4NjczN2Y1IiwiZmFtaWx5X25hbWUiOiJTREsgVGVzdCIsImdpdmVuX25hbWUiOiJNU0FMIiwiZW1haWxzIjpbIm1zYWxzZGt0ZXN0QG91dGxvb2suY29tIl0sInRmcCI6IkIyQ18xX1NpZ25pbiIsImF0X2hhc2giOiJRNE8zSERDbGNhTGw3eTB1VS1iSkFnIn0.\",\"token_type\":\"Bearer\",\"not_before\":1538801260,\"expires_in\":3600,\"ext_expires_in\":262800,\"expires_on\":1538804860,\"resource\":\"14df2240-96cc-4f42-a133-ef0807492869\",\"client_info\":\"" + B2CRawClientInfo + "\",\"scope\":\"https://iosmsalb2c.onmicrosoft.com/webapitest/user.read\",\"refresh_token\":\"<removed_rt>\",\"refresh_token_expires_in\":1209600}";
var msalTokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(jsonResponse);
var msalTokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(jsonResponse);
return msalTokenResponse;
}

private MsalTokenResponse CreateB2CTestTokenResponseWithTenantId()
{
string jsonResponse = "{\"access_token\":\"<removed_at>\",\"id_token\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1Mzg4MDQ4NjAsIm5iZiI6MTUzODgwMTI2MCwidmVyIjoiMS4wIiwiaXNzIjoiaHR0cHM6Ly9sb2dpbi5taWNyb3NvZnRvbmxpbmUuY29tL2JhNmMwZDk0LWE4ZGEtNDViMi04M2FlLTMzODcxZjljMmRkOC92Mi4wLyIsInN1YiI6ImFkMDIwZjhlLWIxYmEtNDRiMi1iZDY5LWMyMmJlODY3MzdmNSIsImF1ZCI6IjBhN2Y1MmRkLTI2MGUtNDMyZi05NGRlLWI0NzgyOGMzZjM3MiIsImlhdCI6MTUzODgwMTI2MCwiYXV0aF90aW1lIjoxNTM4ODAxMjYwLCJpZHAiOiJsaXZlLmNvbSIsIm5hbWUiOiJNU0FMIFNESyBUZXN0Iiwib2lkIjoiYWQwMjBmOGUtYjFiYS00NGIyLWJkNjktYzIyYmU4NjczN2Y1IiwiZmFtaWx5X25hbWUiOiJTREsgVGVzdCIsImdpdmVuX25hbWUiOiJNU0FMIiwiZW1haWxzIjpbIm1zYWxzZGt0ZXN0QG91dGxvb2suY29tIl0sInRmcCI6IkIyQ18xX1NpZ25pbiIsImF0X2hhc2giOiJRNE8zSERDbGNhTGw3eTB1VS1iSkFnIiwidGlkIjoiYmE2YzBkOTQtYThkYS00NWIyLTgzYWUtMzM4NzFmOWMyZGQ4IiwicHJlZmVycmVkX3VzZXJuYW1lIjoibXNhbHNka3Rlc3RAb3V0bG9vay5jb20ifQ.\",\"token_type\":\"Bearer\",\"not_before\":1538801260,\"expires_in\":3600,\"ext_expires_in\":262800,\"expires_on\":1538804860,\"resource\":\"14df2240-96cc-4f42-a133-ef0807492869\",\"client_info\":\"" + B2CRawClientInfo + "\",\"scope\":\"https://iosmsalb2c.onmicrosoft.com/webapitest/user.read\",\"refresh_token\":\"<removed_rt>\",\"refresh_token_expires_in\":1209600}";
var msalTokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(jsonResponse);
var msalTokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(jsonResponse);
return msalTokenResponse;
}

private MsalTokenResponse CreateAadTestTokenResponseWithFoci()
{
string jsonResponse = "{\"token_type\":\"Bearer\",\"scope\":\"Calendars.Read openid profile Tasks.Read User.Read email\",\"expires_in\":3600,\"ext_expires_in\":262800,\"access_token\":\"<removed_at>\",\"refresh_token\":\"<removed_rt>\",\"id_token\":\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJiNmM2OWEzNy1kZjk2LTRkYjAtOTA4OC0yYWI5NmUxZDgyMTUiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vZjY0NWFkOTItZTM4ZC00ZDFhLWI1MTAtZDFiMDlhNzRhOGNhL3YyLjAiLCJpYXQiOjE1Mzg1Mzg0MjIsIm5iZiI6MTUzODUzODQyMiwiZXhwIjoxNTM4NTQyMzIyLCJuYW1lIjoiQ2xvdWQgSURMQUIgQmFzaWMgVXNlciIsIm9pZCI6IjlmNDg4MGQ4LTgwYmEtNGM0MC05N2JjLWY3YTIzYzcwMzA4NCIsInByZWZlcnJlZF91c2VybmFtZSI6ImlkbGFiQG1zaWRsYWI0Lm9ubWljcm9zb2Z0LmNvbSIsInN1YiI6Ilk2WWtCZEhOTkxITm1US2VsOUtoUno4d3Jhc3hkTFJGaVAxNEJSUFdybjQiLCJ0aWQiOiJmNjQ1YWQ5Mi1lMzhkLTRkMWEtYjUxMC1kMWIwOWE3NGE4Y2EiLCJ1dGkiOiI2bmNpWDAyU01raTlrNzMtRjFzWkFBIiwidmVyIjoiMi4wIn0.\",\"client_info\":\"" + AadRawClientInfo + "\",\"foci\":\"1\"}";
var msalTokenResponse = JsonHelper.DeserializeFromJson<MsalTokenResponse>(jsonResponse);
var msalTokenResponse = JsonHelper.DeserializeNew<MsalTokenResponse>(jsonResponse);
return msalTokenResponse;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Microsoft.Identity.Test.Unit/CoreTests/InstanceTests/InstanceProviderTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void UserMetadataProvider_RespondsIfEnvironmentsAreKnown()
{
// Arrange
string instanceMetadataJson = File.ReadAllText(ResourceHelper.GetTestResourceRelativePath("CustomInstanceMetadata.json"));
InstanceDiscoveryResponse instanceDiscovery = JsonHelper.DeserializeFromJson<InstanceDiscoveryResponse>(instanceMetadataJson);
InstanceDiscoveryResponse instanceDiscovery = JsonHelper.DeserializeNew<InstanceDiscoveryResponse>(instanceMetadataJson);

UserMetadataProvider userMetadataProvider = new UserMetadataProvider(instanceDiscovery);

Expand Down
Loading

0 comments on commit 55db5a8

Please sign in to comment.