Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#6643] WithManagedIdentity is experimental and not exist in Microsoft.Identity.Client 4.51.0 #6686

Merged
merged 4 commits into from
Sep 19, 2023
Merged

[#6643] WithManagedIdentity is experimental and not exist in Microsoft.Identity.Client 4.51.0 #6686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a5fb7b
Update MSI implementation
sw-joelmut Aug 24, 2023
7f45f6a
Merge branch 'main' into southworks/update/msi-implementation
sw-joelmut Aug 25, 2023
68f252f
Merge branch 'main' into southworks/update/msi-implementation
sw-joelmut Sep 18, 2023
b158a9c
Fix unit tests
sw-joelmut Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions libraries/Microsoft.Bot.Connector/Authentication/ManagedIdentityAuthenticator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Identity.Client;
using Microsoft.Identity.Client.AppConfig;

namespace Microsoft.Bot.Connector.Authentication
{
Expand All @@ -16,10 +17,9 @@ namespace Microsoft.Bot.Connector.Authentication
/// </summary>
public class ManagedIdentityAuthenticator : IAuthenticator
{
private readonly string _appId;
private readonly string _resource;
private readonly ILogger _logger;
private readonly IConfidentialClientApplication _clientApplication;
private readonly IManagedIdentityApplication _clientApplication;

/// <summary>
/// Initializes a new instance of the <see cref="ManagedIdentityAuthenticator"/> class.
Expand All @@ -40,7 +40,6 @@ public ManagedIdentityAuthenticator(string appId, string resource, HttpClient cu
throw new ArgumentNullException(nameof(resource));
}

_appId = appId;
_resource = resource;
_logger = logger ?? NullLogger.Instance;
_clientApplication = CreateClientApplication(appId, customHttpClient);
Expand All @@ -63,10 +62,8 @@ public async Task<AuthenticatorResult> GetTokenAsync(bool forceRefresh = false)

private async Task<AuthenticatorResult> AcquireTokenAsync(bool forceRefresh)
{
var scopes = new string[] { $"{_resource}/.default" };
var authResult = await _clientApplication
.AcquireTokenForClient(scopes)
.WithManagedIdentity(_appId)
.AcquireTokenForManagedIdentity(_resource)
.WithForceRefresh(forceRefresh)
.ExecuteAsync()
.ConfigureAwait(false);
Expand All @@ -86,10 +83,9 @@ private RetryParams HandleTokenProviderException(Exception e, int retryCount)
: RetryParams.DefaultBackOff(retryCount);
}

private IConfidentialClientApplication CreateClientApplication(string appId, HttpClient customHttpClient = null)
private IManagedIdentityApplication CreateClientApplication(string appId, HttpClient customHttpClient = null)
{
var clientBuilder = ConfidentialClientApplicationBuilder.Create(appId)
.WithExperimentalFeatures();
var clientBuilder = ManagedIdentityApplicationBuilder.Create(ManagedIdentityId.WithUserAssignedClientId(appId));

if (customHttpClient != null)
{
Expand Down
2 changes: 1 addition & 1 deletion libraries/Microsoft.Bot.Connector/Microsoft.Bot.Connector.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.50.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.55.0" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="5.6.0" />
<PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.24" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
18 changes: 9 additions & 9 deletions tests/Microsoft.Bot.Connector.Tests/Authentication/ManagedIdentityAuthenticatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ namespace Microsoft.Bot.Connector.Tests.Authentication
{
public class ManagedIdentityAuthenticatorTests
{
private const string TestAppId = "foo";
private const string TestAudience = "bar";
private readonly Func<string, string> appId = (id) => $"id {id} ";
private readonly Func<string, string> audience = (id) => $"audience {id} ";

[Fact]
public void CanGetJwtToken()
Expand All @@ -37,17 +37,17 @@ public void CanGetJwtToken()
.ReturnsAsync(response);
var httpClient = new HttpClient(mockHttpMessageHandler.Object);

var sut = new ManagedIdentityAuthenticator(TestAppId, TestAudience, httpClient);
var sut = new ManagedIdentityAuthenticator(appId(nameof(CanGetJwtToken)), audience(nameof(CanGetJwtToken)), httpClient);
var token = sut.GetTokenAsync().GetAwaiter().GetResult();

Assert.Equal("at_secret", token.AccessToken);
Assert.Equal(expiresOn, token.ExpiresOn.ToUnixTimeSeconds());
}

[Theory]
[InlineData(false)]
[InlineData(true)]
public void CanGetJwtTokenWithForceRefresh(bool forceRefreshInput)
[InlineData(false, 1)]
[InlineData(true, 2)]
public void CanGetJwtTokenWithForceRefresh(bool forceRefreshInput, int index)
{
var response = new HttpResponseMessage(HttpStatusCode.OK);
var expiresOn = DateTimeOffset.Now.ToUnixTimeSeconds() + 10000;
Expand All @@ -64,7 +64,7 @@ public void CanGetJwtTokenWithForceRefresh(bool forceRefreshInput)
.ReturnsAsync(response);
var httpClient = new HttpClient(mockHttpMessageHandler.Object);

var sut = new ManagedIdentityAuthenticator(TestAppId, TestAudience, httpClient);
var sut = new ManagedIdentityAuthenticator(appId(nameof(CanGetJwtTokenWithForceRefresh)) + index, audience(nameof(CanGetJwtTokenWithForceRefresh)) + index, httpClient);
var token = sut.GetTokenAsync(forceRefreshInput).GetAwaiter().GetResult();

Assert.Equal("at_secret", token.AccessToken);
Expand All @@ -86,7 +86,7 @@ public void DefaultRetryOnException()
});
var httpClient = new HttpClient(mockHttpMessageHandler.Object);

var sut = new ManagedIdentityAuthenticator(TestAppId, TestAudience, httpClient);
var sut = new ManagedIdentityAuthenticator(appId(nameof(DefaultRetryOnException)), audience(nameof(DefaultRetryOnException)), httpClient);

try
{
Expand Down Expand Up @@ -130,7 +130,7 @@ public void CanRetryAndAcquireToken()
});
var httpClient = new HttpClient(mockHttpMessageHandler.Object);

var sut = new ManagedIdentityAuthenticator(TestAppId, TestAudience, httpClient);
var sut = new ManagedIdentityAuthenticator(appId(nameof(CanRetryAndAcquireToken)), audience(nameof(CanRetryAndAcquireToken)), httpClient);
var token = sut.GetTokenAsync().GetAwaiter().GetResult();

Assert.Equal("at_secret", token.AccessToken);
Expand Down
Loading