From 1894caffe1330808032f0a4f6a15ef683314c833 Mon Sep 17 00:00:00 2001 From: Jennyf19 Date: Fri, 28 May 2021 10:49:54 -0700 Subject: [PATCH 1/2] fix for response type in mergedoptions --- src/Microsoft.Identity.Web/MergedOptions.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.Identity.Web/MergedOptions.cs b/src/Microsoft.Identity.Web/MergedOptions.cs index c0122ca3d..ba7c8e99c 100644 --- a/src/Microsoft.Identity.Web/MergedOptions.cs +++ b/src/Microsoft.Identity.Web/MergedOptions.cs @@ -186,10 +186,7 @@ internal static void UpdateMergedOptionsFromMicrosoftIdentityOptions(MicrosoftId mergedOptions.ResponseMode = microsoftIdentityOptions.ResponseMode; } - if (string.IsNullOrEmpty(mergedOptions.ResponseType) && !string.IsNullOrEmpty(microsoftIdentityOptions.ResponseType)) - { - mergedOptions.ResponseType = microsoftIdentityOptions.ResponseType; - } + mergedOptions.ResponseType = microsoftIdentityOptions.ResponseType; if (string.IsNullOrEmpty(mergedOptions.ReturnUrlParameter) && !string.IsNullOrEmpty(microsoftIdentityOptions.ReturnUrlParameter)) { @@ -200,10 +197,7 @@ internal static void UpdateMergedOptionsFromMicrosoftIdentityOptions(MicrosoftId mergedOptions.SecurityTokenValidator ??= microsoftIdentityOptions.SecurityTokenValidator; mergedOptions.SendX5C = microsoftIdentityOptions.SendX5C; mergedOptions.SignedOutCallbackPath = microsoftIdentityOptions.SignedOutCallbackPath; - if (string.IsNullOrEmpty(mergedOptions.SignedOutRedirectUri) && !string.IsNullOrEmpty(microsoftIdentityOptions.SignedOutRedirectUri)) - { - mergedOptions.SignedOutRedirectUri = microsoftIdentityOptions.SignedOutRedirectUri; - } + mergedOptions.SignedOutRedirectUri = microsoftIdentityOptions.SignedOutRedirectUri; if (string.IsNullOrEmpty(mergedOptions.SignInScheme) && !string.IsNullOrEmpty(microsoftIdentityOptions.SignInScheme)) { From 8ebbe12d2971886c308c4f362d3f0537d6ed2e86 Mon Sep 17 00:00:00 2001 From: Jennyf19 Date: Fri, 28 May 2021 12:33:46 -0700 Subject: [PATCH 2/2] re-add signedout check --- src/Microsoft.Identity.Web/MergedOptions.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.Identity.Web/MergedOptions.cs b/src/Microsoft.Identity.Web/MergedOptions.cs index ba7c8e99c..ce92f01cd 100644 --- a/src/Microsoft.Identity.Web/MergedOptions.cs +++ b/src/Microsoft.Identity.Web/MergedOptions.cs @@ -197,7 +197,10 @@ internal static void UpdateMergedOptionsFromMicrosoftIdentityOptions(MicrosoftId mergedOptions.SecurityTokenValidator ??= microsoftIdentityOptions.SecurityTokenValidator; mergedOptions.SendX5C = microsoftIdentityOptions.SendX5C; mergedOptions.SignedOutCallbackPath = microsoftIdentityOptions.SignedOutCallbackPath; - mergedOptions.SignedOutRedirectUri = microsoftIdentityOptions.SignedOutRedirectUri; + if (string.IsNullOrEmpty(mergedOptions.SignedOutRedirectUri) && !string.IsNullOrEmpty(microsoftIdentityOptions.SignedOutRedirectUri)) + { + mergedOptions.SignedOutRedirectUri = microsoftIdentityOptions.SignedOutRedirectUri; + } if (string.IsNullOrEmpty(mergedOptions.SignInScheme) && !string.IsNullOrEmpty(microsoftIdentityOptions.SignInScheme)) {