Merge pull request #183 from crupest/auth

Refactor auth module to enable more flexiable permission control.

1 files changed, 3 insertions, 3 deletions

diff --git a/BackEnd/Timeline/Services/UserTokenManager.cs b/BackEnd/Timeline/Services/UserTokenManager.cs
index 813dae67..09ecd19c 100644
--- a/BackEnd/Timeline/Services/UserTokenManager.cs
+++ b/BackEnd/Timeline/Services/UserTokenManager.cs
@@ -66,7 +66,7 @@ namespace Timeline.Services
                 throw new ArgumentNullException(nameof(password));

 

             var user = await _userService.VerifyCredential(username, password);

-            var token = _userTokenService.GenerateToken(new UserTokenInfo { Id = user.Id!.Value, Version = user.Version!.Value, ExpireAt = expireAt });

+            var token = _userTokenService.GenerateToken(new UserTokenInfo { Id = user.Id, Version = user.Version, ExpireAt = expireAt });

 

             return new UserTokenCreateResult { Token = token, User = user };

         }

@@ -86,10 +86,10 @@ namespace Timeline.Services
                     throw new UserTokenTimeExpireException(token, tokenInfo.ExpireAt.Value, currentTime);

             }

 

-            var user = await _userService.GetUserById(tokenInfo.Id);

+            var user = await _userService.GetUser(tokenInfo.Id);

 

             if (tokenInfo.Version < user.Version)

-                throw new UserTokenBadVersionException(token, tokenInfo.Version, user.Version.Value);

+                throw new UserTokenBadVersionException(token, tokenInfo.Version, user.Version);

 

             return user;

         }