Skip to content

Commit 4060f15

Browse files
committed
Add friendly name comments to GUIDs per PR feedback
- Added app name 'MSAL-APP-AzureADMultipleOrgs' and 'ID4SLAB1 tenant' comments to migrated GUIDs - Added 'MSIDLAB4 tenant (legacy)' comments to legacy GUIDs for clarity - Addresses Gladwin's PR feedback to document GUID purposes for better code readability Files updated: - TestConstants.cs: Added comments to ClientCredentialAudience and PublicCloudConfidentialClientID - ConfidentialAppSettings.cs: Added comments to both new ID4SLAB1 and legacy MSIDLAB4 GUIDs - FmiIntegrationTests.cs: Updated legacy tenant ID comment
1 parent baf5714 commit 4060f15

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

tests/Microsoft.Identity.Test.Common/TestConstants.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public static HashSet<string> s_scope
3232
public const string MsiResource = "scope";
3333
public static readonly string[] s_graphScopes = new[] { "user.read" };
3434
public const uint JwtToAadLifetimeInSeconds = 60 * 10; // Ten minutes
35-
public const string ClientCredentialAudience = "https://login.microsoftonline.com/10c419d4-4a50-45b2-aa4e-919fb84df24f/v2.0";
36-
public const string PublicCloudConfidentialClientID = "54a2d933-8bf8-483b-a8f8-0a31924f3c1f";
35+
public const string ClientCredentialAudience = "https://login.microsoftonline.com/10c419d4-4a50-45b2-aa4e-919fb84df24f/v2.0"; // ID4SLAB1 tenant
36+
public const string PublicCloudConfidentialClientID = "54a2d933-8bf8-483b-a8f8-0a31924f3c1f"; // MSAL-APP-AzureADMultipleOrgs in ID4SLAB1 tenant
3737
public const string AutomationTestCertName = "LabAuth.MSIDLab.com";
3838
public static Dictionary<string, string> AdditionalAssertionClaims =>
3939
new Dictionary<string, string>() { { "Key1", "Val1" }, { "Key2", "Val2" }, { "customClaims", "{\"xms_az_claim\": [\"GUID\", \"GUID2\", \"GUID3\"]}" } };

tests/Microsoft.Identity.Test.Integration.netcore/HeadlessTests/FmiIntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class FmiIntegrationTests
2929
private const string Testslice = "dc=ESTSR-PUB-WUS-LZ1-TEST"; //Updated slice for regional tests
3030
private Dictionary<string, (string, bool)> TestsliceQueryParam = new Dictionary<string, (string value, bool includeInCacheKey)> { { "dc", ("ESTSR-PUB-WUS-LZ1-TEST", false) } };
3131
private const string AzureRegion = "westus3";
32-
private const string TenantId = "f645ad92-e38d-4d1a-b510-d1b09a74a8ca"; //Tenant Id for the test app
32+
private const string TenantId = "f645ad92-e38d-4d1a-b510-d1b09a74a8ca"; // MSIDLAB4 tenant (legacy)
3333

3434
[TestMethod]
3535
//RMA getting FMI cred for a leaf entity or sub-RMA

tests/Microsoft.Identity.Test.Integration.netcore/Infrastructure/ConfidentialAppSettings.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ private class PublicCloudConfidentialAppSettings : IConfidentialAppSettings
4040
{
4141
// TODO: Tenant Migration - Migrated to new id4slab1 tenant for non-regional tests
4242
// Regional tests still use legacy configuration due to AADSTS100007 restrictions
43-
public string ClientId => UseAppIdUri? "api://54a2d933-8bf8-483b-a8f8-0a31924f3c1f" : "54a2d933-8bf8-483b-a8f8-0a31924f3c1f";
43+
public string ClientId => UseAppIdUri? "api://54a2d933-8bf8-483b-a8f8-0a31924f3c1f" : "54a2d933-8bf8-483b-a8f8-0a31924f3c1f"; // MSAL-APP-AzureADMultipleOrgs in ID4SLAB1 tenant
4444

45-
public string TenantId => "10c419d4-4a50-45b2-aa4e-919fb84df24f";
45+
public string TenantId => "10c419d4-4a50-45b2-aa4e-919fb84df24f"; // ID4SLAB1 tenant
4646

4747
public string Environment => "login.microsoftonline.com";
4848

@@ -148,9 +148,9 @@ private class PublicLegacyCloudConfidentialAppSettings : IConfidentialAppSetting
148148
{
149149
// Legacy MSIDLAB4 configuration for regional tests only
150150
// Regional endpoints require original tenant due to AADSTS100007 restrictions
151-
public string ClientId => UseAppIdUri? "api://88f91eac-c606-4c67-a0e2-a5e8a186854f" : "88f91eac-c606-4c67-a0e2-a5e8a186854f";
151+
public string ClientId => UseAppIdUri? "api://88f91eac-c606-4c67-a0e2-a5e8a186854f" : "88f91eac-c606-4c67-a0e2-a5e8a186854f"; // Legacy MSAL app in MSIDLAB4 tenant
152152

153-
public string TenantId => "f645ad92-e38d-4d1a-b510-d1b09a74a8ca";
153+
public string TenantId => "f645ad92-e38d-4d1a-b510-d1b09a74a8ca"; // MSIDLAB4 tenant (legacy)
154154

155155
public string Environment => "login.microsoftonline.com";
156156

0 commit comments

Comments
 (0)