Add script to convert encoding and eof. And of course run it.

1 files changed, 101 insertions, 101 deletions

diff --git a/Timeline/Authenticate/AuthHandler.cs b/Timeline/Authenticate/AuthHandler.cs
index 41cb11c6..5b26716d 100644
--- a/Timeline/Authenticate/AuthHandler.cs
+++ b/Timeline/Authenticate/AuthHandler.cs
@@ -1,101 +1,101 @@
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.Net.Http.Headers;
-using System;
-using System.Linq;
-using System.Security.Claims;
-using System.Text.Encodings.Web;
-using System.Threading.Tasks;
-using Timeline.Services;
-
-namespace Timeline.Authenticate
-{
-    static class AuthConstants
-    {
-        public const string Scheme = "Bearer";
-        public const string DisplayName = "My Jwt Auth Scheme";
-    }
-
-    class AuthOptions : AuthenticationSchemeOptions
-    {
-        /// <summary>
-        /// The query param key to search for token. If null then query params are not searched for token. Default to <c>"token"</c>.
-        /// </summary>
-        public string TokenQueryParamKey { get; set; } = "token";
-    }
-
-    class AuthHandler : AuthenticationHandler<AuthOptions>
-    {
-        private readonly ILogger<AuthHandler> _logger;
-        private readonly IUserService _userService;
-
-        public AuthHandler(IOptionsMonitor<AuthOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, IUserService userService)
-            : base(options, logger, encoder, clock)
-        {
-            _logger = logger.CreateLogger<AuthHandler>();
-            _userService = userService;
-        }
-
-        // return null if no token is found
-        private string ExtractToken()
-        {
-            // check the authorization header
-            string header = Request.Headers[HeaderNames.Authorization];
-            if (!string.IsNullOrEmpty(header) && header.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
-            {
-                var token = header.Substring("Bearer ".Length).Trim();
-                _logger.LogInformation("Token is found in authorization header. Token is {} .", token);
-                return token;
-            }
-
-            // check the query params
-            var paramQueryKey = Options.TokenQueryParamKey;
-            if (!string.IsNullOrEmpty(paramQueryKey))
-            {
-                string token = Request.Query[paramQueryKey];
-                if (!string.IsNullOrEmpty(token))
-                {
-                    _logger.LogInformation("Token is found in query param with key \"{}\". Token is {} .", paramQueryKey, token);
-                    return token;
-                }
-            }
-
-            // not found anywhere then return null
-            return null;
-        }
-
-        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            var token = ExtractToken();
-            if (string.IsNullOrEmpty(token))
-            {
-                _logger.LogInformation("No jwt token is found.");
-                return AuthenticateResult.NoResult();
-            }
-
-            try
-            {
-                var userInfo = await _userService.VerifyToken(token);
-
-                var identity = new ClaimsIdentity(AuthConstants.Scheme);
-                identity.AddClaim(new Claim(identity.NameClaimType, userInfo.Username, ClaimValueTypes.String));
-                identity.AddClaims(Entities.UserUtility.IsAdminToRoleArray(userInfo.Administrator).Select(role => new Claim(identity.RoleClaimType, role, ClaimValueTypes.String)));
-
-                var principal = new ClaimsPrincipal();
-                principal.AddIdentity(identity);
-
-                return AuthenticateResult.Success(new AuthenticationTicket(principal, AuthConstants.Scheme));
-            }
-            catch (ArgumentException)
-            {
-                throw; // this exception usually means server error.
-            }
-            catch (Exception e)
-            {
-                _logger.LogInformation(e, "A jwt token validation failed.");
-                return AuthenticateResult.Fail(e);
-            }
-        }
-    }
-}
+using Microsoft.AspNetCore.Authentication;

+using Microsoft.Extensions.Logging;

+using Microsoft.Extensions.Options;

+using Microsoft.Net.Http.Headers;

+using System;

+using System.Linq;

+using System.Security.Claims;

+using System.Text.Encodings.Web;

+using System.Threading.Tasks;

+using Timeline.Services;

+

+namespace Timeline.Authenticate

+{

+    static class AuthConstants

+    {

+        public const string Scheme = "Bearer";

+        public const string DisplayName = "My Jwt Auth Scheme";

+    }

+

+    class AuthOptions : AuthenticationSchemeOptions

+    {

+        /// <summary>

+        /// The query param key to search for token. If null then query params are not searched for token. Default to <c>"token"</c>.

+        /// </summary>

+        public string TokenQueryParamKey { get; set; } = "token";

+    }

+

+    class AuthHandler : AuthenticationHandler<AuthOptions>

+    {

+        private readonly ILogger<AuthHandler> _logger;

+        private readonly IUserService _userService;

+

+        public AuthHandler(IOptionsMonitor<AuthOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, IUserService userService)

+            : base(options, logger, encoder, clock)

+        {

+            _logger = logger.CreateLogger<AuthHandler>();

+            _userService = userService;

+        }

+

+        // return null if no token is found

+        private string ExtractToken()

+        {

+            // check the authorization header

+            string header = Request.Headers[HeaderNames.Authorization];

+            if (!string.IsNullOrEmpty(header) && header.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))

+            {

+                var token = header.Substring("Bearer ".Length).Trim();

+                _logger.LogInformation("Token is found in authorization header. Token is {} .", token);

+                return token;

+            }

+

+            // check the query params

+            var paramQueryKey = Options.TokenQueryParamKey;

+            if (!string.IsNullOrEmpty(paramQueryKey))

+            {

+                string token = Request.Query[paramQueryKey];

+                if (!string.IsNullOrEmpty(token))

+                {

+                    _logger.LogInformation("Token is found in query param with key \"{}\". Token is {} .", paramQueryKey, token);

+                    return token;

+                }

+            }

+

+            // not found anywhere then return null

+            return null;

+        }

+

+        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()

+        {

+            var token = ExtractToken();

+            if (string.IsNullOrEmpty(token))

+            {

+                _logger.LogInformation("No jwt token is found.");

+                return AuthenticateResult.NoResult();

+            }

+

+            try

+            {

+                var userInfo = await _userService.VerifyToken(token);

+

+                var identity = new ClaimsIdentity(AuthConstants.Scheme);

+                identity.AddClaim(new Claim(identity.NameClaimType, userInfo.Username, ClaimValueTypes.String));

+                identity.AddClaims(Entities.UserUtility.IsAdminToRoleArray(userInfo.Administrator).Select(role => new Claim(identity.RoleClaimType, role, ClaimValueTypes.String)));

+

+                var principal = new ClaimsPrincipal();

+                principal.AddIdentity(identity);

+

+                return AuthenticateResult.Success(new AuthenticationTicket(principal, AuthConstants.Scheme));

+            }

+            catch (ArgumentException)

+            {

+                throw; // this exception usually means server error.

+            }

+            catch (Exception e)

+            {

+                _logger.LogInformation(e, "A jwt token validation failed.");

+                return AuthenticateResult.Fail(e);

+            }

+        }

+    }

+}