From e6069a6980ec6d2505e19026d4c84a9588f153dc Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 19 Jan 2020 22:45:43 +0800
Subject: Basically finish refactor of error codes.

---
 Timeline/Controllers/PersonalTimelineController.cs | 3 +--
 Timeline/Controllers/TokenController.cs            | 4 ++--
 Timeline/Controllers/UserAvatarController.cs       | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'Timeline/Controllers')

diff --git a/Timeline/Controllers/PersonalTimelineController.cs b/Timeline/Controllers/PersonalTimelineController.cs
index e1e3aba0..2c70fad1 100644
--- a/Timeline/Controllers/PersonalTimelineController.cs
+++ b/Timeline/Controllers/PersonalTimelineController.cs
@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Threading.Tasks;
 using Timeline.Auth;
 using Timeline.Filters;
@@ -134,7 +133,7 @@ namespace Timeline.Controllers
                 }
                 else if (e.InnerException is UserNotExistException)
                 {
-                    return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(
+                    return BadRequest(ErrorResponse.UserCommon.CustomMessage_NotExist(
                         TimelineController_ChangeMember_UserNotExist, e.Index, e.Operation));
                 }
 
diff --git a/Timeline/Controllers/TokenController.cs b/Timeline/Controllers/TokenController.cs
index c360a109..67001e87 100644
--- a/Timeline/Controllers/TokenController.cs
+++ b/Timeline/Controllers/TokenController.cs
@@ -99,7 +99,7 @@ namespace Timeline.Controllers
                 if (e.ErrorCode == JwtVerifyException.ErrorCodes.Expired)
                 {
                     var innerException = e.InnerException as SecurityTokenExpiredException;
-                    LogFailure(LogVerifyExpire, e, ("Expires", innerException.Expires),
+                    LogFailure(LogVerifyExpire, e, ("Expires", innerException?.Expires),
                         ("Current Time", _clock.GetCurrentTime()));
                     return BadRequest(ErrorResponse.TokenController.Verify_TimeExpired());
                 }
@@ -107,7 +107,7 @@ namespace Timeline.Controllers
                 {
                     var innerException = e.InnerException as JwtBadVersionException;
                     LogFailure(LogVerifyOldVersion, e,
-                        ("Token Version", innerException.TokenVersion),
+                        ("Token Version", innerException?.TokenVersion),
                         ("Required Version", innerException?.RequiredVersion));
                     return BadRequest(ErrorResponse.TokenController.Verify_OldVersion());
                 }
diff --git a/Timeline/Controllers/UserAvatarController.cs b/Timeline/Controllers/UserAvatarController.cs
index b4a6d8fd..62f1d78c 100644
--- a/Timeline/Controllers/UserAvatarController.cs
+++ b/Timeline/Controllers/UserAvatarController.cs
@@ -66,7 +66,7 @@ namespace Timeline.Controllers
             catch (UserNotExistException e)
             {
                 _logger.LogInformation(e, Log.Format(LogGetUserNotExist, ("Username", username)));
-                return NotFound(ErrorResponse.UserController.ChangePassword_BadOldPassword());
+                return NotFound(ErrorResponse.UserCommon.NotExist());
             }
         }
 
@@ -112,7 +112,7 @@ namespace Timeline.Controllers
             catch (UserNotExistException e)
             {
                 _logger.LogInformation(e, Log.Format(LogPutUserNotExist, ("Username", username)));
-                return BadRequest(ErrorResponse.UserController.ChangePassword_BadOldPassword());
+                return BadRequest(ErrorResponse.UserCommon.NotExist());
             }
             catch (AvatarFormatException e)
             {
-- 
cgit v1.2.3