Update 04-refactor-state-management

danroth27 · danroth27 · commit 570d56c65fbd · 2020-04-08T13:27:36.000-07:00
diff --git a/docs/04-refactor-state-management.md b/docs/04-refactor-state-management.md
@@ -108,7 +108,8 @@ At this point it should be possible to get the `Index` component compiling again
 ```csharp
 async Task PlaceOrder()
 {
-    var newOrderId = await HttpClient.PostJsonAsync<int>("orders", OrderState.Order);
+    var response = await HttpClient.PostAsJsonAsync("orders", OrderState.Order);
+    var newOrderId = await response.Content.ReadFromJsonAsync<int>();
     OrderState.ResetOrder();
     NavigationManager.NavigateTo($"myorders/{newOrderId}");
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/App.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/App.razor
@@ -4,7 +4,7 @@
     </Found>
     <NotFound>
         <LayoutView Layout="typeof(MainLayout)">
-            <div class="main">Page not found</div>
+            <div class="main">Sorry, there's nothing at this address.</div>
         </LayoutView>
     </NotFound>
 </Router>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj b/save-points/04-refactor-state-management/BlazingPizza.Client/BlazingPizza.Client.csproj
@@ -9,8 +9,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(BlazorVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="$(BlazorVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="System.Net.Http.Json" Version="$(SystemNetHttpJsonVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(BlazorVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/Index.razor
@@ -61,12 +61,13 @@
 
     protected override async Task OnInitializedAsync()
     {
-        specials = await HttpClient.GetJsonAsync<List<PizzaSpecial>>("specials");
+        specials = await HttpClient.GetFromJsonAsync<List<PizzaSpecial>>("specials");
     }
 
     async Task PlaceOrder()
     {
-        var newOrderId = await HttpClient.PostJsonAsync<int>("orders", Order);
+        var response = await HttpClient.PostAsJsonAsync("orders", OrderState.Order);
+        var newOrderId = await response.Content.ReadFromJsonAsync<int>();
         OrderState.ResetOrder();
         NavigationManager.NavigateTo($"myorders/{newOrderId}");
     }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/MyOrders.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/MyOrders.razor
@@ -43,6 +43,6 @@
 
     protected override async Task OnParametersSetAsync()
     {
-        ordersWithStatus = await HttpClient.GetJsonAsync<List<OrderWithStatus>>("orders");
+        ordersWithStatus = await HttpClient.GetFromJsonAsync<List<OrderWithStatus>>("orders");
     }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/OrderDetails.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Pages/OrderDetails.razor
@@ -57,7 +57,7 @@
             try
             {
                 invalidOrder = false;
-                orderWithStatus = await HttpClient.GetJsonAsync<OrderWithStatus>($"orders/{OrderId}");
+                orderWithStatus = await HttpClient.GetFromJsonAsync<OrderWithStatus>($"orders/{OrderId}");
             }
             catch (Exception ex)
             {
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Shared/ConfigurePizzaDialog.razor
@@ -69,7 +69,7 @@
 
     protected async override Task OnInitializedAsync()
     {
-        toppings = await HttpClient.GetJsonAsync<List<Topping>>("toppings");
+        toppings = await HttpClient.GetFromJsonAsync<List<Topping>>("toppings");
     }
 
     void ToppingSelected(ChangeEventArgs e)
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/Shared/MainLayout.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/Shared/MainLayout.razor
@@ -1,7 +1,9 @@
 ﻿@inherits LayoutComponentBase
 
 <div class="top-bar">
-    <img class="logo" src="img/logo.svg" />
+    <a class="logo" href="">
+        <img src="img/logo.svg" />
+    </a>
 
     <NavLink href="" class="nav-tab" Match="NavLinkMatch.All">
         <img src="img/pizza-slice.svg" />
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/_Imports.razor b/save-points/04-refactor-state-management/BlazingPizza.Client/_Imports.razor
@@ -1,9 +1,12 @@
 @using System.Net.Http
+@using System.Net.Http.Headers
+@using System.Net.Http.Json
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
 @using Microsoft.JSInterop
 @using BlazingPizza.Client
 @using BlazingPizza.Client.Shared
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/css/site.css b/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/css/site.css
@@ -36,10 +36,14 @@ form {
 }
 
 .logo {
-    margin-right: 3rem;
-    width: 9rem;
+    display: flex;
 }
 
+    .logo > img {
+        margin-right: 3rem;
+        width: 9rem;
+    }
+
 .content {
     display: flex;
     height: 100%;
@@ -120,13 +124,21 @@ form {
         font-weight: 700;
         line-height: 0.7rem;
         margin-top: 0.5rem;
+        color: white;
+        font-size: 1rem;
     }
 
     .user-info a {
         color: #fff2cc;
         font-size: 0.8rem;
     }
 
+    .user-info button.sign-out {
+        color: #fff2cc;
+        font-size: 0.8rem;
+        padding: 0;
+    }
+
 .pizza-cards {
     display: grid;
     grid-template-columns: repeat(auto-fill, 20rem);
@@ -540,6 +552,7 @@ a.sign-in {
     font-weight: 100;
     cursor: pointer;
     transition: 0.2s ease-out;
+    margin-left: 3px;
 }
 
     a.sign-in:hover {
@@ -548,16 +561,6 @@ a.sign-in {
         border-color: #fff2cc;
     }
 
-.user-info a.sign-out {
-    color: #fff2cc;
-    font-size: 0.8rem;
-    cursor: pointer;
-}
-
-    .user-info a.sign-out:hover {
-        text-decoration: underline;
-    }
-
 input[type=range] {
     -webkit-appearance: none;
     margin: 7.1px 0;
@@ -721,6 +724,25 @@ input[type=range] {
     color: red;
 }
 
+#blazor-error-ui {
+    background: lightyellow;
+    bottom: 0;
+    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
+    display: none;
+    left: 0;
+    padding: 0.6rem 1.25rem 0.7rem 1.25rem;
+    position: fixed;
+    width: 100%;
+    z-index: 1000;
+}
+
+    #blazor-error-ui .dismiss {
+        cursor: pointer;
+        position: absolute;
+        right: 0.75rem;
+        top: 0.5rem;
+    }
+
 @keyframes progressbar-slide {
     0% {
         transform: translateX(-200px);
@@ -733,4 +755,4 @@ input[type=range] {
     100% {
         transform: translateX(500px);
     }
-}
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/index.html b/save-points/04-refactor-state-management/BlazingPizza.Client/wwwroot/index.html
@@ -15,6 +15,13 @@
         <div class="loading-bar"></div>
     </app>
 
+    <div id="blazor-error-ui">
+        An unhandled error has occurred.
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+
+    <script src="_content/Microsoft.AspNetCore.Components.WebAssembly.Authentication/AuthenticationService.js"></script>
     <script src="_framework/blazor.webassembly.js"></script>
     <script src="_content/BlazingPizza.ComponentsLibrary/localStorage.js"></script>
     <script src="_content/BlazingPizza.ComponentsLibrary/pushNotifications.js"></script>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml b/save-points/04-refactor-state-management/BlazingPizza.Server/Areas/Identity/Pages/Shared/_LoginPartial.cshtml
@@ -0,0 +1,31 @@
+﻿@using Microsoft.AspNetCore.Identity
+@using BlazingPizza.Server
+@inject SignInManager<PizzaStoreUser> SignInManager
+@inject UserManager<PizzaStoreUser> UserManager
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+@{
+    var returnUrl = "/";
+    if (Context.Request.Query.TryGetValue("returnUrl", out var existingUrl))
+    {
+        returnUrl = existingUrl;
+    }
+}
+
+<div class="user-info">
+    @if (SignInManager.IsSignedIn(User))
+    {
+        <img src="~/img/user.svg" />
+        <div>
+            <a class="username" asp-area="Identity" asp-page="/Account/Manage/Index" title="Manage">@User.Identity.Name</a>
+            <form asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="/" method="post">
+                <button type="submit" class="btn btn-link sign-out">Sign out</button>
+            </form>
+        </div>
+    }
+    else
+    {
+        <a class="sign-in" asp-area="Identity" asp-page="/Account/Register" asp-route-returnUrl="@returnUrl">Register</a>
+        <a class="sign-in" asp-area="Identity" asp-page="/Account/Login" asp-route-returnUrl="@returnUrl">Login</a>
+    }
+</div>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Areas/Identity/Pages/_Layout.cshtml b/save-points/04-refactor-state-management/BlazingPizza.Server/Areas/Identity/Pages/_Layout.cshtml
@@ -0,0 +1,38 @@
+﻿@using Microsoft.AspNetCore.Hosting
+@using Microsoft.AspNetCore.Mvc.ViewEngines
+@using BlazingPizza.Client.Shared
+@inject IWebHostEnvironment Environment
+@inject ICompositeViewEngine Engine
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link href="~/img/icon-512.png" rel="icon" />
+    <link href="~/css/bootstrap/bootstrap.min.css" rel="stylesheet" />
+    <link href="~/css/site.css" rel="stylesheet" asp-append-version="true" />
+    <title>Blazing Pizza - @ViewData["Title"]</title>
+</head>
+<body>
+    <div class="top-bar">
+        <a class="logo" href="~/">
+            <img src="~/img/logo.svg" />
+        </a>
+        <partial name="_LoginPartial" />
+    </div>
+
+    <div class="content">
+        <div class="main">
+            @RenderBody()
+        </div>
+    </div>
+
+    <script src="~/Identity/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/Identity/js/site.js" asp-append-version="true"></script>
+
+    @RenderSection("Scripts", required: false)
+</body>
+</html>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj b/save-points/04-refactor-state-management/BlazingPizza.Server/BlazingPizza.Server.csproj
@@ -6,10 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="$(BlazorVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EntityFrameworkVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(EntityFrameworkVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs
@@ -36,7 +36,6 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            // This will be the user's twitter username
             return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
         }
     }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/OidcConfigurationController.cs
@@ -0,0 +1,26 @@
+﻿using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BlazingPizza.Server
+{
+    public class OidcConfigurationController : Controller
+    {
+        public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
+        {
+            ClientRequestParametersProvider = clientRequestParametersProvider;
+        }
+
+        public IClientRequestParametersProvider ClientRequestParametersProvider { get; }
+
+        [HttpGet("_configuration/{clientId}")]
+        public IActionResult GetClientRequestParameters([FromRoute]string clientId)
+        {
+            var parameters = ClientRequestParametersProvider.GetClientParameters(HttpContext, clientId);
+            return Ok(parameters);
+        }
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
@@ -89,7 +89,6 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            // This will be the user's twitter username
             return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
         }
 
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreContext.cs
@@ -1,15 +1,15 @@
-﻿using Microsoft.EntityFrameworkCore;
+﻿﻿using IdentityServer4.EntityFramework.Options;
+using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Options;
 
 namespace BlazingPizza.Server
 {
-    public class PizzaStoreContext : DbContext
+    public class PizzaStoreContext : ApiAuthorizationDbContext<PizzaStoreUser>
     {
-        public PizzaStoreContext()
-        {
-        }
-
-        public PizzaStoreContext(DbContextOptions options)
-            : base(options)
+        public PizzaStoreContext(
+            DbContextOptions options,
+            IOptions<OperationalStoreOptions> operationalStoreOptions) : base(options, operationalStoreOptions)
         {
         }
 
@@ -25,6 +25,8 @@ public PizzaStoreContext(DbContextOptions options)
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
+            base.OnModelCreating(modelBuilder);
+
             // Configuring a many-to-many special -> topping relationship that is friendly for serialization
             modelBuilder.Entity<PizzaTopping>().HasKey(pst => new { pst.PizzaId, pst.ToppingId });
             modelBuilder.Entity<PizzaTopping>().HasOne<Pizza>().WithMany(ps => ps.Toppings);
@@ -34,4 +36,4 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<Order>().OwnsOne(o => o.DeliveryLocation);
         }
     }
-}
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreUser.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/PizzaStoreUser.cs
@@ -0,0 +1,8 @@
+﻿using Microsoft.AspNetCore.Identity;
+
+namespace BlazingPizza.Server
+{
+    public class PizzaStoreUser : IdentityUser
+    {
+    }
+}
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Properties/launchSettings.json b/save-points/04-refactor-state-management/BlazingPizza.Server/Properties/launchSettings.json
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/Startup.cs
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/UserController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/UserController.cs
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/appsettings.Development.json b/save-points/04-refactor-state-management/BlazingPizza.Server/appsettings.Development.json
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/appsettings.json b/save-points/04-refactor-state-management/BlazingPizza.Server/appsettings.json

Original file line number	Diff line number	Diff line change
@@ -108,7 +108,8 @@ At this point it should be possible to get the `Index` component compiling again
`108`	`108`	```csharp
`109`	`109`	`async Task PlaceOrder()`
`110`	`110`	`{`
`111`		`- var newOrderId = await HttpClient.PostJsonAsync<int>("orders", OrderState.Order);`
	`111`	`+ var response = await HttpClient.PostAsJsonAsync("orders", OrderState.Order);`
	`112`	`+ var newOrderId = await response.Content.ReadFromJsonAsync<int>();`
`112`	`113`	`OrderState.ResetOrder();`
`113`	`114`	`NavigationManager.NavigateTo($"myorders/{newOrderId}");`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,13 @@`
`61`	`61`
`62`	`62`	`protected override async Task OnInitializedAsync()`
`63`	`63`	`{`
`64`		`- specials = await HttpClient.GetJsonAsync<List<PizzaSpecial>>("specials");`
	`64`	`+ specials = await HttpClient.GetFromJsonAsync<List<PizzaSpecial>>("specials");`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`async Task PlaceOrder()`
`68`	`68`	`{`
`69`		`- var newOrderId = await HttpClient.PostJsonAsync<int>("orders", Order);`
	`69`	`+ var response = await HttpClient.PostAsJsonAsync("orders", OrderState.Order);`
	`70`	`+ var newOrderId = await response.Content.ReadFromJsonAsync<int>();`
`70`	`71`	`OrderState.ResetOrder();`
`71`	`72`	`NavigationManager.NavigateTo($"myorders/{newOrderId}");`
`72`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,6 @@`
`43`	`43`
`44`	`44`	`protected override async Task OnParametersSetAsync()`
`45`	`45`	`{`
`46`		`- ordersWithStatus = await HttpClient.GetJsonAsync<List<OrderWithStatus>>("orders");`
	`46`	`+ ordersWithStatus = await HttpClient.GetFromJsonAsync<List<OrderWithStatus>>("orders");`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`try`
`58`	`58`	`{`
`59`	`59`	`invalidOrder = false;`
`60`		`- orderWithStatus = await HttpClient.GetJsonAsync<OrderWithStatus>($"orders/{OrderId}");`
	`60`	`+ orderWithStatus = await HttpClient.GetFromJsonAsync<OrderWithStatus>($"orders/{OrderId}");`
`61`	`61`	`}`
`62`	`62`	`catch (Exception ex)`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@`
`69`	`69`
`70`	`70`	`protected async override Task OnInitializedAsync()`
`71`	`71`	`{`
`72`		`- toppings = await HttpClient.GetJsonAsync<List<Topping>>("toppings");`
	`72`	`+ toppings = await HttpClient.GetFromJsonAsync<List<Topping>>("toppings");`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`void ToppingSelected(ChangeEventArgs e)`