Azure.Identity adding msi implementation for AppService and CloudShell

sdk/identity/Azure.Identity/src/IdentityClient.cs → sdk/identity/Azure.Identity/src/AadIdentityClient.cs

@@ -19,24 +19,23 @@
 
 namespace Azure.Identity
 {
-    internal class IdentityClient
+    internal class AadIdentityClient
     {
-        private static Lazy<IdentityClient> s_sharedClient = new Lazy<IdentityClient>(() => new IdentityClient());
+        private static Lazy<AadIdentityClient> s_sharedClient = new Lazy<AadIdentityClient>(() => new AadIdentityClient());
 
         private readonly IdentityClientOptions _options;
         private readonly HttpPipeline _pipeline;
-        private readonly Uri ImdsEndptoint = new Uri("http://169.254.169.254/metadata/identity/oauth2/token");
-        private const string MsiApiVersion = "2018-02-01";
+
         private const string ClientAssertionType = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer";
 
-        public IdentityClient(IdentityClientOptions options = null)
+        public AadIdentityClient(IdentityClientOptions options = null)
         {
             _options = options ?? new IdentityClientOptions();
 
             _pipeline = HttpPipelineBuilder.Build(_options, bufferResponse: true);
         }
 
-        public static IdentityClient SharedClient { get { return s_sharedClient.Value; } }
+        public static AadIdentityClient SharedClient { get { return s_sharedClient.Value; } }
 
 
         public virtual async Task<AccessToken> AuthenticateAsync(string tenantId, string clientId, string clientSecret, string[] scopes, CancellationToken cancellationToken = default)
@@ -106,65 +105,6 @@ public virtual AccessToken Authenticate(string tenantId, string clientId, X509Ce
                 throw response.CreateRequestFailedException();
             }
         }
-        public virtual async Task<AccessToken> AuthenticateManagedIdentityAsync(string[] scopes, string clientId = null, CancellationToken cancellationToken = default)
-        {
-            using (Request request = CreateManagedIdentityAuthRequest(scopes, clientId))
-            {
-                var response = await _pipeline.SendRequestAsync(request, cancellationToken).ConfigureAwait(false);
-
-                if (response.Status == 200 || response.Status == 201)
-                {
-                    var result = await DeserializeAsync(response.ContentStream, cancellationToken).ConfigureAwait(false);
-
-                    return new Response<AccessToken>(response, result);
-                }
-
-                throw response.CreateRequestFailedException();
-            }
-        }
-
-        public virtual AccessToken AuthenticateManagedIdentity(string[] scopes, string clientId = null, CancellationToken cancellationToken = default)
-        {
-            using (Request request = CreateManagedIdentityAuthRequest(scopes, clientId))
-            {
-                var response = _pipeline.SendRequest(request, cancellationToken);
-
-                if (response.Status == 200 || response.Status == 201)
-                {
-                    var result = Deserialize(response.ContentStream);
-
-                    return new Response<AccessToken>(response, result);
-                }
-
-                throw response.CreateRequestFailedException();
-            }
-        }
-
-        private Request CreateManagedIdentityAuthRequest(string[] scopes, string clientId = null)
-        {
-            // covert the scopes to a resource string
-            string resource = ScopeUtilities.ScopesToResource(scopes);
-
-            Request request = _pipeline.CreateRequest();
-
-            request.Method = HttpPipelineMethod.Get;
-
-            request.Headers.Add("Metadata", "true");
-
-            // TODO: support MSI for hosted services
-            request.UriBuilder.Uri = ImdsEndptoint;
-
-            request.UriBuilder.AppendQuery("api-version", MsiApiVersion);
-
-            request.UriBuilder.AppendQuery("resource", Uri.EscapeDataString(resource));
-
-            if (!string.IsNullOrEmpty(clientId))
-            {
-                request.UriBuilder.AppendQuery("client_id", Uri.EscapeDataString(clientId));
-            }
-
-            return request;
-        }
 
         private Request CreateClientSecretAuthRequest(string tenantId, string clientId, string clientSecret, string[] scopes)
         {

sdk/identity/Azure.Identity/src/Base64Url.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
+// Licensed under the MIT License.
 
 using System;
 using System.Text;

sdk/identity/Azure.Identity/src/ClientCertificateCredential.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for
-// license information.
+// Licensed under the MIT License.
+
 
 using Azure.Core;
 using System;
@@ -15,7 +15,7 @@ public class ClientCertificateCredential : TokenCredential
         private string _tenantId;
         private string _clientId;
         private X509Certificate2 _clientCertificate;
-        private IdentityClient _client;
+        private AadIdentityClient _client;
 
         public ClientCertificateCredential(string tenantId, string clientId, X509Certificate2 clientCertificate)
             : this(tenantId, clientId, clientCertificate, null)
@@ -30,7 +30,7 @@ public ClientCertificateCredential(string tenantId, string clientId, X509Certifi
 
             _clientCertificate = clientCertificate ?? throw new ArgumentNullException(nameof(clientCertificate));
 
-            _client = (options != null) ? new IdentityClient(options) : IdentityClient.SharedClient;
+            _client = (options != null) ? new AadIdentityClient(options) : AadIdentityClient.SharedClient;
         }
 
         public override AccessToken GetToken(string[] scopes, CancellationToken cancellationToken = default)

sdk/identity/Azure.Identity/src/ClientSecretCredential.cs

@@ -13,7 +13,7 @@ public class ClientSecretCredential : TokenCredential
         private string _tenantId;
         private string _clientId;
         private string _clientSecret;
-        private IdentityClient _client;
+        private AadIdentityClient _client;
 
 
         public ClientSecretCredential(string tenantId, string clientId, string clientSecret)
@@ -27,7 +27,7 @@ public ClientSecretCredential(string tenantId, string clientId, string clientSec
             _clientId = clientId;
             _clientSecret = clientSecret;
 
-            _client = (options != null) ? new IdentityClient(options) : IdentityClient.SharedClient;
+            _client = (options != null) ? new AadIdentityClient(options) : AadIdentityClient.SharedClient;
         }
 
         public override async Task<AccessToken> GetTokenAsync(string[] scopes, CancellationToken cancellationToken = default)