Merge branch 'dev-v7' into temp8

# Conflicts: # src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
2019-02-14 18:14:46 +01:00
parent 46b5c18cc5 3a469cdc77
commit 5a482a49bf
1 changed files with 5 additions and 0 deletions
--- a/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
+++ b/src/Umbraco.Web/Security/BackOfficeCookieAuthenticationProvider.cs
@@ -96,6 +96,11 @@ namespace Umbraco.Web.Security

            await EnsureValidSessionId(context);

+            if (context?.Identity == null)
+            {
+                context?.OwinContext.Authentication.SignOut(context.Options.AuthenticationType);
+                return;
+            }
            await base.ValidateIdentity(context);
        }