From fb3e62c89daa4ea497d544355a46a599ad29df25 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 28 Apr 2021 19:42:24 +0800
Subject: refactor: ...

---
 .../Controllers/ControllerAuthExtensions.cs        | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs')

diff --git a/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs b/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs
index 9fcb727a..cd2bdadf 100644
--- a/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs
+++ b/BackEnd/Timeline/Controllers/ControllerAuthExtensions.cs
@@ -1,9 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Security.Claims;
 using Timeline.Auth;
 using Timeline.Services.User;
-using static Timeline.Resources.Controllers.ControllerAuthExtensions;
 
 namespace Timeline.Controllers
 {
@@ -11,31 +9,17 @@ namespace Timeline.Controllers
     {
         public static bool UserHasPermission(this ControllerBase controller, UserPermission permission)
         {
-            return controller.User != null && controller.User.HasPermission(permission);
+            return controller.User.HasPermission(permission);
         }
 
         public static long GetUserId(this ControllerBase controller)
         {
-            var claim = controller.User.FindFirst(ClaimTypes.NameIdentifier);
-            if (claim == null)
-                throw new InvalidOperationException(ExceptionNoUserIdentifierClaim);
-
-            if (long.TryParse(claim.Value, out var value))
-                return value;
-
-            throw new InvalidOperationException(ExceptionUserIdentifierClaimBadFormat);
+            return controller.GetOptionalUserId() ?? throw new InvalidOperationException(Resource.ExceptionNoUserId);
         }
 
         public static long? GetOptionalUserId(this ControllerBase controller)
         {
-            var claim = controller.User.FindFirst(ClaimTypes.NameIdentifier);
-            if (claim == null)
-                return null;
-
-            if (long.TryParse(claim.Value, out var value))
-                return value;
-
-            throw new InvalidOperationException(ExceptionUserIdentifierClaimBadFormat);
+            return controller.User.GetUserId();
         }
     }
 }
-- 
cgit v1.2.3