From a665f5d894539cae5f4188e4a72ea9634b8c4ed0 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Tue, 27 Apr 2021 19:29:20 +0800
Subject: refactor: ...

---
 BackEnd/Timeline/Services/Token/UserTokenManager.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'BackEnd/Timeline/Services/Token')

diff --git a/BackEnd/Timeline/Services/Token/UserTokenManager.cs b/BackEnd/Timeline/Services/Token/UserTokenManager.cs
index 4a5f08d2..31cc70f2 100644
--- a/BackEnd/Timeline/Services/Token/UserTokenManager.cs
+++ b/BackEnd/Timeline/Services/Token/UserTokenManager.cs
@@ -48,16 +48,14 @@ namespace Timeline.Services.Token
         private readonly ILogger<UserTokenManager> _logger;
         private readonly IOptionsMonitor<TokenOptions> _tokenOptionsMonitor;
         private readonly IUserService _userService;
-        private readonly IUserCredentialService _userCredentialService;
         private readonly IUserTokenHandler _userTokenService;
         private readonly IClock _clock;
 
-        public UserTokenManager(ILogger<UserTokenManager> logger, IOptionsMonitor<TokenOptions> tokenOptionsMonitor, IUserService userService, IUserCredentialService userCredentialService, IUserTokenHandler userTokenService, IClock clock)
+        public UserTokenManager(ILogger<UserTokenManager> logger, IOptionsMonitor<TokenOptions> tokenOptionsMonitor, IUserService userService, IUserTokenHandler userTokenService, IClock clock)
         {
             _logger = logger;
             _tokenOptionsMonitor = tokenOptionsMonitor;
             _userService = userService;
-            _userCredentialService = userCredentialService;
             _userTokenService = userTokenService;
             _clock = clock;
         }
@@ -71,8 +69,8 @@ namespace Timeline.Services.Token
             if (password == null)
                 throw new ArgumentNullException(nameof(password));
 
-            var userId = await _userCredentialService.VerifyCredential(username, password);
-            var user = await _userService.GetUser(userId);
+            var userId = await _userService.VerifyCredential(username, password);
+            var user = await _userService.GetUserAsync(userId);
 
             var token = _userTokenService.GenerateToken(new UserTokenInfo
             {
@@ -98,7 +96,7 @@ namespace Timeline.Services.Token
 
             try
             {
-                var user = await _userService.GetUser(tokenInfo.Id);
+                var user = await _userService.GetUserAsync(tokenInfo.Id);
 
                 if (tokenInfo.Version < user.Version)
                     throw new UserTokenVersionExpiredException(token, tokenInfo.Version, user.Version);
-- 
cgit v1.2.3