Skip to content

Commit 8dbdc68

Browse files
author
scott.waye@hubse.net
committed
Merge branch 'ping-identity-home-account-refresh' of https://github.com/yowl/microsoft-authentication-library-for-dotnet into ping-identity-home-account-refresh
2 parents 8d1865c + bcb3ff1 commit 8dbdc68

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

build/template-pack-and-sign-all-nugets.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ steps:
4444
ProjectRootPath: '$(Build.SourcesDirectory)\$(MsalSourceDir)src\client'
4545
AssemblyName: 'Microsoft.Identity.Client.Extensions.Msal'
4646

47-
# Sign binary and pack Microsoft.Identity.Client.MtlsPop
47+
# Sign binary and pack Microsoft.Identity.Client.KeyAttestation
4848
- template: template-pack-and-sign-nuget.yaml
4949
parameters:
5050
BuildConfiguration: ${{ parameters.BuildConfiguration }}
5151
ProjectRootPath: '$(Build.SourcesDirectory)\$(MsalSourceDir)src\client'
52-
AssemblyName: 'Microsoft.Identity.Client.MtlsPop'
52+
AssemblyName: 'Microsoft.Identity.Client.KeyAttestation'
5353

5454
# Copy all packages out to staging
5555
- task: CopyFiles@2

tests/Microsoft.Identity.Test.LabInfrastructure/CertificateHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Licensed under the MIT License.
33

44
using System;
5+
using System.Runtime.InteropServices;
56
using System.Security.Cryptography.X509Certificates;
6-
using Microsoft.Identity.Client.Extensions.Msal;
77

88
namespace Microsoft.Identity.Test.LabInfrastructure
99
{
@@ -39,7 +39,7 @@ public static X509Certificate2 FindCertificateByName(string subjectName)
3939
private static X509Certificate2 FindCertificateByName(string certName, StoreLocation location, StoreName name)
4040
{
4141
// Unix LocalMachine X509Store is limited to the Root and CertificateAuthority stores
42-
if (SharedUtilities.IsLinuxPlatform())
42+
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
4343
{
4444
var certPasswrod = Environment.GetEnvironmentVariable("CERTIFICATE_PASSWORD");
4545
var certLocation = Environment.GetEnvironmentVariable("CERTIFICATE_LOCATION");

tests/Microsoft.Identity.Test.LabInfrastructure/LabAuthenticationHelper.cs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
using System.Threading.Tasks;
99
using Azure.Core;
1010
using Microsoft.Identity.Client;
11-
using Microsoft.Identity.Test.Unit;
12-
using Microsoft.Identity.Test.Common.Core.Mocks;
1311

1412
namespace Microsoft.Identity.Test.LabInfrastructure
1513
{
@@ -19,7 +17,12 @@ public static class LabAuthenticationHelper
1917
public const string LabScope = "https://request.msidlab.com/.default";
2018
public const string LabClientInstance = "https://login.microsoftonline.com/";
2119
public const string LabClientTenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
22-
20+
21+
/// <summary>
22+
/// Certificate name for Microsoft Identity lab authentication.
23+
/// This certificate is used for automated testing and is available only to Microsoft employees.
24+
/// </summary>
25+
private const string AutomationTestCertName = "LabAuth.MSIDLab.com";
2326
public static async Task<AccessToken> GetAccessTokenForLabAPIAsync(string labAccessClientId)
2427
{
2528
string[] scopes = new string[] { LabScope };
@@ -44,9 +47,9 @@ public static async Task<AccessToken> GetLabAccessTokenAsync(string authority, s
4447
IConfidentialClientApplication confidentialApp;
4548
X509Certificate2 cert;
4649

47-
var clientIdForCertAuth = String.IsNullOrEmpty(clientId) ? LabAccessConfidentialClientId : clientId;
50+
var clientIdForCertAuth = string.IsNullOrEmpty(clientId) ? LabAccessConfidentialClientId : clientId;
4851

49-
cert = CertificateHelper.FindCertificateByName(TestConstants.AutomationTestCertName);
52+
cert = CertificateHelper.FindCertificateByName(AutomationTestCertName);
5053
if (cert == null)
5154
{
5255
throw new InvalidOperationException(

tests/Microsoft.Identity.Test.LabInfrastructure/LabResponseHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public static class LabResponseHelper
1515
public static KeyVaultSecretsProvider KeyVaultSecretsProviderMsid { get; }
1616

1717
// Caches for configuration objects retrieved from Key Vault
18-
private static readonly System.Collections.Concurrent.ConcurrentDictionary<string, UserConfig> s_userConfigCache = new();
19-
private static readonly System.Collections.Concurrent.ConcurrentDictionary<string, AppConfig> s_appConfigCache = new();
18+
private static readonly System.Collections.Concurrent.ConcurrentDictionary<string, UserConfig> s_userConfigCache = new System.Collections.Concurrent.ConcurrentDictionary<string, UserConfig>();
19+
private static readonly System.Collections.Concurrent.ConcurrentDictionary<string, AppConfig> s_appConfigCache = new System.Collections.Concurrent.ConcurrentDictionary<string, AppConfig>();
2020

2121
static LabResponseHelper()
2222
{

0 commit comments

Comments
 (0)