3 files changed, 31 insertions, 4 deletions
diff --git a/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs b/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs
index 2ab263de..4d79295a 100644
--- a/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs
+++ b/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
+using System.Text;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
@@ -33,13 +34,23 @@ namespace Timeline.Services.Token
             _secureRandom.Dispose();
         }
 
+        private static readonly char[] AlphaDigitString = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".ToCharArray();
+
         private string GenerateSecureRandomTokenString()
         {
             var option = _optionMonitor.CurrentValue;
-            var tokenLength = option.TokenLength ?? 32;
+            var tokenLength = option.TokenLength ?? 16;
             var buffer = new byte[tokenLength];
             _secureRandom.GetBytes(buffer);
-            return Convert.ToHexString(buffer);
+
+            StringBuilder stringBuilder = new();
+
+            foreach (byte b in buffer)
+            {
+                stringBuilder.Append(AlphaDigitString[b % AlphaDigitString.Length]);
+            }
+
+            return stringBuilder.ToString();
         }
 
         /// <inheritdoc/>
diff --git a/BackEnd/Timeline/Services/User/IUserService.cs b/BackEnd/Timeline/Services/User/IUserService.cs
index 6ea9a4d2..efb61ccd 100644
--- a/BackEnd/Timeline/Services/User/IUserService.cs
+++ b/BackEnd/Timeline/Services/User/IUserService.cs
@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Timeline.Entities;
-
+using Timeline.Models;
+
 namespace Timeline.Services.User
 {
     public interface IUserService
@@ -46,6 +47,8 @@ namespace Timeline.Services.User
         /// <returns>The user info of users.</returns>
         Task<List<UserEntity>> GetUsersAsync();
 
+        Task<Page<UserEntity>> GetUsersV2Async(int page, int pageSize);
+
         /// <summary>
         /// Create a user with given info.
         /// </summary>
diff --git a/BackEnd/Timeline/Services/User/UserService.cs b/BackEnd/Timeline/Services/User/UserService.cs
index d5ee9a2f..a20076d6 100644
--- a/BackEnd/Timeline/Services/User/UserService.cs
+++ b/BackEnd/Timeline/Services/User/UserService.cs
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Timeline.Entities;
+using Timeline.Models;
 using Timeline.Models.Validation;
 using Timeline.Services.Token;
 
@@ -266,6 +267,18 @@ namespace Timeline.Services.User
             _logger.LogInformation(Resource.LogChangePassowrd, entity.Username, id);
 
             await _userTokenService.RevokeAllTokenByUserIdAsync(id);
-        }
+        }
+
+        public async Task<Page<UserEntity>> GetUsersV2Async(int page, int pageSize)
+        {
+            if (page <= 0) throw new ArgumentOutOfRangeException(nameof(page));
+            if (pageSize <= 0) throw new ArgumentOutOfRangeException(nameof(pageSize));
+
+            var items = await _database.Users.Skip((page - 1) * pageSize).Take(pageSize).ToListAsync();
+
+            var totalCount = await _database.Users.CountAsync();
+
+            return new Page<UserEntity>(page, pageSize, totalCount, items);
+        }
     }
 }