Rollback MI MSI 2019 version support (Azure#17068)

Author: g2vinay

sdk/identity/azure-identity/src/main/java/com/azure/identity/AppServiceMsiCredential.java

@@ -16,10 +16,8 @@
  */
 @Immutable
 class AppServiceMsiCredential extends ManagedIdentityServiceCredential {
-    private final String identityEndpoint;
     private final String msiEndpoint;
     private final String msiSecret;
-    private final String identityHeader;
     private final ClientLogger logger = new ClientLogger(AppServiceMsiCredential.class);
 
     /**
@@ -31,13 +29,8 @@ class AppServiceMsiCredential extends ManagedIdentityServiceCredential {
     AppServiceMsiCredential(String clientId, IdentityClient identityClient) {
         super(clientId, identityClient, "AZURE APP SERVICE MSI/IDENTITY ENDPOINT");
         Configuration configuration = Configuration.getGlobalConfiguration().clone();
-        this.identityEndpoint = configuration.get(Configuration.PROPERTY_IDENTITY_ENDPOINT);
-        this.identityHeader = configuration.get(Configuration.PROPERTY_IDENTITY_HEADER);
         this.msiEndpoint = configuration.get(Configuration.PROPERTY_MSI_ENDPOINT);
         this.msiSecret = configuration.get(Configuration.PROPERTY_MSI_SECRET);
-        if (identityEndpoint != null) {
-            validateEndpointProtocol(this.identityEndpoint, "Identity", logger);
-        }
         if (msiEndpoint != null) {
             validateEndpointProtocol(this.msiEndpoint, "MSI", logger);
         }
@@ -50,7 +43,7 @@ class AppServiceMsiCredential extends ManagedIdentityServiceCredential {
      * @return A publisher that emits an {@link AccessToken}.
      */
     public Mono<AccessToken> authenticate(TokenRequestContext request) {
-        return identityClient.authenticateToManagedIdentityEndpoint(identityEndpoint, identityHeader, msiEndpoint,
+        return identityClient.authenticateToManagedIdentityEndpoint(null, null, msiEndpoint,
             msiSecret, request);
     }
 }

sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java

@@ -38,6 +38,11 @@ public final class ManagedIdentityCredential implements TokenCredential {
             .identityClientOptions(identityClientOptions)
             .build();
         Configuration configuration = Configuration.getGlobalConfiguration().clone();
+//<<<<<<< HEAD
+//        if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) {
+//            appServiceMSICredential = new AppServiceMsiCredential(clientId, identityClient);
+//            virtualMachineMSICredential = null;
+//=======
         if (configuration.contains(Configuration.PROPERTY_IDENTITY_ENDPOINT)) {
             if (configuration.contains(Configuration.PROPERTY_IDENTITY_HEADER)) {
                 if (configuration.contains(PROPERTY_IDENTITY_SERVER_THUMBPRINT)) {

sdk/identity/azure-identity/src/test/java/com/azure/identity/implementation/IdentityClientTests.java

@@ -225,8 +225,7 @@ public void testValidServiceFabricCodeFlow() throws Exception {
         configuration.put("IDENTITY_ENDPOINT", endpoint);
         configuration.put("IDENTITY_HEADER", secret);
         configuration.put("IDENTITY_SERVER_THUMBPRINT", thumbprint);
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("M/d/yyyy H:mm:ss XXX");
-        String tokenJson = "{ \"access_token\" : \"token1\", \"expires_on\" : \"" + expiresOn.format(dtf) + "\" }";
+        String tokenJson = "{ \"access_token\" : \"token1\", \"expires_on\" : \"" + expiresOn.toEpochSecond() + "\" }";
 
         // mock
         mockForServiceFabricCodeFlow(tokenJson);