From a5f1018fda5572912c126b1e8dd656209fca0e46 Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Tue, 11 Aug 2020 21:16:02 +0200
Subject: persisted grants

---
 src/server/Controllers/BaseController.cs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/server/Controllers/BaseController.cs')

diff --git a/src/server/Controllers/BaseController.cs b/src/server/Controllers/BaseController.cs
index 44b11b2..3737174 100644
--- a/src/server/Controllers/BaseController.cs
+++ b/src/server/Controllers/BaseController.cs
@@ -1,26 +1,26 @@
 using System;
-using System.Security.Claims;
 using Microsoft.AspNetCore.Mvc;
 using Dough.Utilities;
+using IdentityModel;
+using Microsoft.AspNetCore.Authorization;
 
 namespace Dough.Controllers
 {
     [ApiController]
+    [Authorize]
     [Route("[controller]")]
     public class BaseController : ControllerBase
     {
         public LoggedInUserModel LoggedInUser => new LoggedInUserModel
         {
-            Id = User.GetClaimValueOrDefault(ClaimTypes.NameIdentifier)?.ToGuidOrDefault() ?? default,
-            Username = User.GetClaimValueOrDefault(ClaimTypes.Name),
-            SessionStart = User.GetClaimValueOrDefault(ClaimTypes.AuthenticationInstant).ToDateTimeOrDefault()
+            Id = User.GetClaimValueOrDefault(JwtClaimTypes.Subject)?.ToGuidOrDefault() ?? default,
+            Username = User.GetClaimValueOrDefault(JwtClaimTypes.PreferredUserName),
         };
 
         public class LoggedInUserModel
         {
             public Guid Id { get; set; }
             public string Username { get; set; }
-            public DateTime SessionStart { get; set; }
         }
     }
 }
-- 
cgit v1.3