Remove LabConfig and related code, use constant for tenant info

Author: Avery-Dunn

msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenInteractiveIT.java

@@ -82,9 +82,8 @@ void acquireTokenWithAuthorizationCode_B2C_LegacyFormat() {
     void acquireTokenInteractive_ManagedUser_InstanceAware() {
         AppConfig app = LabResponseHelper.getAppConfig(APP_ARLINGTON);
         UserConfig user = LabResponseHelper.getUserConfig(USER_ARLINGTON);
-        LabConfig lab = LabResponseHelper.getLabConfig(LAB_ARLMSIDLAB1);
 
-        assertAcquireTokenInstanceAware(user, app.getAppId(), lab.getTenantId());
+        assertAcquireTokenInstanceAware(user, app.getAppId(), TestConstants.ARLINGTON_TENANT_ID);
     }
 
     @Test

msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/TestConstants.java

@@ -38,4 +38,6 @@ public class TestConstants {
     public static final String ADFS_SCOPE = USER_READ_SCOPE;
 
     public static final String AUTHORITY_PUBLIC_TENANT_SPECIFIC = "https://login.microsoftonline.com/" + MICROSOFT_AUTHORITY_TENANT;
+
+    public static final String ARLINGTON_TENANT_ID = "45ff0c17-f8b5-489b-b7fd-2fedebbec0c4";
 }

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/labapi/KeyVaultSecrets.java

@@ -30,9 +30,5 @@ private KeyVaultSecrets() {
     public static final String APP_B2C = "MSAL-App-B2C-JSON";
     public static final String APP_ARLINGTON = "MSAL-App-Arlington-JSON";
     public static final String APP_CIAM = "MSAL-App-CIAM-JSON";
-
-    // Lab Configuration Secrets
-    public static final String LAB_ID4SLAB1 = "ID4SLAB1";
-    public static final String LAB_ARLMSIDLAB1 = "ARLMSIDLAB1";
 }
 

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/labapi/KeyVaultSecretsProvider.java

@@ -38,7 +38,7 @@ public class KeyVaultSecretsProvider implements AutoCloseable {
     public static final String CERTIFICATE_ALIAS = "LabAuth.MSIDLab.com";
 
     // The app ID for the application used to access Key Vault
-    private final String MSIDLAB_APP_ID = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9";
+    private static final String MSIDLAB_APP_ID = "f62c5ae3-bf3a-4af5-afa8-a68b800396e9";
 
     static class KeyVaultInstance {
         /**
@@ -213,62 +213,6 @@ public Object getLabData(String secretName) {
         }
     }
 
-    /**
-     * Merge multiple Key Vault secrets into a single LabResponse.
-     * Each secret should contain a LabResponse JSON object.
-     * Fields from later secrets override fields from earlier ones.
-     *
-     * @param secretNames Array of Key Vault secret names to merge
-     * @return Merged LabResponse
-     */
-    public LabResponse mergeLabResponses(String... secretNames) {
-        if (secretNames == null || secretNames.length == 0) {
-            throw new IllegalArgumentException(
-                    "At least one secret name must be provided.");
-        }
-
-        try {
-            LabResponse mergedResponse = new LabResponse();
-            boolean hasValidResponse = false;
-
-            for (String secretName : secretNames) {
-                Object data = getLabData(secretName);
-
-                if (data instanceof LabResponse) {
-                    LabResponse response = (LabResponse) data;
-                    hasValidResponse = true;
-
-                    // Merge user, app, and lab fields (later values override earlier ones)
-                    if (response.getUser() != null) {
-                        mergedResponse.setUser(response.getUser());
-                    }
-                    if (response.getApp() != null) {
-                        mergedResponse.setApp(response.getApp());
-                    }
-                    if (response.getLab() != null) {
-                        mergedResponse.setLab(response.getLab());
-                    }
-                }
-            }
-
-            if (!hasValidResponse) {
-                log.error("Failed to merge secrets - no valid LabResponse found: {}",
-                        String.join(", ", secretNames));
-                throw new RuntimeException("Failed to create merged LabResponse from secrets: " +
-                                String.join(", ", secretNames));
-            }
-
-            log.info("Merged secrets [{}]: {}", String.join(", ", secretNames),
-                    mergedResponse.getUser() != null ? mergedResponse.getUser().getUpn() : "N/A");
-
-            return mergedResponse;
-        } catch (Exception e) {
-            log.error("Failed to merge secrets [{}]: {}", String.join(", ", secretNames), e.getMessage());
-            throw new RuntimeException(
-                    "Failed to merge Key Vault secrets: " + String.join(", ", secretNames), e);
-        }
-    }
-
     /**
      * Fetch user password from Key Vault.
      * Note: This should only be called on instances configured for the MSID LabConfig vault.

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/labapi/LabConfig.java

@@ -17,32 +17,15 @@ public class LabResponse implements JsonSerializable<LabResponse> {
 
     private UserConfig user;
     private AppConfig app;
-    private LabConfig labConfig;
 
     public UserConfig getUser() {
         return user;
     }
 
-    void setUser(UserConfig user) {
-        this.user = user;
-    }
-
     public AppConfig getApp() {
         return app;
     }
 
-    void setApp(AppConfig app) {
-        this.app = app;
-    }
-
-    public LabConfig getLab() {
-        return labConfig;
-    }
-
-    void setLab(LabConfig labConfig) {
-        this.labConfig = labConfig;
-    }
-
     /**
      * Deserialize a LabResponse from JSON.
      */
@@ -61,9 +44,6 @@ static LabResponse fromJson(JsonReader jsonReader) throws IOException {
                     case "app":
                         response.app = AppConfig.fromJson(reader);
                         break;
-                    case "lab":
-                        response.labConfig = LabConfig.fromJson(reader);
-                        break;
                     default:
                         reader.skipChildren();
                         break;
@@ -83,19 +63,8 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         if (app != null) {
             jsonWriter.writeJsonField("app", app);
         }
-        if (labConfig != null) {
-            jsonWriter.writeJsonField("labConfig", labConfig);
-        }
 
         jsonWriter.writeEndObject();
         return jsonWriter;
     }
-
-    @Override
-    public String toString() {
-        return String.format("LabResponse{user=%s, app=%s, labConfig=%s}",
-                user != null ? user.getUpn() : "null",
-                app != null ? app.getAppId() : "null",
-                labConfig != null ? labConfig.getTenantId() : "null");
-    }
 }

msal4j-sdk/src/integrationtest/java/com/microsoft/aad/msal4j/labapi/LabResponse.java

@@ -15,7 +15,6 @@ public class LabResponseHelper {
     // Static caches for configuration instances
     private static final ConcurrentHashMap<String, AppConfig> appConfigCache = new ConcurrentHashMap<>();
     private static final ConcurrentHashMap<String, UserConfig> userConfigCache = new ConcurrentHashMap<>();
-    private static final ConcurrentHashMap<String, LabConfig> labConfigCache = new ConcurrentHashMap<>();
 
     /**
      * Retrieves an AppConfig from Key Vault by secret name.
@@ -50,21 +49,4 @@ public static UserConfig getUserConfig(String userConfigName) {
             throw new RuntimeException("Expected LabResponse with UserConfig for secret: " + key);
         });
     }
-
-    /**
-     * Retrieves a LabConfig from Key Vault by secret name.
-     * Results are cached to avoid redundant Key Vault calls.
-     *
-     * @param labConfigName The Key Vault secret name for the lab configuration (use KeyVaultSecrets constants)
-     * @return LabConfig instance
-     */
-    public static LabConfig getLabConfig(String labConfigName) {
-        return labConfigCache.computeIfAbsent(labConfigName, key -> {
-            Object data = KeyVaultRegistry.getMsalTeamProvider().getLabData(key);
-            if (data instanceof LabResponse) {
-                return ((LabResponse) data).getLab();
-            }
-            throw new RuntimeException("Expected LabResponse with LabConfig for secret: " + key);
-        });
-    }
 }