diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/CHANGELOG.md b/sdk/identity/Azure.Identity.Broker/CHANGELOG.md similarity index 83% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/CHANGELOG.md rename to sdk/identity/Azure.Identity.Broker/CHANGELOG.md index 98e66dff41f73..92c23e4406225 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/CHANGELOG.md +++ b/sdk/identity/Azure.Identity.Broker/CHANGELOG.md @@ -5,11 +5,13 @@ ### Features Added ### Breaking Changes +- Renamed the `IsMsaPassthroughEnabled` property on `InteractiveBrowserCredentialBrokerOptions` to `IsLegacyMsaPassthroughEnabled`. ### Bugs Fixed ### Other Changes - Updated Microsoft.Identity.Client.Broker and Microsoft.Identity.Client.Extensions.Msal dependencies to version 4.56.0 +- Renamed assembly from `Azure.Identity.BrokeredAuthentication` to `Azure.Identity.Broker`. ## 1.0.0-beta.4 (2023-07-17) diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/Directory.Build.props b/sdk/identity/Azure.Identity.Broker/Directory.Build.props similarity index 100% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/Directory.Build.props rename to sdk/identity/Azure.Identity.Broker/Directory.Build.props diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/README.md b/sdk/identity/Azure.Identity.Broker/README.md similarity index 98% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/README.md rename to sdk/identity/Azure.Identity.Broker/README.md index 9239f9514ff13..d4ee070dd4f01 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/README.md +++ b/sdk/identity/Azure.Identity.Broker/README.md @@ -10,11 +10,11 @@ Install the Azure Identity client library for .NET with [NuGet][nuget]: ```PowerShell -dotnet add package Azure.Identity.BrokeredAuthentication --prerelease +dotnet add package Azure.Identity.Broker --prerelease ``` ### Prerequisites -* The [Azure.Identity][azure_identity] library is a dependency of Azure.Identity.BrokeredAuthentication. +* The [Azure.Identity][azure_identity] library is a dependency of Azure.Identity.Broker. ### Authenticate the client @@ -125,8 +125,8 @@ This project has adopted the [Microsoft Open Source Code of Conduct][code_of_con [azure_powerShell]: https://docs.microsoft.com/powershell/azure [azure_sub]: https://azure.microsoft.com/free/dotnet/ [azure_identity]: https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/identity/Azure.Identity/README.md -[source]: https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/identity/Azure.Identity.BrokeredAuthentication/src -[package]: https://www.nuget.org/packages?q=Azure.Identity.BrokeredAuthentication +[source]: https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/identity/Azure.Identity.Broker/src +[package]: https://www.nuget.org/packages?q=Azure.Identity.Broker [aad_doc]: https://docs.microsoft.com/azure/active-directory/ [aad_err_doc]: https://docs.microsoft.com/azure/active-directory/develop/reference-aadsts-error-codes [certificates_client_library]: https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/keyvault/Azure.Security.KeyVault.Certificates diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.netstandard2.0.cs b/sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.net462.cs similarity index 83% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.netstandard2.0.cs rename to sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.net462.cs index 9016acddfe994..78724c918f03d 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.netstandard2.0.cs +++ b/sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.net462.cs @@ -1,9 +1,9 @@ -namespace Azure.Identity.BrokeredAuthentication +namespace Azure.Identity.Broker { public partial class InteractiveBrowserCredentialBrokerOptions : Azure.Identity.InteractiveBrowserCredentialOptions { public InteractiveBrowserCredentialBrokerOptions(System.IntPtr parentWindowHandle) { } - public bool? IsMsaPassthroughEnabled { get { throw null; } set { } } + public bool? IsLegacyMsaPassthroughEnabled { get { throw null; } set { } } } public partial class SharedTokenCacheCredentialBrokerOptions : Azure.Identity.SharedTokenCacheCredentialOptions { diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net462.cs b/sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.net6.0.cs similarity index 83% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net462.cs rename to sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.net6.0.cs index 9016acddfe994..78724c918f03d 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net462.cs +++ b/sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.net6.0.cs @@ -1,9 +1,9 @@ -namespace Azure.Identity.BrokeredAuthentication +namespace Azure.Identity.Broker { public partial class InteractiveBrowserCredentialBrokerOptions : Azure.Identity.InteractiveBrowserCredentialOptions { public InteractiveBrowserCredentialBrokerOptions(System.IntPtr parentWindowHandle) { } - public bool? IsMsaPassthroughEnabled { get { throw null; } set { } } + public bool? IsLegacyMsaPassthroughEnabled { get { throw null; } set { } } } public partial class SharedTokenCacheCredentialBrokerOptions : Azure.Identity.SharedTokenCacheCredentialOptions { diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net6.0.cs b/sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.netstandard2.0.cs similarity index 83% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net6.0.cs rename to sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.netstandard2.0.cs index 9016acddfe994..78724c918f03d 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net6.0.cs +++ b/sdk/identity/Azure.Identity.Broker/api/Azure.Identity.Broker.netstandard2.0.cs @@ -1,9 +1,9 @@ -namespace Azure.Identity.BrokeredAuthentication +namespace Azure.Identity.Broker { public partial class InteractiveBrowserCredentialBrokerOptions : Azure.Identity.InteractiveBrowserCredentialOptions { public InteractiveBrowserCredentialBrokerOptions(System.IntPtr parentWindowHandle) { } - public bool? IsMsaPassthroughEnabled { get { throw null; } set { } } + public bool? IsLegacyMsaPassthroughEnabled { get { throw null; } set { } } } public partial class SharedTokenCacheCredentialBrokerOptions : Azure.Identity.SharedTokenCacheCredentialOptions { diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/src/Azure.Identity.BrokeredAuthentication.csproj b/sdk/identity/Azure.Identity.Broker/src/Azure.Identity.Broker.csproj similarity index 80% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/src/Azure.Identity.BrokeredAuthentication.csproj rename to sdk/identity/Azure.Identity.Broker/src/Azure.Identity.Broker.csproj index c0eacfb959a4f..c06f9c6448fe6 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/src/Azure.Identity.BrokeredAuthentication.csproj +++ b/sdk/identity/Azure.Identity.Broker/src/Azure.Identity.Broker.csproj @@ -1,7 +1,7 @@ This is the implementation of the Azure SDK Client Library for Azure Identity - Microsoft Azure.Identity.BrokeredAuthentication Component + Microsoft Azure.Identity.Broker Component 1.0.0-beta.5 Microsoft Azure Identity Broker;$(PackageCommonTags) $(RequiredTargetFrameworks);net462;net6.0 @@ -12,7 +12,9 @@ - + + + diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/src/InteractiveBrowserCredentialBrokerOptions.cs b/sdk/identity/Azure.Identity.Broker/src/InteractiveBrowserCredentialBrokerOptions.cs similarity index 87% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/src/InteractiveBrowserCredentialBrokerOptions.cs rename to sdk/identity/Azure.Identity.Broker/src/InteractiveBrowserCredentialBrokerOptions.cs index 3c125b7d6ca27..55c68e2282531 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/src/InteractiveBrowserCredentialBrokerOptions.cs +++ b/sdk/identity/Azure.Identity.Broker/src/InteractiveBrowserCredentialBrokerOptions.cs @@ -5,7 +5,7 @@ using Microsoft.Identity.Client; using Microsoft.Identity.Client.Broker; -namespace Azure.Identity.BrokeredAuthentication +namespace Azure.Identity.Broker { /// /// Options to configure the to use the system authentication broker in lieu of the system browser if available. @@ -18,7 +18,7 @@ public class InteractiveBrowserCredentialBrokerOptions : InteractiveBrowserCrede /// Gets or sets whether Microsoft Account (MSA) passthrough is enabled. /// /// - public bool? IsMsaPassthroughEnabled { get; set; } + public bool? IsLegacyMsaPassthroughEnabled { get; set; } /// /// Creates a new instance of to configure a . @@ -35,9 +35,9 @@ private void AddBroker(PublicClientApplicationBuilder builder) { builder.WithParentActivityOrWindow(() => _parentWindowHandle); var options = new BrokerOptions(BrokerOptions.OperatingSystems.Windows); - if (IsMsaPassthroughEnabled.HasValue) + if (IsLegacyMsaPassthroughEnabled.HasValue) { - options.MsaPassthrough = IsMsaPassthroughEnabled.Value; + options.MsaPassthrough = IsLegacyMsaPassthroughEnabled.Value; } builder.WithBroker(options); } diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/src/SharedTokenCacheCredentialBrokerOptions.cs b/sdk/identity/Azure.Identity.Broker/src/SharedTokenCacheCredentialBrokerOptions.cs similarity index 97% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/src/SharedTokenCacheCredentialBrokerOptions.cs rename to sdk/identity/Azure.Identity.Broker/src/SharedTokenCacheCredentialBrokerOptions.cs index e8daf2a073338..1c26d2e00b688 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/src/SharedTokenCacheCredentialBrokerOptions.cs +++ b/sdk/identity/Azure.Identity.Broker/src/SharedTokenCacheCredentialBrokerOptions.cs @@ -5,7 +5,7 @@ using Microsoft.Identity.Client; using Microsoft.Identity.Client.Broker; -namespace Azure.Identity.BrokeredAuthentication +namespace Azure.Identity.Broker { /// /// Options to configure the to use the system authentication broker for silent authentication if available. diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/Azure.Identity.BrokeredAuthentication.Tests.csproj b/sdk/identity/Azure.Identity.Broker/tests/Azure.Identity.Broker.Tests.csproj similarity index 92% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/tests/Azure.Identity.BrokeredAuthentication.Tests.csproj rename to sdk/identity/Azure.Identity.Broker/tests/Azure.Identity.Broker.Tests.csproj index b0dcca808e88d..c0196a9149844 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/Azure.Identity.BrokeredAuthentication.Tests.csproj +++ b/sdk/identity/Azure.Identity.Broker/tests/Azure.Identity.Broker.Tests.csproj @@ -15,11 +15,10 @@ - - + diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/InteractiveBrowserCredentialBrokerOptionsTests.cs b/sdk/identity/Azure.Identity.Broker/tests/InteractiveBrowserCredentialBrokerOptionsTests.cs similarity index 91% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/tests/InteractiveBrowserCredentialBrokerOptionsTests.cs rename to sdk/identity/Azure.Identity.Broker/tests/InteractiveBrowserCredentialBrokerOptionsTests.cs index 50dd602157f80..8142925a32835 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/InteractiveBrowserCredentialBrokerOptionsTests.cs +++ b/sdk/identity/Azure.Identity.Broker/tests/InteractiveBrowserCredentialBrokerOptionsTests.cs @@ -6,7 +6,7 @@ using Microsoft.Identity.Client; using NUnit.Framework; -namespace Azure.Identity.BrokeredAuthentication.Tests +namespace Azure.Identity.Broker.Tests { public class InteractiveBrowserCredentialBrokerOptionsTests { @@ -18,7 +18,7 @@ public void RespectsMsaPassthrough( IMsalPublicClientInitializerOptions credentialOptions; if (enableMsaPassthrough.HasValue) { - credentialOptions = new InteractiveBrowserCredentialBrokerOptions(parentWindowHandle) { IsMsaPassthroughEnabled = enableMsaPassthrough.Value } as IMsalPublicClientInitializerOptions; + credentialOptions = new InteractiveBrowserCredentialBrokerOptions(parentWindowHandle) { IsLegacyMsaPassthroughEnabled = enableMsaPassthrough.Value } as IMsalPublicClientInitializerOptions; } else { diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/ManualInteractiveBrowserCredentialBrokerTests.cs b/sdk/identity/Azure.Identity.Broker/tests/ManualInteractiveBrowserCredentialBrokerTests.cs similarity index 98% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/tests/ManualInteractiveBrowserCredentialBrokerTests.cs rename to sdk/identity/Azure.Identity.Broker/tests/ManualInteractiveBrowserCredentialBrokerTests.cs index 1deeb93c70e94..eafade7b60a92 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/ManualInteractiveBrowserCredentialBrokerTests.cs +++ b/sdk/identity/Azure.Identity.Broker/tests/ManualInteractiveBrowserCredentialBrokerTests.cs @@ -9,7 +9,7 @@ using Azure.Core; using NUnit.Framework; -namespace Azure.Identity.BrokeredAuthentication.Tests +namespace Azure.Identity.Broker.Tests { public class ManualInteractiveBrowserCredentialBrokerTests { diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/ManualSharedTokenCacheCredentialBrokerTests.cs b/sdk/identity/Azure.Identity.Broker/tests/ManualSharedTokenCacheCredentialBrokerTests.cs similarity index 97% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/tests/ManualSharedTokenCacheCredentialBrokerTests.cs rename to sdk/identity/Azure.Identity.Broker/tests/ManualSharedTokenCacheCredentialBrokerTests.cs index 99c43cfd1baa3..a438804b7e988 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/ManualSharedTokenCacheCredentialBrokerTests.cs +++ b/sdk/identity/Azure.Identity.Broker/tests/ManualSharedTokenCacheCredentialBrokerTests.cs @@ -8,7 +8,7 @@ using Azure.Core; using NUnit.Framework; -namespace Azure.Identity.BrokeredAuthentication.Tests +namespace Azure.Identity.Broker.Tests { public class ManualSharedTokenCacheCredentialBrokerTests { diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/SharedTokenCacheCredentialBrokerOptionsTests.cs b/sdk/identity/Azure.Identity.Broker/tests/SharedTokenCacheCredentialBrokerOptionsTests.cs similarity index 97% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/tests/SharedTokenCacheCredentialBrokerOptionsTests.cs rename to sdk/identity/Azure.Identity.Broker/tests/SharedTokenCacheCredentialBrokerOptionsTests.cs index 852a1d18594f0..29948d89197c0 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/SharedTokenCacheCredentialBrokerOptionsTests.cs +++ b/sdk/identity/Azure.Identity.Broker/tests/SharedTokenCacheCredentialBrokerOptionsTests.cs @@ -6,7 +6,7 @@ using Microsoft.Identity.Client; using NUnit.Framework; -namespace Azure.Identity.BrokeredAuthentication.Tests +namespace Azure.Identity.Broker.Tests { public class SharedTokenCacheCredentialBrokerOptionsTests { diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/samples/ReadmeSnippets.cs b/sdk/identity/Azure.Identity.Broker/tests/samples/ReadmeSnippets.cs similarity index 95% rename from sdk/identity/Azure.Identity.BrokeredAuthentication/tests/samples/ReadmeSnippets.cs rename to sdk/identity/Azure.Identity.Broker/tests/samples/ReadmeSnippets.cs index 65f98c3a6278b..e7869cdc9e03b 100644 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/tests/samples/ReadmeSnippets.cs +++ b/sdk/identity/Azure.Identity.Broker/tests/samples/ReadmeSnippets.cs @@ -3,7 +3,7 @@ using System; using System.Runtime.InteropServices; -using Azure.Identity.BrokeredAuthentication; +using Azure.Identity.Broker; using Azure.Security.KeyVault.Secrets; using NUnit.Framework; diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net461.cs b/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net461.cs deleted file mode 100644 index e3d5ea828fa8d..0000000000000 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.net461.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Azure.Identity.BrokeredAuthentication -{ - public partial class InteractiveBrowserCredentialBrokerOptions : Azure.Identity.InteractiveBrowserCredentialOptions - { - public InteractiveBrowserCredentialBrokerOptions() { } - } - public partial class SharedTokenCacheCredentialBrokerOptions : Azure.Identity.SharedTokenCacheCredentialOptions - { - public SharedTokenCacheCredentialBrokerOptions() { } - public SharedTokenCacheCredentialBrokerOptions(Azure.Identity.TokenCachePersistenceOptions tokenCacheOptions) { } - } -} diff --git a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.netcoreapp3.1.cs b/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.netcoreapp3.1.cs deleted file mode 100644 index e981f65bb80bb..0000000000000 --- a/sdk/identity/Azure.Identity.BrokeredAuthentication/api/Azure.Identity.BrokeredAuthentication.netcoreapp3.1.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Azure.Identity.BrokeredAuthentication -{ - public partial class InteractiveBrowserCredentialBrokerOptions : Azure.Identity.InteractiveBrowserCredentialOptions - { - public InteractiveBrowserCredentialBrokerOptions(System.IntPtr parentWindowHandle) { } - } - public partial class SharedTokenCacheCredentialBrokerOptions : Azure.Identity.SharedTokenCacheCredentialOptions - { - public SharedTokenCacheCredentialBrokerOptions() { } - public SharedTokenCacheCredentialBrokerOptions(Azure.Identity.TokenCachePersistenceOptions tokenCacheOptions) { } - } -} diff --git a/sdk/identity/Azure.Identity.sln b/sdk/identity/Azure.Identity.sln index e7addc6a1628e..124c49aa5a1b3 100644 --- a/sdk/identity/Azure.Identity.sln +++ b/sdk/identity/Azure.Identity.sln @@ -13,9 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Identity.Perf", "Azur EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Test.Perf", "..\..\common\Perf\Azure.Test.Perf\Azure.Test.Perf.csproj", "{D181301A-2FA4-420D-963F-529445E61409}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Identity.BrokeredAuthentication", "Azure.Identity.BrokeredAuthentication\src\Azure.Identity.BrokeredAuthentication.csproj", "{2337B615-724F-4ED7-8929-B1AF89815D30}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Identity.Broker", "Azure.Identity.Broker\src\Azure.Identity.Broker.csproj", "{2337B615-724F-4ED7-8929-B1AF89815D30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Identity.BrokeredAuthentication.Tests", "Azure.Identity.BrokeredAuthentication\tests\Azure.Identity.BrokeredAuthentication.Tests.csproj", "{5F72962A-E4A5-4DBD-BA00-AB5B7725CACA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.Identity.Broker.Tests", "Azure.Identity.Broker\tests\Azure.Identity.Broker.Tests.csproj", "{5F72962A-E4A5-4DBD-BA00-AB5B7725CACA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Azure.Core", "..\core\Azure.Core\src\Azure.Core.csproj", "{B8BF1ED4-DD68-4504-9060-008D1A980958}" EndProject diff --git a/sdk/identity/Azure.Identity/TROUBLESHOOTING.md b/sdk/identity/Azure.Identity/TROUBLESHOOTING.md index d8441ac5d9bdc..762519207ce9d 100644 --- a/sdk/identity/Azure.Identity/TROUBLESHOOTING.md +++ b/sdk/identity/Azure.Identity/TROUBLESHOOTING.md @@ -350,7 +350,7 @@ If you choose "Use another account" and type in an MSA outlook.com account, it f ![Fail on use another account](./images/MSA2.png) -Since version `1.0.0-beta.4` of [Azure.Identity.BrokeredAuthentication](https://www.nuget.org/packages/Azure.Identity.BrokeredAuthentication), you can set the `IsMsaPassthroughEnabled` property on `InteractiveBrowserCredentialBrokerOptions` or `SharedTokenCacheCredentialBrokerOptions` to `true`. MSA outlook.com accounts that are logged in to Windows are automatically listed: +Since version `1.0.0-beta.4` of [Azure.Identity.Broker](https://www.nuget.org/packages/Azure.Identity.BrokeredAuthentication), you can set the `IsMsaPassthroughEnabled` property on `InteractiveBrowserCredentialBrokerOptions` or `SharedTokenCacheCredentialBrokerOptions` to `true`. MSA outlook.com accounts that are logged in to Windows are automatically listed: ![Enable MSA](./images/MSA3.png) diff --git a/sdk/identity/Azure.Identity/src/FriendAttribute.cs b/sdk/identity/Azure.Identity/src/FriendAttribute.cs new file mode 100644 index 0000000000000..7480b7a44b6df --- /dev/null +++ b/sdk/identity/Azure.Identity/src/FriendAttribute.cs @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System; + +namespace Azure +{ + [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] + internal class FriendAttribute : Attribute + { + public FriendAttribute(string friendAssembly) + { + FriendAssembly = friendAssembly; + } + + public string FriendAssembly { get; } + } +} diff --git a/sdk/identity/Azure.Identity/src/IMsalPublicClientInitializerOptions.cs b/sdk/identity/Azure.Identity/src/IMsalPublicClientInitializerOptions.cs index 3fe7031b56c7a..a5556f7fb43b4 100644 --- a/sdk/identity/Azure.Identity/src/IMsalPublicClientInitializerOptions.cs +++ b/sdk/identity/Azure.Identity/src/IMsalPublicClientInitializerOptions.cs @@ -2,12 +2,11 @@ // Licensed under the MIT License. using System; -using System.Collections.Generic; -using System.Text; using Microsoft.Identity.Client; namespace Azure.Identity { + [Friend("Azure.Identity.Broker")] internal interface IMsalPublicClientInitializerOptions { Action BeforeBuildClient { get; } diff --git a/sdk/identity/Azure.Identity/src/Properties/AssemblyInfo.cs b/sdk/identity/Azure.Identity/src/Properties/AssemblyInfo.cs index 2712cf99a3651..99911f6b5d298 100644 --- a/sdk/identity/Azure.Identity/src/Properties/AssemblyInfo.cs +++ b/sdk/identity/Azure.Identity/src/Properties/AssemblyInfo.cs @@ -5,6 +5,8 @@ [assembly: InternalsVisibleTo("Microsoft.Extensions.Azure.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] [assembly: InternalsVisibleTo("Azure.Identity.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] +[assembly: InternalsVisibleTo("Azure.Identity.Broker, PublicKey=0024000004800000940000000602000000240000525341310004000001000100097ad52abbeaa2e1a1982747cc0106534f65cfea6707eaed696a3a63daea80de2512746801a7e47f88e7781e71af960d89ba2e25561f70b0e2dbc93319e0af1961a719ccf5a4d28709b2b57a5d29b7c09dc8d269a490ebe2651c4b6e6738c27c5fb2c02469fe9757f0a3479ac310d6588a50a28d7dd431b907fd325e18b9e8ed")] +[assembly: InternalsVisibleTo("Azure.Identity.Broker.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] [assembly: InternalsVisibleTo("Azure.Identity.BrokeredAuthentication, PublicKey=0024000004800000940000000602000000240000525341310004000001000100097ad52abbeaa2e1a1982747cc0106534f65cfea6707eaed696a3a63daea80de2512746801a7e47f88e7781e71af960d89ba2e25561f70b0e2dbc93319e0af1961a719ccf5a4d28709b2b57a5d29b7c09dc8d269a490ebe2651c4b6e6738c27c5fb2c02469fe9757f0a3479ac310d6588a50a28d7dd431b907fd325e18b9e8ed")] [assembly: InternalsVisibleTo("Azure.Identity.BrokeredAuthentication.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100d15ddcb29688295338af4b7686603fe614abd555e09efba8fb88ee09e1f7b1ccaeed2e8f823fa9eef3fdd60217fc012ea67d2479751a0b8c087a4185541b851bd8b16f8d91b840e51b1cb0ba6fe647997e57429265e85ef62d565db50a69ae1647d54d7bd855e4db3d8a91510e5bcbd0edfbbecaa20a7bd9ae74593daa7b11b4")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/sdk/identity/ci.yml b/sdk/identity/ci.yml index cd28a91ca2886..78ef81ce315df 100644 --- a/sdk/identity/ci.yml +++ b/sdk/identity/ci.yml @@ -29,5 +29,5 @@ extends: Artifacts: - name: Azure.Identity safeName: AzureIdentity - - name: Azure.Identity.BrokeredAuthentication - safeName: AzureIdentityBrokeredAuthentication + - name: Azure.Identity.Broker + safeName: AzureIdentityBroker