Skip to content

Commit f25cdbd

Browse files
author
Tiago Brenck
authored
Merge pull request #261 from Azure-Samples/tibre/sameSiteCookieFix
Same site cookie fix
2 parents 2881976 + f03525e commit f25cdbd

31 files changed

+149
-29
lines changed

1-WebApp-OIDC/1-1-MyOrg/Startup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ public void ConfigureServices(IServiceCollection services)
2626
{
2727
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
2828
options.CheckConsentNeeded = context => true;
29-
options.MinimumSameSitePolicy = SameSiteMode.None;
29+
options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
30+
// Handling SameSite cookie according to https://docs.microsoft.com/en-us/aspnet/core/security/samesite?view=aspnetcore-3.1
31+
options.HandleSameSiteCookieCompatibility();
3032
});
3133

3234
// Sign-in users with the Microsoft identity platform

1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
66
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
77
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>

1-WebApp-OIDC/1-2-AnyOrg/Startup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ public void ConfigureServices(IServiceCollection services)
2626
{
2727
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
2828
options.CheckConsentNeeded = context => true;
29-
options.MinimumSameSitePolicy = SameSiteMode.None;
29+
options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
30+
// Handling SameSite cookie according to https://docs.microsoft.com/en-us/aspnet/core/security/samesite?view=aspnetcore-3.1
31+
options.HandleSameSiteCookieCompatibility();
3032
});
3133

3234
// Sign-in users with the Microsoft identity platform

1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
66
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
77
</PropertyGroup>

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/Startup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public void ConfigureServices(IServiceCollection services)
2727
{
2828
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
2929
options.CheckConsentNeeded = context => true;
30-
options.MinimumSameSitePolicy = SameSiteMode.None;
30+
options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
31+
// Handling SameSite cookie according to https://docs.microsoft.com/en-us/aspnet/core/security/samesite?view=aspnetcore-3.1
32+
options.HandleSameSiteCookieCompatibility();
3133
});
3234

3335
// Sign-in users with the Microsoft identity platform

1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
66
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
77
</PropertyGroup>

1-WebApp-OIDC/1-4-Sovereign/Startup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ public void ConfigureServices(IServiceCollection services)
2727
{
2828
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
2929
options.CheckConsentNeeded = context => true;
30-
options.MinimumSameSitePolicy = SameSiteMode.None;
30+
options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
31+
// Handling SameSite cookie according to https://docs.microsoft.com/en-us/aspnet/core/security/samesite?view=aspnetcore-3.1
32+
options.HandleSameSiteCookieCompatibility();
3133
});
3234

3335
// Sign-in users with the Microsoft identity platform

1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
66
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
77
</PropertyGroup>

1-WebApp-OIDC/1-5-B2C/Startup.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3030
using Microsoft.Extensions.Configuration;
3131
using Microsoft.Extensions.DependencyInjection;
3232
using Microsoft.Extensions.Hosting;
33+
using Microsoft.Identity.Web;
3334

3435
namespace WebApp_OpenIDConnect_DotNet
3536
{
@@ -49,7 +50,9 @@ public void ConfigureServices(IServiceCollection services)
4950
{
5051
// This lambda determines whether user consent for non-essential cookies is needed for a given request.
5152
options.CheckConsentNeeded = context => true;
52-
options.MinimumSameSitePolicy = SameSiteMode.None;
53+
options.MinimumSameSitePolicy = SameSiteMode.Unspecified;
54+
// Handling SameSite cookie according to https://docs.microsoft.com/en-us/aspnet/core/security/samesite?view=aspnetcore-3.1
55+
options.HandleSameSiteCookieCompatibility();
5356
});
5457

5558
// Configuration to sign-in users with Azure AD B2C

1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UserSecretsId>aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D8</UserSecretsId>
66
<WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
77
</PropertyGroup>
@@ -21,4 +21,8 @@
2121
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.0.0" />
2222
</ItemGroup>
2323

24+
<ItemGroup>
25+
<ProjectReference Include="..\..\Microsoft.Identity.Web\Microsoft.Identity.Web.csproj" />
26+
</ItemGroup>
27+
2428
</Project>

0 commit comments

Comments
 (0)