Skip to content

Commit e6dd08c

Browse files
bgavrilMSbgavrilMS
authored
Fix some WAM tests (#5106)
* Fix some WAM tests * 2
1 parent 1315b3c commit e6dd08c

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

‎tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/PoPTests.NetFwk.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,6 @@ public async Task WamUsernamePasswordRequestWithPOPAsync()
705705
{
706706
var labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
707707
string[] scopes = { "User.Read" };
708-
string[] expectedScopes = { "email", "offline_access", "openid", "profile", "User.Read" };
709708

710709
WamLoggerValidator wastestLogger = new WamLoggerValidator();
711710

@@ -726,7 +725,7 @@ public async Task WamUsernamePasswordRequestWithPOPAsync()
726725
.WithProofOfPossession("nonce", HttpMethod.Get, new Uri(ProtectedUrl))
727726
.ExecuteAsync().ConfigureAwait(false);
728727

729-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes, true);
728+
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, scopes, true);
730729

731730
Assert.IsTrue(wastestLogger.HasLogged);
732731

‎tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/RuntimeBrokerTests.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ public async Task ExtractNonceWithAuthParserAndValidateShrAsync()
9696
{
9797
var labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
9898
string[] scopes = { "User.Read" };
99-
string[] expectedScopes = { "email", "offline_access", "openid", "profile", "User.Read" };
10099

101100
//Arrange & Act
102101
//Test for nonce in WWW-Authenticate header
@@ -123,14 +122,19 @@ public async Task ExtractNonceWithAuthParserAndValidateShrAsync()
123122
requestUri)
124123
.ExecuteAsync().ConfigureAwait(false);
125124

126-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes, true);
125+
MsalAssert.AssertAuthResult(
126+
result,
127+
TokenSource.Broker,
128+
labResponse.Lab.TenantId,
129+
scopes, true);
127130

128131
PoPValidator.VerifyPoPToken(
129132
labResponse.App.AppId,
130133
requestUri.AbsoluteUri,
131134
HttpMethod.Get,
132135
result);
133136
}
137+
134138

135139
[IgnoreOnOneBranch]
136140
[TestMethod]
@@ -197,8 +201,7 @@ public async Task WamSilentAuthLoginHintNoAccontInCacheAsync()
197201
public async Task WamUsernamePasswordRequestAsync()
198202
{
199203
var labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
200-
string[] scopes = { "User.Read" };
201-
string[] expectedScopes = { "email", "offline_access", "openid", "profile", "User.Read" };
204+
string[] scopes = { "User.Read" };
202205

203206
IntPtr intPtr = GetForegroundWindow();
204207

@@ -214,7 +217,7 @@ public async Task WamUsernamePasswordRequestAsync()
214217
// Acquire token using username password
215218
var result = await pca.AcquireTokenByUsernamePassword(scopes, labResponse.User.Upn, labResponse.User.GetOrFetchPassword()).ExecuteAsync().ConfigureAwait(false);
216219

217-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes);
220+
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, scopes);
218221
Assert.IsNotNull(result.AuthenticationResultMetadata.Telemetry);
219222

220223
// Get Accounts
@@ -227,7 +230,7 @@ public async Task WamUsernamePasswordRequestAsync()
227230
// Acquire token silently
228231
result = await pca.AcquireTokenSilent(scopes, account).ExecuteAsync().ConfigureAwait(false);
229232

230-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes);
233+
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, scopes);
231234
Assert.IsNotNull(result.AuthenticationResultMetadata.Telemetry);
232235

233236
// Remove Account
@@ -288,7 +291,6 @@ public async Task WamUsernamePasswordWithForceRefreshAsync()
288291
{
289292
var labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
290293
string[] scopes = { "User.Read" };
291-
string[] expectedScopes = { "email", "offline_access", "openid", "profile", "User.Read" };
292294

293295
IntPtr intPtr = GetForegroundWindow();
294296
Func<IntPtr> windowHandleProvider = () => intPtr;
@@ -310,7 +312,7 @@ public async Task WamUsernamePasswordWithForceRefreshAsync()
310312

311313
string ropcToken = result.AccessToken;
312314

313-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes);
315+
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, scopes);
314316
Assert.IsNotNull(result.AuthenticationResultMetadata.Telemetry);
315317

316318
// Get Accounts
@@ -339,7 +341,6 @@ public async Task WamUsernamePasswordRequestAsync_WithPiiAsync()
339341
{
340342
var labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
341343
string[] scopes = { "User.Read" };
342-
string[] expectedScopes = { "email", "offline_access", "openid", "profile", "User.Read" };
343344

344345
IntPtr intPtr = GetForegroundWindow();
345346

@@ -358,7 +359,7 @@ public async Task WamUsernamePasswordRequestAsync_WithPiiAsync()
358359
// Acquire token using username password
359360
var result = await pca.AcquireTokenByUsernamePassword(scopes, labResponse.User.Upn, labResponse.User.GetOrFetchPassword()).ExecuteAsync().ConfigureAwait(false);
360361

361-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes);
362+
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, scopes);
362363
Assert.IsNotNull(result.AuthenticationResultMetadata.Telemetry);
363364

364365
// Get Accounts
@@ -374,7 +375,7 @@ public async Task WamUsernamePasswordRequestAsync_WithPiiAsync()
374375
// Acquire token silently
375376
result = await pca.AcquireTokenSilent(scopes, account).ExecuteAsync().ConfigureAwait(false);
376377

377-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes);
378+
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, scopes);
378379
Assert.IsNotNull(result.AuthenticationResultMetadata.Telemetry);
379380

380381
await pca.RemoveAsync(account).ConfigureAwait(false);
@@ -392,7 +393,6 @@ public async Task WamListWindowsWorkAndSchoolAccountsAsync()
392393
{
393394
var labResponse = await LabUserHelper.GetDefaultUserAsync().ConfigureAwait(false);
394395
string[] scopes = { "User.Read" };
395-
string[] expectedScopes = { "email", "offline_access", "openid", "profile", "User.Read" };
396396

397397
IntPtr intPtr = GetForegroundWindow();
398398

@@ -411,7 +411,7 @@ public async Task WamListWindowsWorkAndSchoolAccountsAsync()
411411
// Acquire token using username password
412412
var result = await pca.AcquireTokenByUsernamePassword(scopes, labResponse.User.Upn, labResponse.User.GetOrFetchPassword()).ExecuteAsync().ConfigureAwait(false);
413413

414-
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, expectedScopes);
414+
MsalAssert.AssertAuthResult(result, TokenSource.Broker, labResponse.Lab.TenantId, scopes);
415415
Assert.IsNotNull(result.AuthenticationResultMetadata.Telemetry);
416416

417417
// Get Accounts

0 commit comments

Comments
 (0)