2 files changed, 15 insertions, 5 deletions
diff --git a/BackEnd/Timeline/Configs/TokenOptions.cs b/BackEnd/Timeline/Configs/TokenOptions.cs
index d8e968c7..d643c3d2 100644
--- a/BackEnd/Timeline/Configs/TokenOptions.cs
+++ b/BackEnd/Timeline/Configs/TokenOptions.cs
@@ -3,9 +3,8 @@
     public class TokenOptions
     {
         /// <summary>
-        /// The length of the generated secure random token counted in byte.
-        /// Note the byte will be converted to hex form when used.
-        /// Default is 32 byte long.
+        /// The length of the token.
+        /// Default is 16.
         /// </summary>
         public long? TokenLength { get; set; }
     }
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/>