...

1 files changed, 10 insertions, 66 deletions

diff --git a/Timeline/Services/JwtService.cs b/Timeline/Services/JwtService.cs
index 90d0c217..bf92966a 100644
--- a/Timeline/Services/JwtService.cs
+++ b/Timeline/Services/JwtService.cs
@@ -1,6 +1,7 @@
 using Microsoft.Extensions.Options;

 using Microsoft.IdentityModel.Tokens;

 using System;

+using System.Globalization;

 using System.IdentityModel.Tokens.Jwt;

 using System.Security.Claims;

 using System.Text;

@@ -14,63 +15,6 @@ namespace Timeline.Services
         public long Version { get; set; }

     }

 

-    [Serializable]

-    public class JwtTokenVerifyException : Exception

-    {

-        public static class ErrorCodes

-        {

-            // Codes in -1000 ~ -1999 usually means the user provides a token that is not created by this server.

-

-            public const int Others = -1001;

-            public const int NoIdClaim = -1002;

-            public const int IdClaimBadFormat = -1003;

-            public const int NoVersionClaim = -1004;

-            public const int VersionClaimBadFormat = -1005;

-

-            /// <summary>

-            /// Corresponds to <see cref="SecurityTokenExpiredException"/>.

-            /// </summary>

-            public const int Expired = -2001;

-        }

-

-        private const string message = "Jwt token is bad.";

-

-        public JwtTokenVerifyException() : base(message) { }

-        public JwtTokenVerifyException(string message) : base(message) { }

-        public JwtTokenVerifyException(string message, Exception inner) : base(message, inner) { }

-

-        public JwtTokenVerifyException(int code) : base(GetErrorMessage(code)) { ErrorCode = code; }

-        public JwtTokenVerifyException(string message, int code) : base(message) { ErrorCode = code; }

-        public JwtTokenVerifyException(Exception inner, int code) : base(GetErrorMessage(code), inner) { ErrorCode = code; }

-        public JwtTokenVerifyException(string message, Exception inner, int code) : base(message, inner) { ErrorCode = code; }

-        protected JwtTokenVerifyException(

-          System.Runtime.Serialization.SerializationInfo info,

-          System.Runtime.Serialization.StreamingContext context) : base(info, context) { }

-

-        public int ErrorCode { get; set; }

-

-        private static string GetErrorMessage(int errorCode)

-        {

-            switch (errorCode)

-            {

-                case ErrorCodes.Others:

-                    return "Uncommon error, see inner exception for more information.";

-                case ErrorCodes.NoIdClaim:

-                    return "Id claim does not exist.";

-                case ErrorCodes.IdClaimBadFormat:

-                    return "Id claim is not a number.";

-                case ErrorCodes.NoVersionClaim:

-                    return "Version claim does not exist.";

-                case ErrorCodes.VersionClaimBadFormat:

-                    return "Version claim is not a number";

-                case ErrorCodes.Expired:

-                    return "Token is expired.";

-                default:

-                    return "Unknown error code.";

-            }

-        }

-    }

-

     public interface IJwtService

     {

         /// <summary>

@@ -89,7 +33,7 @@ namespace Timeline.Services
         /// <param name="token">The token string to verify.</param>

         /// <returns>Return the saved info in token.</returns>

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

-        /// <exception cref="JwtTokenVerifyException">Thrown when the token is invalid.</exception>

+        /// <exception cref="JwtVerifyException">Thrown when the token is invalid.</exception>

         TokenInfo VerifyJwtToken(string token);

 

     }

@@ -116,8 +60,8 @@ namespace Timeline.Services
             var config = _jwtConfig.CurrentValue;

 

             var identity = new ClaimsIdentity();

-            identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, tokenInfo.Id.ToString(), ClaimValueTypes.Integer64));

-            identity.AddClaim(new Claim(VersionClaimType, tokenInfo.Version.ToString(), ClaimValueTypes.Integer64));

+            identity.AddClaim(new Claim(ClaimTypes.NameIdentifier, tokenInfo.Id.ToString(CultureInfo.InvariantCulture.NumberFormat), ClaimValueTypes.Integer64));

+            identity.AddClaim(new Claim(VersionClaimType, tokenInfo.Version.ToString(CultureInfo.InvariantCulture.NumberFormat), ClaimValueTypes.Integer64));

 

             var tokenDescriptor = new SecurityTokenDescriptor()

             {

@@ -159,15 +103,15 @@ namespace Timeline.Services
 

                 var idClaim = principal.FindFirstValue(ClaimTypes.NameIdentifier);

                 if (idClaim == null)

-                    throw new JwtTokenVerifyException(JwtTokenVerifyException.ErrorCodes.NoIdClaim);

+                    throw new JwtVerifyException(JwtVerifyException.ErrorCodes.NoIdClaim);

                 if (!long.TryParse(idClaim, out var id))

-                    throw new JwtTokenVerifyException(JwtTokenVerifyException.ErrorCodes.IdClaimBadFormat);

+                    throw new JwtVerifyException(JwtVerifyException.ErrorCodes.IdClaimBadFormat);

 

                 var versionClaim = principal.FindFirstValue(VersionClaimType);

                 if (versionClaim == null)

-                    throw new JwtTokenVerifyException(JwtTokenVerifyException.ErrorCodes.NoVersionClaim);

+                    throw new JwtVerifyException(JwtVerifyException.ErrorCodes.NoVersionClaim);

                 if (!long.TryParse(versionClaim, out var version))

-                    throw new JwtTokenVerifyException(JwtTokenVerifyException.ErrorCodes.VersionClaimBadFormat);

+                    throw new JwtVerifyException(JwtVerifyException.ErrorCodes.VersionClaimBadFormat);

 

                 return new TokenInfo

                 {

@@ -177,11 +121,11 @@ namespace Timeline.Services
             }

             catch (SecurityTokenExpiredException e)

             {

-                throw new JwtTokenVerifyException(e, JwtTokenVerifyException.ErrorCodes.Expired);

+                throw new JwtVerifyException(e, JwtVerifyException.ErrorCodes.Expired);

             }

             catch (Exception e)

             {

-                throw new JwtTokenVerifyException(e, JwtTokenVerifyException.ErrorCodes.Others);

+                throw new JwtVerifyException(e, JwtVerifyException.ErrorCodes.Others);

             }

         }

     }