5 files changed, 111 insertions, 75 deletions
diff --git a/BackEnd/Timeline/Services/TimelinePostService.cs b/BackEnd/Timeline/Services/TimelinePostService.cs
index 36fcdbca..a1176a68 100644
--- a/BackEnd/Timeline/Services/TimelinePostService.cs
+++ b/BackEnd/Timeline/Services/TimelinePostService.cs
@@ -1,4 +1,6 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -8,9 +10,7 @@ using Timeline.Entities;
 using Timeline.Helpers;
 using Timeline.Models;
 using Timeline.Services.Exceptions;
-using SixLabors.ImageSharp;
 using static Timeline.Resources.Services.TimelineService;
-using Microsoft.Extensions.Logging;
 
 namespace Timeline.Services
 {
diff --git a/BackEnd/Timeline/Services/TimelineService.cs b/BackEnd/Timeline/Services/TimelineService.cs
index f943f8b4..b8ec354a 100644
--- a/BackEnd/Timeline/Services/TimelineService.cs
+++ b/BackEnd/Timeline/Services/TimelineService.cs
@@ -1,13 +1,10 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using SixLabors.ImageSharp;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Timeline.Entities;
-using Timeline.Helpers;
 using Timeline.Models;
 using Timeline.Models.Validation;
 using Timeline.Services.Exceptions;
diff --git a/BackEnd/Timeline/Services/UserCredentialService.cs b/BackEnd/Timeline/Services/UserCredentialService.cs
new file mode 100644
index 00000000..e5c3581b
--- /dev/null
+++ b/BackEnd/Timeline/Services/UserCredentialService.cs
@@ -0,0 +1,104 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Timeline.Entities;
+using Timeline.Helpers;
+using Timeline.Models;
+using Timeline.Models.Validation;
+using Timeline.Services.Exceptions;
+
+namespace Timeline.Services
+{
+    public interface IUserCredentialService
+    {
+        /// <summary>
+        /// Try to verify the given username and password.
+        /// </summary>
+        /// <param name="username">The username of the user to verify.</param>
+        /// <param name="password">The password of the user to verify.</param>
+        /// <returns>User id.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="username"/> or <paramref name="password"/> is null.</exception>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="username"/> is of bad format or <paramref name="password"/> is empty.</exception>
+        /// <exception cref="UserNotExistException">Thrown when the user with given username does not exist.</exception>
+        /// <exception cref="BadPasswordException">Thrown when password is wrong.</exception>
+        Task<long> VerifyCredential(string username, string password);
+
+        /// <summary>
+        /// Try to change a user's password with old password.
+        /// </summary>
+        /// <param name="id">The id of user to change password of.</param>
+        /// <param name="oldPassword">Old password.</param>
+        /// <param name="newPassword">New password.</param>
+        /// <exception cref="ArgumentNullException">Thrown if <paramref name="oldPassword"/> or <paramref name="newPassword"/> is null.</exception>
+        /// <exception cref="ArgumentException">Thrown if <paramref name="oldPassword"/> or <paramref name="newPassword"/> is empty.</exception>
+        /// <exception cref="UserNotExistException">Thrown if the user with given username does not exist.</exception>
+        /// <exception cref="BadPasswordException">Thrown if the old password is wrong.</exception>
+        Task ChangePassword(long id, string oldPassword, string newPassword);
+    }
+
+    public class UserCredentialService : IUserCredentialService
+    {
+        private readonly ILogger<UserCredentialService> _logger;
+        private readonly DatabaseContext _database;
+        private readonly IPasswordService _passwordService;
+
+        private readonly UsernameValidator _usernameValidator = new UsernameValidator();
+
+        public UserCredentialService(ILogger<UserCredentialService> logger, DatabaseContext database, IPasswordService passwordService)
+        {
+            _logger = logger;
+            _database = database;
+            _passwordService = passwordService;
+        }
+
+        public async Task<long> VerifyCredential(string username, string password)
+        {
+            if (username == null)
+                throw new ArgumentNullException(nameof(username));
+            if (password == null)
+                throw new ArgumentNullException(nameof(password));
+            if (!_usernameValidator.Validate(username, out var message))
+                throw new ArgumentException(message);
+            if (password.Length == 0)
+                throw new ArgumentException("Password can't be empty.");
+
+            var entity = await _database.Users.Where(u => u.Username == username).Select(u => new { u.Id, u.Password }).SingleOrDefaultAsync();
+
+            if (entity == null)
+                throw new UserNotExistException(username);
+
+            if (!_passwordService.VerifyPassword(entity.Password, password))
+                throw new BadPasswordException(password);
+
+            return entity.Id;
+        }
+
+        public async Task ChangePassword(long id, string oldPassword, string newPassword)
+        {
+            if (oldPassword == null)
+                throw new ArgumentNullException(nameof(oldPassword));
+            if (newPassword == null)
+                throw new ArgumentNullException(nameof(newPassword));
+            if (oldPassword.Length == 0)
+                throw new ArgumentException("Old password can't be empty.");
+            if (newPassword.Length == 0)
+                throw new ArgumentException("New password can't be empty.");
+
+            var entity = await _database.Users.Where(u => u.Id == id).SingleOrDefaultAsync();
+
+            if (entity == null)
+                throw new UserNotExistException(id);
+
+            if (!_passwordService.VerifyPassword(entity.Password, oldPassword))
+                throw new BadPasswordException(oldPassword);
+
+            entity.Password = _passwordService.HashPassword(newPassword);
+            entity.Version += 1;
+            await _database.SaveChangesAsync();
+            _logger.LogInformation(Log.Format(Resources.Services.UserService.LogDatabaseUpdate, ("Id", id), ("Operation", "Change password")));
+        }
+    }
+}
diff --git a/BackEnd/Timeline/Services/UserService.cs b/BackEnd/Timeline/Services/UserService.cs
index cded3ff1..9395cc52 100644
--- a/BackEnd/Timeline/Services/UserService.cs
+++ b/BackEnd/Timeline/Services/UserService.cs
@@ -27,19 +27,6 @@ namespace Timeline.Services
     public interface IUserService : IBasicUserService
     {
         /// <summary>
-        /// Try to verify the given username and password.
-        /// </summary>
-        /// <param name="username">The username of the user to verify.</param>
-        /// <param name="password">The password of the user to verify.</param>
-        /// <returns>The user info and auth info.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="username"/> or <paramref name="password"/> is null.</exception>
-        /// <exception cref="ArgumentException">Thrown when <paramref name="username"/> is of bad format or <paramref name="password"/> is empty.</exception>
-        /// <exception cref="UserNotExistException">Thrown when the user with given username does not exist.</exception>
-        /// <exception cref="BadPasswordException">Thrown when password is wrong.</exception>
-        Task<User> VerifyCredential(string username, string password);
-
-
-        /// <summary>
         /// Try to get a user by id.
         /// </summary>
         /// <param name="id">The id of the user.</param>
@@ -47,7 +34,6 @@ namespace Timeline.Services
         /// <exception cref="UserNotExistException">Thrown when the user with given id does not exist.</exception>
         Task<User> GetUser(long id);
 
-
         /// <summary>
         /// List all users.
         /// </summary>
@@ -77,18 +63,6 @@ namespace Timeline.Services
         /// Version will increase if password is changed.
         /// </remarks>
         Task<User> ModifyUser(long id, ModifyUserParams? param);
-
-        /// <summary>
-        /// Try to change a user's password with old password.
-        /// </summary>
-        /// <param name="id">The id of user to change password of.</param>
-        /// <param name="oldPassword">Old password.</param>
-        /// <param name="newPassword">New password.</param>
-        /// <exception cref="ArgumentNullException">Thrown if <paramref name="oldPassword"/> or <paramref name="newPassword"/> is null.</exception>
-        /// <exception cref="ArgumentException">Thrown if <paramref name="oldPassword"/> or <paramref name="newPassword"/> is empty.</exception>
-        /// <exception cref="UserNotExistException">Thrown if the user with given username does not exist.</exception>
-        /// <exception cref="BadPasswordException">Thrown if the old password is wrong.</exception>
-        Task ChangePassword(long id, string oldPassword, string newPassword);
     }
 
     public class UserService : BasicUserService, IUserService
@@ -159,26 +133,7 @@ namespace Timeline.Services
             };
         }
 
-        public async Task<User> VerifyCredential(string username, string password)
-        {
-            if (username == null)
-                throw new ArgumentNullException(nameof(username));
-            if (password == null)
-                throw new ArgumentNullException(nameof(password));
-
-            CheckUsernameFormat(username, nameof(username));
-            CheckPasswordFormat(password, nameof(password));
-
-            var entity = await _databaseContext.Users.Where(u => u.Username == username).SingleOrDefaultAsync();
-
-            if (entity == null)
-                throw new UserNotExistException(username);
 
-            if (!_passwordService.VerifyPassword(entity.Password, password))
-                throw new BadPasswordException(password);
-
-            return await CreateUserFromEntity(entity);
-        }
 
         public async Task<User> GetUser(long id)
         {
@@ -288,28 +243,5 @@ namespace Timeline.Services
 
             return await CreateUserFromEntity(entity);
         }
-
-        public async Task ChangePassword(long id, string oldPassword, string newPassword)
-        {
-            if (oldPassword == null)
-                throw new ArgumentNullException(nameof(oldPassword));
-            if (newPassword == null)
-                throw new ArgumentNullException(nameof(newPassword));
-            CheckPasswordFormat(oldPassword, nameof(oldPassword));
-            CheckPasswordFormat(newPassword, nameof(newPassword));
-
-            var entity = await _databaseContext.Users.Where(u => u.Id == id).SingleOrDefaultAsync();
-
-            if (entity == null)
-                throw new UserNotExistException(id);
-
-            if (!_passwordService.VerifyPassword(entity.Password, oldPassword))
-                throw new BadPasswordException(oldPassword);
-
-            entity.Password = _passwordService.HashPassword(newPassword);
-            entity.Version += 1;
-            await _databaseContext.SaveChangesAsync();
-            _logger.LogInformation(Log.Format(LogDatabaseUpdate, ("Id", id), ("Operation", "Change password")));
-        }
     }
 }
diff --git a/BackEnd/Timeline/Services/UserTokenManager.cs b/BackEnd/Timeline/Services/UserTokenManager.cs
index 09ecd19c..831329e6 100644
--- a/BackEnd/Timeline/Services/UserTokenManager.cs
+++ b/BackEnd/Timeline/Services/UserTokenManager.cs
@@ -45,13 +45,15 @@ namespace Timeline.Services
     {
         private readonly ILogger<UserTokenManager> _logger;
         private readonly IUserService _userService;
+        private readonly IUserCredentialService _userCredentialService;
         private readonly IUserTokenService _userTokenService;
         private readonly IClock _clock;
 
-        public UserTokenManager(ILogger<UserTokenManager> logger, IUserService userService, IUserTokenService userTokenService, IClock clock)
+        public UserTokenManager(ILogger<UserTokenManager> logger, IUserService userService, IUserCredentialService userCredentialService, IUserTokenService userTokenService, IClock clock)
         {
             _logger = logger;
             _userService = userService;
+            _userCredentialService = userCredentialService;
             _userTokenService = userTokenService;
             _clock = clock;
         }
@@ -65,7 +67,8 @@ namespace Timeline.Services
             if (password == null)
                 throw new ArgumentNullException(nameof(password));
 
-            var user = await _userService.VerifyCredential(username, password);
+            var userId = await _userCredentialService.VerifyCredential(username, password);
+            var user = await _userService.GetUser(userId);
             var token = _userTokenService.GenerateToken(new UserTokenInfo { Id = user.Id, Version = user.Version, ExpireAt = expireAt });
 
             return new UserTokenCreateResult { Token = token, User = user };