Fix incorrect claims type

danroth27 · danroth27 · commit 03266101f63c · 2020-05-08T12:28:37.000-07:00
diff --git a/save-points/00-get-started/BlazingPizza.Server/NotificationsController.cs b/save-points/00-get-started/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs b/save-points/00-get-started/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -89,7 +90,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/NotificationsController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs b/save-points/01-Components-and-layout/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -89,7 +90,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/NotificationsController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs b/save-points/02-customize-a-pizza/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -89,7 +90,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/NotificationsController.cs b/save-points/03-show-order-status/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs b/save-points/03-show-order-status/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -89,7 +90,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs b/save-points/04-refactor-state-management/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -89,7 +90,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/NotificationsController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs b/save-points/05-checkout-with-validation/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -89,7 +90,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/NotificationsController.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/06-authentication-and-authorization/BlazingPizza.Server/OrdersController.cs b/save-points/06-authentication-and-authorization/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -90,7 +91,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/NotificationsController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs b/save-points/07-javascript-interop/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -90,7 +91,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/08-templated-components/BlazingPizza.Server/NotificationsController.cs b/save-points/08-templated-components/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs b/save-points/08-templated-components/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -90,7 +91,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/NotificationsController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs b/save-points/09-progressive-web-app/BlazingPizza.Server/OrdersController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
@@ -92,7 +93,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)
diff --git a/src/BlazingPizza.Server/NotificationsController.cs b/src/BlazingPizza.Server/NotificationsController.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
     }
 }
diff --git a/src/BlazingPizza.Server/OrdersController.cs b/src/BlazingPizza.Server/OrdersController.cs
@@ -1,8 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Claims;
 using System.Text.Json;
 using System.Threading.Tasks;
+using IdentityServer4.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -92,7 +94,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)
 
         private string GetUserId()
         {
-            return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
+            return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
         }
 
         private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Linq;`
	`2`	`+using System.Security.Claims;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`	`using Microsoft.AspNetCore.Authorization;`
`4`	`5`	`using Microsoft.AspNetCore.Mvc;`
`@@ -36,7 +37,7 @@ public async Task<NotificationSubscription> Subscribe(NotificationSubscription s`
`36`	`37`
`37`	`38`	`private string GetUserId()`
`38`	`39`	`{`
`39`		`- return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;`
	`40`	`+ return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
	`4`	`+using System.Security.Claims;`
`4`	`5`	`using System.Threading.Tasks;`
`5`	`6`	`using Microsoft.AspNetCore.Mvc;`
`6`	`7`	`using Microsoft.EntityFrameworkCore;`
`@@ -89,7 +90,7 @@ public async Task<ActionResult<int>> PlaceOrder(Order order)`
`89`	`90`
`90`	`91`	`private string GetUserId()`
`91`	`92`	`{`
`92`		`- return HttpContext.User.FindFirst("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;`
	`93`	`+ return HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`private static async Task TrackAndSendNotificationsAsync(Order order, NotificationSubscription subscription)`