...

2 files changed, 6 insertions, 5 deletions

diff --git a/BackEnd/Timeline/Services/Token/IUserTokenService.cs b/BackEnd/Timeline/Services/Token/IUserTokenService.cs
index 22fb0fb4..a9689f57 100644
--- a/BackEnd/Timeline/Services/Token/IUserTokenService.cs
+++ b/BackEnd/Timeline/Services/Token/IUserTokenService.cs
@@ -17,11 +17,12 @@ namespace Timeline.Services.Token
         /// Verify a token and get the info of the token.

         /// </summary>

         /// <param name="token">The token to verify.</param>

+        /// <param name="checkLifetime">Whether to check lifetime of token.</param>

         /// <returns>The info of the token.</returns>

         /// <exception cref="ArgumentNullException">Thrown when <paramref name="token"/> is null.</exception>

         /// <exception cref="UserTokenException">Thrown when the token is not valid for reasons other than expired.</exception>

-        /// <exception cref="UserTokenExpiredException">Thrown when the token is expired.</exception>

-        Task<UserTokenInfo> ValidateTokenAsync(string token);

+        /// <exception cref="UserTokenExpiredException">Thrown when <paramref name="checkLifetime"/> is true and the token is expired.</exception>

+        Task<UserTokenInfo> ValidateTokenAsync(string token, bool checkLifetime = true);

 

         /// <summary>

         /// Revoke a token to make it no longer valid.

diff --git a/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs b/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs
index 4d79295a..ceef4798 100644
--- a/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs
+++ b/BackEnd/Timeline/Services/Token/SecureRandomUserTokenService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -81,7 +81,7 @@ namespace Timeline.Services.Token
         }
 
         /// <inheritdoc/>
-        public async Task<UserTokenInfo> ValidateTokenAsync(string token)
+        public async Task<UserTokenInfo> ValidateTokenAsync(string token, bool checkLifetime = true)
         {
             var entity = await _databaseContext.UserTokens.Where(t => t.Token == token && !t.Deleted).SingleOrDefaultAsync();
 
@@ -92,7 +92,7 @@ namespace Timeline.Services.Token
 
             var currentTime = _clock.GetCurrentTime();
 
-            if (entity.ExpireAt.HasValue && entity.ExpireAt.Value <= currentTime)
+            if (checkLifetime && entity.ExpireAt.HasValue && entity.ExpireAt.Value <= currentTime)
             {
                 throw new UserTokenExpiredException(token, entity.ExpireAt.Value, currentTime);
             }