From 4298f63b2a4daf8dc14497a12295afd1143ef2f2 Mon Sep 17 00:00:00 2001
From: Isaac Levin <isaac.r.levin@gmail.com>
Date: Tue, 4 Jun 2019 11:03:09 -0400
Subject: [PATCH] remove cookie consent from templates

---
 .../Pages/Shared/_CookieConsentPartial.cshtml | 25 -------------------
 .../Pages/Shared/_Layout.cshtml               |  6 -----
 .../content/RazorPagesWeb-CSharp/Startup.cs   |  7 ------
 .../content/StarterWeb-CSharp/Startup.cs      |  7 ------
 .../Views/Shared/_CookieConsentPartial.cshtml | 25 -------------------
 .../Views/Shared/_Layout.cshtml               |  6 -----
 .../Views/Shared/_CookieConsentPartial.cshtml | 25 -------------------
 .../Views/Shared/_Layout.cshtml               |  6 -----
 .../test/template-baselines.json              | 13 ----------
 9 files changed, 120 deletions(-)
 delete mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml
 delete mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_CookieConsentPartial.cshtml
 delete mode 100644 src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_CookieConsentPartial.cshtml

diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml
deleted file mode 100644
index 999a0ed5bf..0000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_CookieConsentPartial.cshtml
+++ /dev/null
@@ -1,25 +0,0 @@
-@using Microsoft.AspNetCore.Http.Features
-
-@{
-    var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
-    var showBanner = !consentFeature?.CanTrack ?? false;
-    var cookieString = consentFeature?.CreateConsentCookie();
-}
-
-@if (showBanner)
-{
-    <div id="cookieConsent" class="alert alert-info alert-dismissible fade show" role="alert">
-        Use this space to summarize your privacy and cookie use policy. <a class="alert-link" asp-page="/Privacy">Learn More</a>.
-        <button type="button" class="accept-policy close" data-dismiss="alert" aria-label="Close" data-cookie-string="@cookieString">
-            <span aria-hidden="true">Accept</span>
-        </button>
-    </div>
-    <script>
-        (function () {
-            var button = document.querySelector("#cookieConsent button[data-cookie-string]");
-            button.addEventListener("click", function (event) {
-                document.cookie = button.dataset.cookieString;
-            }, false);
-        })();
-    </script>
-}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
index a02915b198..0e535e107d 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml
@@ -34,12 +34,6 @@
             </div>
         </nav>
     </header>
-    <div class="container">
-        <partial name="_CookieConsentPartial" />
-        <main role="main" class="pb-3">
-            @RenderBody()
-        </main>
-    </div>
 
     <footer class="border-top footer text-muted">
         <div class="container">
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs
index ea58c1f885..b3737d13d8 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Startup.cs
@@ -52,11 +52,6 @@ namespace Company.WebApplication1
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.Configure<CookiePolicyOptions>(options =>
-            {
-                // This lambda determines whether user consent for non-essential cookies is needed for a given request.
-                options.CheckConsentNeeded = context => true;
-            });
 
 #if (IndividualLocalAuth)
             services.AddDbContext<ApplicationDbContext>(options =>
@@ -152,8 +147,6 @@ namespace Company.WebApplication1
 #endif
             app.UseStaticFiles();
 
-            app.UseCookiePolicy();
-
             app.UseRouting();
 
 #if (OrganizationalAuth || IndividualAuth)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs
index 0638b76cab..698ab40241 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Startup.cs
@@ -52,11 +52,6 @@ namespace Company.WebApplication1
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.Configure<CookiePolicyOptions>(options =>
-            {
-                // This lambda determines whether user consent for non-essential cookies is needed for a given request.
-                options.CheckConsentNeeded = context => true;
-            });
 
 #if (IndividualLocalAuth)
             services.AddDbContext<ApplicationDbContext>(options =>
@@ -153,8 +148,6 @@ namespace Company.WebApplication1
 #endif
             app.UseStaticFiles();
 
-            app.UseCookiePolicy();
-
             app.UseRouting();
 
 #if (OrganizationalAuth || IndividualAuth)
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_CookieConsentPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_CookieConsentPartial.cshtml
deleted file mode 100644
index 8f96286262..0000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_CookieConsentPartial.cshtml
+++ /dev/null
@@ -1,25 +0,0 @@
-@using Microsoft.AspNetCore.Http.Features
-
-@{
-    var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
-    var showBanner = !consentFeature?.CanTrack ?? false;
-    var cookieString = consentFeature?.CreateConsentCookie();
-}
-
-@if (showBanner)
-{
-    <div id="cookieConsent" class="alert alert-info alert-dismissible fade show" role="alert">
-        Use this space to summarize your privacy and cookie use policy. <a class="alert-link" asp-area="" asp-controller="Home" asp-action="Privacy">Learn More</a>.
-        <button type="button" class="accept-policy close" data-dismiss="alert" aria-label="Close" data-cookie-string="@cookieString">
-            <span aria-hidden="true">Accept</span>
-        </button>
-    </div>
-    <script>
-        (function () {
-            var button = document.querySelector("#cookieConsent button[data-cookie-string]");
-            button.addEventListener("click", function (event) {
-                document.cookie = button.dataset.cookieString;
-            }, false);
-        })();
-    </script>
-}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
index e63e9b3121..4f667e10a3 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
@@ -34,12 +34,6 @@
             </div>
         </nav>
     </header>
-    <div class="container">
-        <partial name="_CookieConsentPartial" />
-        <main role="main" class="pb-3">
-            @RenderBody()
-        </main>
-    </div>
 
     <footer class="border-top footer text-muted">
         <div class="container">
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_CookieConsentPartial.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_CookieConsentPartial.cshtml
deleted file mode 100644
index 999a0ed5bf..0000000000
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_CookieConsentPartial.cshtml
+++ /dev/null
@@ -1,25 +0,0 @@
-@using Microsoft.AspNetCore.Http.Features
-
-@{
-    var consentFeature = Context.Features.Get<ITrackingConsentFeature>();
-    var showBanner = !consentFeature?.CanTrack ?? false;
-    var cookieString = consentFeature?.CreateConsentCookie();
-}
-
-@if (showBanner)
-{
-    <div id="cookieConsent" class="alert alert-info alert-dismissible fade show" role="alert">
-        Use this space to summarize your privacy and cookie use policy. <a class="alert-link" asp-page="/Privacy">Learn More</a>.
-        <button type="button" class="accept-policy close" data-dismiss="alert" aria-label="Close" data-cookie-string="@cookieString">
-            <span aria-hidden="true">Accept</span>
-        </button>
-    </div>
-    <script>
-        (function () {
-            var button = document.querySelector("#cookieConsent button[data-cookie-string]");
-            button.addEventListener("click", function (event) {
-                document.cookie = button.dataset.cookieString;
-            }, false);
-        })();
-    </script>
-}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
index 04c4d2ce9d..231dda4d56 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
@@ -30,12 +30,6 @@
             </div>
         </nav>
     </header>
-    <div class="container">
-        <partial name="_CookieConsentPartial" />
-        <main role="main" class="pb-3">
-            @RenderBody()
-        </main>
-    </div>
 
     <footer class="border-top footer text-muted">
         <div class="container">
diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json
index a6e919620c..565cbecd16 100644
--- a/src/ProjectTemplates/test/template-baselines.json
+++ b/src/ProjectTemplates/test/template-baselines.json
@@ -22,7 +22,6 @@
         "Pages/Privacy.cshtml.cs",
         "Pages/_ViewImports.cshtml",
         "Pages/_ViewStart.cshtml",
-        "Pages/Shared/_CookieConsentPartial.cshtml",
         "Pages/Shared/_Layout.cshtml",
         "Pages/Shared/_LoginPartial.cshtml",
         "Pages/Shared/_ValidationScriptsPartial.cshtml",
@@ -82,7 +81,6 @@
         "Pages/Privacy.cshtml.cs",
         "Pages/_ViewImports.cshtml",
         "Pages/_ViewStart.cshtml",
-        "Pages/Shared/_CookieConsentPartial.cshtml",
         "Pages/Shared/_Layout.cshtml",
         "Pages/Shared/_ValidationScriptsPartial.cshtml",
         "Properties/launchSettings.json",
@@ -141,7 +139,6 @@
         "Pages/Privacy.cshtml.cs",
         "Pages/_ViewImports.cshtml",
         "Pages/_ViewStart.cshtml",
-        "Pages/Shared/_CookieConsentPartial.cshtml",
         "Pages/Shared/_Layout.cshtml",
         "Pages/Shared/_LoginPartial.cshtml",
         "Pages/Shared/_ValidationScriptsPartial.cshtml",
@@ -201,7 +198,6 @@
         "Pages/Privacy.cshtml.cs",
         "Pages/_ViewImports.cshtml",
         "Pages/_ViewStart.cshtml",
-        "Pages/Shared/_CookieConsentPartial.cshtml",
         "Pages/Shared/_Layout.cshtml",
         "Pages/Shared/_LoginPartial.cshtml",
         "Pages/Shared/_ValidationScriptsPartial.cshtml",
@@ -261,7 +257,6 @@
         "Pages/Privacy.cshtml.cs",
         "Pages/_ViewImports.cshtml",
         "Pages/_ViewStart.cshtml",
-        "Pages/Shared/_CookieConsentPartial.cshtml",
         "Pages/Shared/_Layout.cshtml",
         "Pages/Shared/_ValidationScriptsPartial.cshtml",
         "Properties/launchSettings.json",
@@ -320,7 +315,6 @@
         "Pages/Privacy.cshtml.cs",
         "Pages/_ViewImports.cshtml",
         "Pages/_ViewStart.cshtml",
-        "Pages/Shared/_CookieConsentPartial.cshtml",
         "Pages/Shared/_Layout.cshtml",
         "Pages/Shared/_LoginPartial.cshtml",
         "Pages/Shared/_ValidationScriptsPartial.cshtml",
@@ -484,7 +478,6 @@
         "Views/Home/Index.cshtml",
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
-        "Views/Shared/_CookieConsentPartial.cshtml",
         "Views/Shared/_Layout.cshtml",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
@@ -543,7 +536,6 @@
         "Views/Home/Index.cshtml",
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
-        "Views/Shared/_CookieConsentPartial.cshtml",
         "Views/Shared/_Layout.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
@@ -601,7 +593,6 @@
         "Views/Home/Index.cshtml",
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
-        "Views/Shared/_CookieConsentPartial.cshtml",
         "Views/Shared/_Layout.cshtml",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
@@ -660,7 +651,6 @@
         "Views/Home/Index.cshtml",
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
-        "Views/Shared/_CookieConsentPartial.cshtml",
         "Views/Shared/_Layout.cshtml",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
@@ -719,7 +709,6 @@
         "Views/Home/Index.cshtml",
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
-        "Views/Shared/_CookieConsentPartial.cshtml",
         "Views/Shared/_Layout.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
@@ -777,7 +766,6 @@
         "Views/Home/Index.cshtml",
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
-        "Views/Shared/_CookieConsentPartial.cshtml",
         "Views/Shared/_Layout.cshtml",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
@@ -836,7 +824,6 @@
         "Views/Home/Index.cshtml",
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
-        "Views/Shared/_CookieConsentPartial.cshtml",
         "Views/Shared/_Layout.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",