Don't mutate options, but instread keep changes in new prop

Keegan Caruso · Keegan Caruso · commit d54745c61756 · 2024-11-22T14:30:26.000-08:00
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs b/src/Microsoft.Identity.Web.TokenAcquisition/MergedOptions.cs
@@ -55,127 +55,12 @@ public ConfidentialClientApplicationOptions ConfidentialClientApplicationOptions
         // This is for supporting for CIAM authorities including custom url domains, see https://github.com/AzureAD/microsoft-identity-web/issues/2690
         internal bool PreserveAuthority { get; set; }
 
-        internal MergedOptions()
-        {
-            
-        }
-
-        internal MergedOptions(MergedOptions other)
-        {
-            _confidentialClientApplicationOptions = other._confidentialClientApplicationOptions;
-            AadAuthorityAudience = other.AadAuthorityAudience;
-            AppHomeTenantId = other.AppHomeTenantId;
-            AzureCloudInstance = other.AzureCloudInstance;
-            AzureRegion = other.AzureRegion;
-            ClientCapabilities = other.ClientCapabilities?.ToList();
-            ClientName = other.ClientName;
-            ClientVersion = other.ClientVersion;
-            Component = other.Component;
-            EnablePiiLogging = other.EnablePiiLogging;
-            IsDefaultPlatformLoggingEnabled = other.IsDefaultPlatformLoggingEnabled;
-            LogLevel = other.LogLevel;
-            RedirectUri = other.RedirectUri;
-            EnableCacheSynchronization = other.EnableCacheSynchronization;
-            MergedWithCca = other.MergedWithCca;
-            PreserveAuthority = other.PreserveAuthority;
-
-            // Copy properties from MicrosoftIdentityOptions
-            Instance = other.Instance;
-            TenantId = other.TenantId;
-            Domain = other.Domain;
-            EditProfilePolicyId = other.EditProfilePolicyId;
-            SignUpSignInPolicyId = other.SignUpSignInPolicyId;
-            ResetPasswordPolicyId = other.ResetPasswordPolicyId;
-            LegacyCacheCompatibilityEnabled = other.LegacyCacheCompatibilityEnabled;
-            ClientCertificates = other.ClientCertificates?.ToList();
-            TokenDecryptionCertificates = other.TokenDecryptionCertificates?.ToList();
-            ClientCredentials = other.ClientCredentials?.ToList();
-            TokenDecryptionCredentials = other.TokenDecryptionCredentials?.ToList();
-            SendX5C = other.SendX5C;
-            WithSpaAuthCode = other.WithSpaAuthCode;
-            AllowWebApiToBeAuthorizedByACL = other.AllowWebApiToBeAuthorizedByACL;
-            UserAssignedManagedIdentityClientId = other.UserAssignedManagedIdentityClientId;
-            ClientCredentialsUsingManagedIdentity = other.ClientCredentialsUsingManagedIdentity;
-            ResetPasswordPath = other.ResetPasswordPath;
-            ErrorPath = other.ErrorPath;
-            ExtraQueryParameters = other.ExtraQueryParameters?.ToDictionary(entry => entry.Key, entry => entry.Value);
+        /// <summary>
+        /// Id Web will modify the instance so that it can be used by MSAL.
+        /// This modifies this property so that the original value is not changed.
+        /// </summary>
+        internal string? PreparedInstance { get; set; }
 
-#if !NETSTANDARD2_0 && !NETFRAMEWORK
-            // OpenIdConnectOptions
-            Authority = other.Authority;
-            ClientId = other.ClientId;
-            ClientSecret = other.ClientSecret;
-            Configuration = other.Configuration;
-            ConfigurationManager = other.ConfigurationManager;
-            GetClaimsFromUserInfoEndpoint = other.GetClaimsFromUserInfoEndpoint;
-            RequireHttpsMetadata = other.RequireHttpsMetadata;
-            MetadataAddress = other.MetadataAddress;
-            Events = other.Events;
-            MaxAge = other.MaxAge;
-            ProtocolValidator = other.ProtocolValidator;
-            SignedOutCallbackPath = other.SignedOutCallbackPath;
-            SignedOutRedirectUri = other.SignedOutRedirectUri;
-            RefreshOnIssuerKeyNotFound = other.RefreshOnIssuerKeyNotFound;
-            AuthenticationMethod = other.AuthenticationMethod;
-            this.Resource = other.Resource;
-            ResponseMode = other.ResponseMode;
-            ResponseType = other.ResponseType;
-            Prompt = other.Prompt;
-            RemoteSignOutPath = other.RemoteSignOutPath;
-            SignOutScheme = other.SignOutScheme;
-            StateDataFormat = other.StateDataFormat;
-            StringDataFormat = other.StringDataFormat;
-#pragma warning disable CS0618
-            SecurityTokenValidator = other.SecurityTokenValidator;
-#pragma warning restore CS0618
-            TokenValidationParameters = other.TokenValidationParameters;
-            UseTokenLifetime = other.UseTokenLifetime;
-            SkipUnrecognizedRequests = other.SkipUnrecognizedRequests;
-            DisableTelemetry = other.DisableTelemetry;
-            NonceCookie = other.NonceCookie;
-            UsePkce = other.UsePkce;
-            AutomaticRefreshInterval = other.AutomaticRefreshInterval;
-            RefreshInterval = other.RefreshInterval;
-            MapInboundClaims = other.MapInboundClaims;
-
-            // Copy collections
-            foreach (var scope in other.Scope)
-            {
-                Scope.Add(scope);
-            }
-
-            foreach (var claimAction in other.ClaimActions)
-            {
-                ClaimActions.Add(claimAction);
-            }
-
-            // RemoteAuthenticationOptions
-            BackchannelTimeout = other.BackchannelTimeout;
-            BackchannelHttpHandler = other.BackchannelHttpHandler;
-            Backchannel = other.Backchannel;
-            DataProtectionProvider = other.DataProtectionProvider;
-            CallbackPath = other.CallbackPath;
-            AccessDeniedPath = other.AccessDeniedPath;
-            ReturnUrlParameter = other.ReturnUrlParameter;
-            SignInScheme = other.SignInScheme;
-            RemoteAuthenticationTimeout = other.RemoteAuthenticationTimeout;
-            Events = other.Events;
-            SaveTokens = other.SaveTokens;
-            CorrelationCookie = other.CorrelationCookie;
-
-            // AuthenticationSchemeOptions
-            ClaimsIssuer = other.ClaimsIssuer;
-            Events = other.Events;
-            EventsType = other.EventsType;
-            ForwardDefault = other.ForwardDefault;
-            ForwardAuthenticate = other.ForwardAuthenticate;
-            ForwardChallenge = other.ForwardChallenge;
-            ForwardForbid = other.ForwardForbid;
-            ForwardSignIn = other.ForwardSignIn;
-            ForwardSignOut = other.ForwardSignOut;
-            ForwardDefaultSelector = other.ForwardDefaultSelector;
-#endif 
-        }
 
 
         internal static void UpdateMergedOptionsFromMicrosoftIdentityOptions(MicrosoftIdentityOptions microsoftIdentityOptions, MergedOptions mergedOptions)
@@ -591,14 +476,14 @@ public void PrepareAuthorityInstanceForMsal()
             if (IsB2C && Instance.EndsWith("/tfp/", StringComparison.OrdinalIgnoreCase))
             {
 #if !NETSTANDARD2_0 && !NET462 && !NET472
-                Instance = Instance.Replace("/tfp/", string.Empty, StringComparison.OrdinalIgnoreCase).TrimEnd('/') + "/";
+                PreparedInstance = Instance.Replace("/tfp/", string.Empty, StringComparison.OrdinalIgnoreCase).TrimEnd('/') + "/";
 #else
-                Instance = Instance.Replace("/tfp/", string.Empty).TrimEnd('/') + "/";
+                PreparedInstance = Instance.Replace("/tfp/", string.Empty).TrimEnd('/') + "/";
 #endif
             }
             else
             {
-                Instance = Instance.TrimEnd('/') + "/";
+                PreparedInstance = Instance.TrimEnd('/') + "/";
             }
         }
 
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net462/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net462/InternalAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.get -> string?
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.set -> void
 Microsoft.Identity.Web.MergedOptions.MergedOptions(Microsoft.Identity.Web.MergedOptions! other) -> void
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.get -> string?
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.set -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForApp(Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions) -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForTestUser(Microsoft.Identity.Client.AcquireTokenByUsernameAndPasswordConfidentialParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions, System.Security.Claims.ClaimsPrincipal! user) -> void
 readonly Microsoft.Identity.Web.TokenAcquisition.tokenAcquisitionExtensionOptionsMonitor -> Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Identity.Web.TokenAcquisitionExtensionOptions!>?
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net472/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net472/InternalAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.get -> string?
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.set -> void
 Microsoft.Identity.Web.MergedOptions.MergedOptions(Microsoft.Identity.Web.MergedOptions! other) -> void
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.get -> string?
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.set -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForApp(Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions) -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForTestUser(Microsoft.Identity.Client.AcquireTokenByUsernameAndPasswordConfidentialParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions, System.Security.Claims.ClaimsPrincipal! user) -> void
 readonly Microsoft.Identity.Web.TokenAcquisition.tokenAcquisitionExtensionOptionsMonitor -> Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Identity.Web.TokenAcquisitionExtensionOptions!>?
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net6.0/InternalAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.get -> string?
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.set -> void
 Microsoft.Identity.Web.MergedOptions.MergedOptions(Microsoft.Identity.Web.MergedOptions! other) -> void
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.get -> string?
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.set -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForApp(Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions) -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForTestUser(Microsoft.Identity.Client.AcquireTokenByUsernameAndPasswordConfidentialParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions, System.Security.Claims.ClaimsPrincipal! user) -> void
 readonly Microsoft.Identity.Web.TokenAcquisition.tokenAcquisitionExtensionOptionsMonitor -> Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Identity.Web.TokenAcquisitionExtensionOptions!>?
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net7.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net7.0/InternalAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.get -> string?
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.set -> void
 Microsoft.Identity.Web.MergedOptions.MergedOptions(Microsoft.Identity.Web.MergedOptions! other) -> void
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.get -> string?
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.set -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForApp(Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions) -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForTestUser(Microsoft.Identity.Client.AcquireTokenByUsernameAndPasswordConfidentialParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions, System.Security.Claims.ClaimsPrincipal! user) -> void
 readonly Microsoft.Identity.Web.TokenAcquisition.tokenAcquisitionExtensionOptionsMonitor -> Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Identity.Web.TokenAcquisitionExtensionOptions!>?
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net8.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net8.0/InternalAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.get -> string?
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.set -> void
 Microsoft.Identity.Web.MergedOptions.MergedOptions(Microsoft.Identity.Web.MergedOptions! other) -> void
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.get -> string?
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.set -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForApp(Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions) -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForTestUser(Microsoft.Identity.Client.AcquireTokenByUsernameAndPasswordConfidentialParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions, System.Security.Claims.ClaimsPrincipal! user) -> void
 readonly Microsoft.Identity.Web.TokenAcquisition.tokenAcquisitionExtensionOptionsMonitor -> Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Identity.Web.TokenAcquisitionExtensionOptions!>?
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net9.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/net9.0/InternalAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.get -> string?
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.set -> void
 Microsoft.Identity.Web.MergedOptions.MergedOptions(Microsoft.Identity.Web.MergedOptions! other) -> void
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.get -> string?
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.set -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForApp(Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions) -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForTestUser(Microsoft.Identity.Client.AcquireTokenByUsernameAndPasswordConfidentialParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions, System.Security.Claims.ClaimsPrincipal! user) -> void
 readonly Microsoft.Identity.Web.TokenAcquisition.tokenAcquisitionExtensionOptionsMonitor -> Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Identity.Web.TokenAcquisitionExtensionOptions!>?
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/netstandard2.0/InternalAPI.Unshipped.txt b/src/Microsoft.Identity.Web.TokenAcquisition/PublicAPI/netstandard2.0/InternalAPI.Unshipped.txt
@@ -2,6 +2,8 @@
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.get -> string?
 Microsoft.Identity.Web.MergedOptions.AppHomeTenantId.set -> void
 Microsoft.Identity.Web.MergedOptions.MergedOptions(Microsoft.Identity.Web.MergedOptions! other) -> void
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.get -> string?
+Microsoft.Identity.Web.MergedOptions.PreparedInstance.set -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForApp(Microsoft.Identity.Client.AcquireTokenForClientParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions) -> void
 Microsoft.Identity.Web.TokenAcquisitionExtensionOptions.InvokeOnBeforeTokenAcquisitionForTestUser(Microsoft.Identity.Client.AcquireTokenByUsernameAndPasswordConfidentialParameterBuilder! builder, Microsoft.Identity.Abstractions.AcquireTokenOptions? acquireTokenOptions, System.Security.Claims.ClaimsPrincipal! user) -> void
 readonly Microsoft.Identity.Web.TokenAcquisition.tokenAcquisitionExtensionOptionsMonitor -> Microsoft.Extensions.Options.IOptionsMonitor<Microsoft.Identity.Web.TokenAcquisitionExtensionOptions!>?
diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.cs b/src/Microsoft.Identity.Web.TokenAcquisition/TokenAcquisition.cs
@@ -157,7 +157,7 @@ public async Task<AcquireTokenResult> AddAccountToCacheFromAuthorizationCodeAsyn
                 if (mergedOptions.IsB2C)
                 {
 
-                    var authority = $"{mergedOptions.Instance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{authCodeRedemptionParameters.UserFlow ?? mergedOptions.DefaultUserFlow}";
+                    var authority = $"{mergedOptions.PreparedInstance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{authCodeRedemptionParameters.UserFlow ?? mergedOptions.DefaultUserFlow}";
                     builder.WithB2CAuthority(authority);
                 }
 
@@ -754,12 +754,8 @@ private bool IsInvalidClientCertificateOrSignedAssertionError(MsalServiceExcepti
         /// </summary>
         private async Task<IConfidentialClientApplication> BuildConfidentialClientApplicationAsync(MergedOptions mergedOptions)
         {
-            // PrepareAuthorityInstanceForMsal modifies the object, this can affect other operations.
-            // Make a copy and the modify the copy.
-            var copiedOption = new MergedOptions(mergedOptions);
-            copiedOption.PrepareAuthorityInstanceForMsal();
-
-            return await BuildConfidentialClientApplicationImplementationAsync(copiedOption);
+            mergedOptions.PrepareAuthorityInstanceForMsal();
+            return await BuildConfidentialClientApplicationImplementationAsync(mergedOptions);
         }
 
         private async Task<IConfidentialClientApplication> BuildConfidentialClientApplicationImplementationAsync(MergedOptions mergedOptions)
@@ -797,12 +793,12 @@ private async Task<IConfidentialClientApplication> BuildConfidentialClientApplic
                 }
                 else if (mergedOptions.IsB2C)
                 {
-                    authority = $"{mergedOptions.Instance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{mergedOptions.DefaultUserFlow}";
+                    authority = $"{mergedOptions.PreparedInstance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{mergedOptions.DefaultUserFlow}";
                     builder.WithB2CAuthority(authority);
                 }
                 else
                 {
-                    authority = $"{mergedOptions.Instance}{mergedOptions.TenantId}/";
+                    authority = $"{mergedOptions.PreparedInstance}{mergedOptions.TenantId}/";
                     builder.WithAuthority(authority);
                 }
 
diff --git a/tests/Microsoft.Identity.Web.Test/MergedOptionsTests.cs b/tests/Microsoft.Identity.Web.Test/MergedOptionsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public async Task<AcquireTokenResult> AddAccountToCacheFromAuthorizationCodeAsyn`
`157`	`157`	`if (mergedOptions.IsB2C)`
`158`	`158`	`{`
`159`	`159`
`160`		`- var authority = $"{mergedOptions.Instance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{authCodeRedemptionParameters.UserFlow ?? mergedOptions.DefaultUserFlow}";`
	`160`	`+ var authority = $"{mergedOptions.PreparedInstance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{authCodeRedemptionParameters.UserFlow ?? mergedOptions.DefaultUserFlow}";`
`161`	`161`	`builder.WithB2CAuthority(authority);`
`162`	`162`	`}`
`163`	`163`
`@@ -754,12 +754,8 @@ private bool IsInvalidClientCertificateOrSignedAssertionError(MsalServiceExcepti`
`754`	`754`	`/// </summary>`
`755`	`755`	`private async Task<IConfidentialClientApplication> BuildConfidentialClientApplicationAsync(MergedOptions mergedOptions)`
`756`	`756`	`{`
`757`		`- // PrepareAuthorityInstanceForMsal modifies the object, this can affect other operations.`
`758`		`- // Make a copy and the modify the copy.`
`759`		`- var copiedOption = new MergedOptions(mergedOptions);`
`760`		`- copiedOption.PrepareAuthorityInstanceForMsal();`
`761`		`-`
`762`		`- return await BuildConfidentialClientApplicationImplementationAsync(copiedOption);`
	`757`	`+ mergedOptions.PrepareAuthorityInstanceForMsal();`
	`758`	`+ return await BuildConfidentialClientApplicationImplementationAsync(mergedOptions);`
`763`	`759`	`}`
`764`	`760`
`765`	`761`	`private async Task<IConfidentialClientApplication> BuildConfidentialClientApplicationImplementationAsync(MergedOptions mergedOptions)`
`@@ -797,12 +793,12 @@ private async Task<IConfidentialClientApplication> BuildConfidentialClientApplic`
`797`	`793`	`}`
`798`	`794`	`else if (mergedOptions.IsB2C)`
`799`	`795`	`{`
`800`		`- authority = $"{mergedOptions.Instance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{mergedOptions.DefaultUserFlow}";`
	`796`	`+ authority = $"{mergedOptions.PreparedInstance}{ClaimConstants.Tfp}/{mergedOptions.Domain}/{mergedOptions.DefaultUserFlow}";`
`801`	`797`	`builder.WithB2CAuthority(authority);`
`802`	`798`	`}`
`803`	`799`	`else`
`804`	`800`	`{`
`805`		`- authority = $"{mergedOptions.Instance}{mergedOptions.TenantId}/";`
	`801`	`+ authority = $"{mergedOptions.PreparedInstance}{mergedOptions.TenantId}/";`
`806`	`802`	`builder.WithAuthority(authority);`
`807`	`803`	`}`
`808`	`804`