Simplify the logging calls in the OWIN version

kevinchalet · kevinchalet · commit fb3929bd4119 · 2017-03-05T19:47:26.000+01:00
diff --git a/src/Owin.Security.OAuth.Introspection/OAuthIntrospectionHandler.cs b/src/Owin.Security.OAuth.Introspection/OAuthIntrospectionHandler.cs
@@ -36,7 +36,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 // indicate that authentication was rejected by application code.
                 if (context.Ticket == null)
                 {
-                    Options.Logger.LogInformation("Authentication was stopped by application code.");
+                    Logger.LogInformation("Authentication was stopped by application code.");
 
                     return null;
                 }
@@ -46,7 +46,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
 
             else if (context.Skipped)
             {
-                Options.Logger.LogInformation("Authentication was skipped by application code.");
+                Logger.LogInformation("Authentication was skipped by application code.");
 
                 return null;
             }
@@ -59,7 +59,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 var header = Request.Headers[OAuthIntrospectionConstants.Headers.Authorization];
                 if (string.IsNullOrEmpty(header))
                 {
-                    Options.Logger.LogDebug("Authentication was skipped because no bearer token was received.");
+                    Logger.LogDebug("Authentication was skipped because no bearer token was received.");
 
                     return null;
                 }
@@ -68,8 +68,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 // See https://tools.ietf.org/html/rfc6750#section-2.1
                 if (!header.StartsWith(OAuthIntrospectionConstants.Schemes.Bearer + ' ', StringComparison.OrdinalIgnoreCase))
                 {
-                    Options.Logger.LogDebug("Authentication was skipped because an incompatible " +
-                                            "scheme was used in the 'Authorization' header.");
+                    Logger.LogDebug("Authentication was skipped because an incompatible " +
+                                    "scheme was used in the 'Authorization' header.");
 
                     return null;
                 }
@@ -79,8 +79,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
 
                 if (string.IsNullOrEmpty(token))
                 {
-                    Options.Logger.LogDebug("Authentication was skipped because the bearer token " +
-                                            "was missing from the 'Authorization' header.");
+                    Logger.LogDebug("Authentication was skipped because the bearer token " +
+                                    "was missing from the 'Authorization' header.");
 
                     return null;
                 }
@@ -96,8 +96,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 var payload = await GetIntrospectionPayloadAsync(token);
                 if (payload == null || !payload.Value<bool>(OAuthIntrospectionConstants.Claims.Active))
                 {
-                    Options.Logger.LogError("Authentication failed because the authorization " +
-                                            "server rejected the access token.");
+                    Logger.LogError("Authentication failed because the authorization " +
+                                    "server rejected the access token.");
 
                     Context.Set(typeof(OAuthIntrospectionError).FullName, new OAuthIntrospectionError
                     {
@@ -120,7 +120,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
             if (ticket.Properties.ExpiresUtc.HasValue &&
                 ticket.Properties.ExpiresUtc.Value < Options.SystemClock.UtcNow)
             {
-                Options.Logger.LogError("Authentication failed because the access token was expired.");
+                Logger.LogError("Authentication failed because the access token was expired.");
 
                 Context.Set(typeof(OAuthIntrospectionError).FullName, new OAuthIntrospectionError
                 {
@@ -135,8 +135,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
             // to be used with this resource server.
             if (!ValidateAudience(ticket))
             {
-                Options.Logger.LogError("Authentication failed because the access token " +
-                                        "was not valid for this resource server.");
+                Logger.LogError("Authentication failed because the access token " +
+                                "was not valid for this resource server.");
 
                 Context.Set(typeof(OAuthIntrospectionError).FullName, new OAuthIntrospectionError
                 {
@@ -156,7 +156,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 // indicate that authentication was rejected by application code.
                 if (notification.Ticket == null)
                 {
-                    Options.Logger.LogInformation("Authentication was stopped by application code.");
+                    Logger.LogInformation("Authentication was stopped by application code.");
 
                     return null;
                 }
@@ -166,7 +166,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
 
             else if (notification.Skipped)
             {
-                Options.Logger.LogInformation("Authentication was skipped by application code.");
+                Logger.LogInformation("Authentication was skipped by application code.");
 
                 return null;
             }
@@ -405,11 +405,11 @@ protected virtual async Task<JObject> GetIntrospectionPayloadAsync(string token)
             var response = await Options.HttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Request.CallCancelled);
             if (!response.IsSuccessStatusCode)
             {
-                Options.Logger.LogError("An error occurred while validating an access token: the remote server " +
-                                        "returned a {Status} response with the following payload: {Headers} {Body}.",
-                                        /* Status: */ response.StatusCode,
-                                        /* Headers: */ response.Headers.ToString(),
-                                        /* Body: */ await response.Content.ReadAsStringAsync());
+                Logger.LogError("An error occurred while validating an access token: the remote server " +
+                                "returned a {Status} response with the following payload: {Headers} {Body}.",
+                                /* Status: */ response.StatusCode,
+                                /* Headers: */ response.Headers.ToString(),
+                                /* Body: */ await response.Content.ReadAsStringAsync());
 
                 return null;
             }
@@ -425,7 +425,7 @@ protected virtual async Task<JObject> GetIntrospectionPayloadAsync(string token)
                 {
                     var payload = JObject.Load(reader);
 
-                    Options.Logger.LogInformation("The introspection response was successfully extracted: {Response}.", payload);
+                    Logger.LogInformation("The introspection response was successfully extracted: {Response}.", payload);
 
                     return payload;
                 }
@@ -437,8 +437,8 @@ exception is InvalidCastException ||
                                                   exception is JsonReaderException ||
                                                   exception is JsonSerializationException)
                 {
-                    Options.Logger.LogError("An error occurred while deserializing the " +
-                                            "introspection response: {Exception}.", exception);
+                    Logger.LogError("An error occurred while deserializing the " +
+                                    "introspection response: {Exception}.", exception);
 
                     return null;
                 }
@@ -489,7 +489,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
                 // Always exclude null values, as they can't be represented as valid claims.
                 if (property.Value.Type == JTokenType.None || property.Value.Type == JTokenType.Null)
                 {
-                    Options.Logger.LogInformation("The '{Claim}' claim was excluded because it was null.", property.Name);
+                    Logger.LogInformation("The '{Claim}' claim was excluded because it was null.", property.Name);
 
                     continue;
                 }
@@ -511,7 +511,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
                         // and https://tools.ietf.org/html/rfc7519#section-4.1.6 for more information.
                         if (property.Value.Type != JTokenType.Float && property.Value.Type != JTokenType.Integer)
                         {
-                            Options.Logger.LogWarning("The 'iat' claim was ignored because it was not a decimal value.");
+                            Logger.LogWarning("The 'iat' claim was ignored because it was not a decimal value.");
 
                             continue;
                         }
@@ -529,7 +529,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
                         // and https://tools.ietf.org/html/rfc7519#section-4.1.4 for more information.
                         if (property.Value.Type != JTokenType.Float && property.Value.Type != JTokenType.Integer)
                         {
-                            Options.Logger.LogWarning("The 'exp' claim was ignored because it was not a decimal value.");
+                            Logger.LogWarning("The 'exp' claim was ignored because it was not a decimal value.");
 
                             continue;
                         }
@@ -547,7 +547,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
                         // and https://tools.ietf.org/html/rfc7519#section-4.1.7 for more information.
                         if (property.Value.Type != JTokenType.String)
                         {
-                            Options.Logger.LogWarning("The 'jti' claim was ignored because it was not a string value.");
+                            Logger.LogWarning("The 'jti' claim was ignored because it was not a string value.");
 
                             continue;
                         }
@@ -564,7 +564,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
                         // and https://tools.ietf.org/html/rfc7519#section-4.1.7 for more information.
                         if (property.Value.Type != JTokenType.String)
                         {
-                            Options.Logger.LogWarning("The 'scope' claim was ignored because it was not a string value.");
+                            Logger.LogWarning("The 'scope' claim was ignored because it was not a string value.");
 
                             continue;
                         }
@@ -608,7 +608,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
                             var audiences = (JArray) property.Value;
                             if (audiences.Any(audience => audience.Type != JTokenType.String))
                             {
-                                Options.Logger.LogWarning("The 'aud' claim was ignored because it was not an array of strings.");
+                                Logger.LogWarning("The 'aud' claim was ignored because it was not an array of strings.");
 
                                 continue;
                             }
@@ -619,7 +619,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
                             continue;
                         }
 
-                        Options.Logger.LogWarning("The 'aud' claim was ignored because it was not a string nor an array.");
+                        Logger.LogWarning("The 'aud' claim was ignored because it was not a string nor an array.");
 
                         continue;
                     }
@@ -751,5 +751,7 @@ protected virtual async Task<AuthenticationTicket> RetrieveTicketAsync(string to
 
             return Options.AccessTokenFormat.Unprotect(Encoding.UTF8.GetString(bytes));
         }
+
+        public ILogger Logger => Options.Logger;
     }
 }
diff --git a/src/Owin.Security.OAuth.Validation/OAuthValidationHandler.cs b/src/Owin.Security.OAuth.Validation/OAuthValidationHandler.cs
@@ -28,7 +28,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 // indicate that authentication was rejected by application code.
                 if (context.Ticket == null)
                 {
-                    Options.Logger.LogInformation("Authentication was stopped by application code.");
+                    Logger.LogInformation("Authentication was stopped by application code.");
 
                     return null;
                 }
@@ -38,7 +38,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
 
             else if (context.Skipped)
             {
-                Options.Logger.LogInformation("Authentication was skipped by application code.");
+                Logger.LogInformation("Authentication was skipped by application code.");
 
                 return null;
             }
@@ -51,7 +51,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 var header = Request.Headers[OAuthValidationConstants.Headers.Authorization];
                 if (string.IsNullOrEmpty(header))
                 {
-                    Options.Logger.LogDebug("Authentication was skipped because no bearer token was received.");
+                    Logger.LogDebug("Authentication was skipped because no bearer token was received.");
 
                     return null;
                 }
@@ -60,8 +60,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 // See https://tools.ietf.org/html/rfc6750#section-2.1
                 if (!header.StartsWith(OAuthValidationConstants.Schemes.Bearer + ' ', StringComparison.OrdinalIgnoreCase))
                 {
-                    Options.Logger.LogDebug("Authentication was skipped because an incompatible " +
-                                            "scheme was used in the 'Authorization' header.");
+                    Logger.LogDebug("Authentication was skipped because an incompatible " +
+                                    "scheme was used in the 'Authorization' header.");
 
                     return null;
                 }
@@ -71,8 +71,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
 
                 if (string.IsNullOrEmpty(token))
                 {
-                    Options.Logger.LogDebug("Authentication was skipped because the bearer token " +
-                                            "was missing from the 'Authorization' header.");
+                    Logger.LogDebug("Authentication was skipped because the bearer token " +
+                                    "was missing from the 'Authorization' header.");
 
                     return null;
                 }
@@ -83,7 +83,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
             var ticket = await CreateTicketAsync(token);
             if (ticket == null)
             {
-                Options.Logger.LogError("Authentication failed because the access token was invalid.");
+                Logger.LogError("Authentication failed because the access token was invalid.");
 
                 Context.Set(typeof(OAuthValidationError).FullName, new OAuthValidationError
                 {
@@ -98,8 +98,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
             // to be used with this resource server.
             if (!ValidateAudience(ticket))
             {
-                Options.Logger.LogError("Authentication failed because the access token " +
-                                        "was not valid for this resource server.");
+                Logger.LogError("Authentication failed because the access token " +
+                                "was not valid for this resource server.");
 
                 Context.Set(typeof(OAuthValidationError).FullName, new OAuthValidationError
                 {
@@ -114,7 +114,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
             if (ticket.Properties.ExpiresUtc.HasValue &&
                 ticket.Properties.ExpiresUtc.Value < Options.SystemClock.UtcNow)
             {
-                Options.Logger.LogError("Authentication failed because the access token was expired.");
+                Logger.LogError("Authentication failed because the access token was expired.");
 
                 Context.Set(typeof(OAuthValidationError).FullName, new OAuthValidationError
                 {
@@ -134,7 +134,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
                 // indicate that authentication was rejected by application code.
                 if (notification.Ticket == null)
                 {
-                    Options.Logger.LogInformation("Authentication was stopped by application code.");
+                    Logger.LogInformation("Authentication was stopped by application code.");
 
                     return null;
                 }
@@ -144,7 +144,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()
 
             else if (notification.Skipped)
             {
-                Options.Logger.LogInformation("Authentication was skipped by application code.");
+                Logger.LogInformation("Authentication was skipped by application code.");
 
                 return null;
             }
@@ -403,5 +403,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke
 
             return notification.Ticket;
         }
+
+        public ILogger Logger => Options.Logger;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`36`	`36`	`// indicate that authentication was rejected by application code.`
`37`	`37`	`if (context.Ticket == null)`
`38`	`38`	`{`
`39`		`- Options.Logger.LogInformation("Authentication was stopped by application code.");`
	`39`	`+ Logger.LogInformation("Authentication was stopped by application code.");`
`40`	`40`
`41`	`41`	`return null;`
`42`	`42`	`}`
`@@ -46,7 +46,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`46`	`46`
`47`	`47`	`else if (context.Skipped)`
`48`	`48`	`{`
`49`		`- Options.Logger.LogInformation("Authentication was skipped by application code.");`
	`49`	`+ Logger.LogInformation("Authentication was skipped by application code.");`
`50`	`50`
`51`	`51`	`return null;`
`52`	`52`	`}`
`@@ -59,7 +59,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`59`	`59`	`var header = Request.Headers[OAuthIntrospectionConstants.Headers.Authorization];`
`60`	`60`	`if (string.IsNullOrEmpty(header))`
`61`	`61`	`{`
`62`		`- Options.Logger.LogDebug("Authentication was skipped because no bearer token was received.");`
	`62`	`+ Logger.LogDebug("Authentication was skipped because no bearer token was received.");`
`63`	`63`
`64`	`64`	`return null;`
`65`	`65`	`}`
`@@ -68,8 +68,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`68`	`68`	`// See https://tools.ietf.org/html/rfc6750#section-2.1`
`69`	`69`	`if (!header.StartsWith(OAuthIntrospectionConstants.Schemes.Bearer + ' ', StringComparison.OrdinalIgnoreCase))`
`70`	`70`	`{`
`71`		`- Options.Logger.LogDebug("Authentication was skipped because an incompatible " +`
`72`		`- "scheme was used in the 'Authorization' header.");`
	`71`	`+ Logger.LogDebug("Authentication was skipped because an incompatible " +`
	`72`	`+ "scheme was used in the 'Authorization' header.");`
`73`	`73`
`74`	`74`	`return null;`
`75`	`75`	`}`
`@@ -79,8 +79,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`79`	`79`
`80`	`80`	`if (string.IsNullOrEmpty(token))`
`81`	`81`	`{`
`82`		`- Options.Logger.LogDebug("Authentication was skipped because the bearer token " +`
`83`		`- "was missing from the 'Authorization' header.");`
	`82`	`+ Logger.LogDebug("Authentication was skipped because the bearer token " +`
	`83`	`+ "was missing from the 'Authorization' header.");`
`84`	`84`
`85`	`85`	`return null;`
`86`	`86`	`}`
`@@ -96,8 +96,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`96`	`96`	`var payload = await GetIntrospectionPayloadAsync(token);`
`97`	`97`	`if (payload == null \|\| !payload.Value<bool>(OAuthIntrospectionConstants.Claims.Active))`
`98`	`98`	`{`
`99`		`- Options.Logger.LogError("Authentication failed because the authorization " +`
`100`		`- "server rejected the access token.");`
	`99`	`+ Logger.LogError("Authentication failed because the authorization " +`
	`100`	`+ "server rejected the access token.");`
`101`	`101`
`102`	`102`	`Context.Set(typeof(OAuthIntrospectionError).FullName, new OAuthIntrospectionError`
`103`	`103`	`{`
`@@ -120,7 +120,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`120`	`120`	`if (ticket.Properties.ExpiresUtc.HasValue &&`
`121`	`121`	`ticket.Properties.ExpiresUtc.Value < Options.SystemClock.UtcNow)`
`122`	`122`	`{`
`123`		`- Options.Logger.LogError("Authentication failed because the access token was expired.");`
	`123`	`+ Logger.LogError("Authentication failed because the access token was expired.");`
`124`	`124`
`125`	`125`	`Context.Set(typeof(OAuthIntrospectionError).FullName, new OAuthIntrospectionError`
`126`	`126`	`{`
`@@ -135,8 +135,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`135`	`135`	`// to be used with this resource server.`
`136`	`136`	`if (!ValidateAudience(ticket))`
`137`	`137`	`{`
`138`		`- Options.Logger.LogError("Authentication failed because the access token " +`
`139`		`- "was not valid for this resource server.");`
	`138`	`+ Logger.LogError("Authentication failed because the access token " +`
	`139`	`+ "was not valid for this resource server.");`
`140`	`140`
`141`	`141`	`Context.Set(typeof(OAuthIntrospectionError).FullName, new OAuthIntrospectionError`
`142`	`142`	`{`
`@@ -156,7 +156,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`156`	`156`	`// indicate that authentication was rejected by application code.`
`157`	`157`	`if (notification.Ticket == null)`
`158`	`158`	`{`
`159`		`- Options.Logger.LogInformation("Authentication was stopped by application code.");`
	`159`	`+ Logger.LogInformation("Authentication was stopped by application code.");`
`160`	`160`
`161`	`161`	`return null;`
`162`	`162`	`}`
`@@ -166,7 +166,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`166`	`166`
`167`	`167`	`else if (notification.Skipped)`
`168`	`168`	`{`
`169`		`- Options.Logger.LogInformation("Authentication was skipped by application code.");`
	`169`	`+ Logger.LogInformation("Authentication was skipped by application code.");`
`170`	`170`
`171`	`171`	`return null;`
`172`	`172`	`}`
`@@ -405,11 +405,11 @@ protected virtual async Task<JObject> GetIntrospectionPayloadAsync(string token)`
`405`	`405`	`var response = await Options.HttpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, Request.CallCancelled);`
`406`	`406`	`if (!response.IsSuccessStatusCode)`
`407`	`407`	`{`
`408`		`- Options.Logger.LogError("An error occurred while validating an access token: the remote server " +`
`409`		`- "returned a {Status} response with the following payload: {Headers} {Body}.",`
`410`		`- /* Status: */ response.StatusCode,`
`411`		`- /* Headers: */ response.Headers.ToString(),`
`412`		`- /* Body: */ await response.Content.ReadAsStringAsync());`
	`408`	`+ Logger.LogError("An error occurred while validating an access token: the remote server " +`
	`409`	`+ "returned a {Status} response with the following payload: {Headers} {Body}.",`
	`410`	`+ /* Status: */ response.StatusCode,`
	`411`	`+ /* Headers: */ response.Headers.ToString(),`
	`412`	`+ /* Body: */ await response.Content.ReadAsStringAsync());`
`413`	`413`
`414`	`414`	`return null;`
`415`	`415`	`}`
`@@ -425,7 +425,7 @@ protected virtual async Task<JObject> GetIntrospectionPayloadAsync(string token)`
`425`	`425`	`{`
`426`	`426`	`var payload = JObject.Load(reader);`
`427`	`427`
`428`		`- Options.Logger.LogInformation("The introspection response was successfully extracted: {Response}.", payload);`
	`428`	`+ Logger.LogInformation("The introspection response was successfully extracted: {Response}.", payload);`
`429`	`429`
`430`	`430`	`return payload;`
`431`	`431`	`}`
`@@ -437,8 +437,8 @@ exception is InvalidCastException \|\|`
`437`	`437`	`exception is JsonReaderException \|\|`
`438`	`438`	`exception is JsonSerializationException)`
`439`	`439`	`{`
`440`		`- Options.Logger.LogError("An error occurred while deserializing the " +`
`441`		`- "introspection response: {Exception}.", exception);`
	`440`	`+ Logger.LogError("An error occurred while deserializing the " +`
	`441`	`+ "introspection response: {Exception}.", exception);`
`442`	`442`
`443`	`443`	`return null;`
`444`	`444`	`}`
`@@ -489,7 +489,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`489`	`489`	`// Always exclude null values, as they can't be represented as valid claims.`
`490`	`490`	`if (property.Value.Type == JTokenType.None \|\| property.Value.Type == JTokenType.Null)`
`491`	`491`	`{`
`492`		`- Options.Logger.LogInformation("The '{Claim}' claim was excluded because it was null.", property.Name);`
	`492`	`+ Logger.LogInformation("The '{Claim}' claim was excluded because it was null.", property.Name);`
`493`	`493`
`494`	`494`	`continue;`
`495`	`495`	`}`
`@@ -511,7 +511,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`511`	`511`	`// and https://tools.ietf.org/html/rfc7519#section-4.1.6 for more information.`
`512`	`512`	`if (property.Value.Type != JTokenType.Float && property.Value.Type != JTokenType.Integer)`
`513`	`513`	`{`
`514`		`- Options.Logger.LogWarning("The 'iat' claim was ignored because it was not a decimal value.");`
	`514`	`+ Logger.LogWarning("The 'iat' claim was ignored because it was not a decimal value.");`
`515`	`515`
`516`	`516`	`continue;`
`517`	`517`	`}`
`@@ -529,7 +529,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`529`	`529`	`// and https://tools.ietf.org/html/rfc7519#section-4.1.4 for more information.`
`530`	`530`	`if (property.Value.Type != JTokenType.Float && property.Value.Type != JTokenType.Integer)`
`531`	`531`	`{`
`532`		`- Options.Logger.LogWarning("The 'exp' claim was ignored because it was not a decimal value.");`
	`532`	`+ Logger.LogWarning("The 'exp' claim was ignored because it was not a decimal value.");`
`533`	`533`
`534`	`534`	`continue;`
`535`	`535`	`}`
`@@ -547,7 +547,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`547`	`547`	`// and https://tools.ietf.org/html/rfc7519#section-4.1.7 for more information.`
`548`	`548`	`if (property.Value.Type != JTokenType.String)`
`549`	`549`	`{`
`550`		`- Options.Logger.LogWarning("The 'jti' claim was ignored because it was not a string value.");`
	`550`	`+ Logger.LogWarning("The 'jti' claim was ignored because it was not a string value.");`
`551`	`551`
`552`	`552`	`continue;`
`553`	`553`	`}`
`@@ -564,7 +564,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`564`	`564`	`// and https://tools.ietf.org/html/rfc7519#section-4.1.7 for more information.`
`565`	`565`	`if (property.Value.Type != JTokenType.String)`
`566`	`566`	`{`
`567`		`- Options.Logger.LogWarning("The 'scope' claim was ignored because it was not a string value.");`
	`567`	`+ Logger.LogWarning("The 'scope' claim was ignored because it was not a string value.");`
`568`	`568`
`569`	`569`	`continue;`
`570`	`570`	`}`
`@@ -608,7 +608,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`608`	`608`	`var audiences = (JArray) property.Value;`
`609`	`609`	`if (audiences.Any(audience => audience.Type != JTokenType.String))`
`610`	`610`	`{`
`611`		`- Options.Logger.LogWarning("The 'aud' claim was ignored because it was not an array of strings.");`
	`611`	`+ Logger.LogWarning("The 'aud' claim was ignored because it was not an array of strings.");`
`612`	`612`
`613`	`613`	`continue;`
`614`	`614`	`}`
`@@ -619,7 +619,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`619`	`619`	`continue;`
`620`	`620`	`}`
`621`	`621`
`622`		`- Options.Logger.LogWarning("The 'aud' claim was ignored because it was not a string nor an array.");`
	`622`	`+ Logger.LogWarning("The 'aud' claim was ignored because it was not a string nor an array.");`
`623`	`623`
`624`	`624`	`continue;`
`625`	`625`	`}`
`@@ -751,5 +751,7 @@ protected virtual async Task<AuthenticationTicket> RetrieveTicketAsync(string to`
`751`	`751`
`752`	`752`	`return Options.AccessTokenFormat.Unprotect(Encoding.UTF8.GetString(bytes));`
`753`	`753`	`}`
	`754`	`+`
	`755`	`+ public ILogger Logger => Options.Logger;`
`754`	`756`	`}`
`755`	`757`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`28`	`28`	`// indicate that authentication was rejected by application code.`
`29`	`29`	`if (context.Ticket == null)`
`30`	`30`	`{`
`31`		`- Options.Logger.LogInformation("Authentication was stopped by application code.");`
	`31`	`+ Logger.LogInformation("Authentication was stopped by application code.");`
`32`	`32`
`33`	`33`	`return null;`
`34`	`34`	`}`
`@@ -38,7 +38,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`38`	`38`
`39`	`39`	`else if (context.Skipped)`
`40`	`40`	`{`
`41`		`- Options.Logger.LogInformation("Authentication was skipped by application code.");`
	`41`	`+ Logger.LogInformation("Authentication was skipped by application code.");`
`42`	`42`
`43`	`43`	`return null;`
`44`	`44`	`}`
`@@ -51,7 +51,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`51`	`51`	`var header = Request.Headers[OAuthValidationConstants.Headers.Authorization];`
`52`	`52`	`if (string.IsNullOrEmpty(header))`
`53`	`53`	`{`
`54`		`- Options.Logger.LogDebug("Authentication was skipped because no bearer token was received.");`
	`54`	`+ Logger.LogDebug("Authentication was skipped because no bearer token was received.");`
`55`	`55`
`56`	`56`	`return null;`
`57`	`57`	`}`
`@@ -60,8 +60,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`60`	`60`	`// See https://tools.ietf.org/html/rfc6750#section-2.1`
`61`	`61`	`if (!header.StartsWith(OAuthValidationConstants.Schemes.Bearer + ' ', StringComparison.OrdinalIgnoreCase))`
`62`	`62`	`{`
`63`		`- Options.Logger.LogDebug("Authentication was skipped because an incompatible " +`
`64`		`- "scheme was used in the 'Authorization' header.");`
	`63`	`+ Logger.LogDebug("Authentication was skipped because an incompatible " +`
	`64`	`+ "scheme was used in the 'Authorization' header.");`
`65`	`65`
`66`	`66`	`return null;`
`67`	`67`	`}`
`@@ -71,8 +71,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`71`	`71`
`72`	`72`	`if (string.IsNullOrEmpty(token))`
`73`	`73`	`{`
`74`		`- Options.Logger.LogDebug("Authentication was skipped because the bearer token " +`
`75`		`- "was missing from the 'Authorization' header.");`
	`74`	`+ Logger.LogDebug("Authentication was skipped because the bearer token " +`
	`75`	`+ "was missing from the 'Authorization' header.");`
`76`	`76`
`77`	`77`	`return null;`
`78`	`78`	`}`
`@@ -83,7 +83,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`83`	`83`	`var ticket = await CreateTicketAsync(token);`
`84`	`84`	`if (ticket == null)`
`85`	`85`	`{`
`86`		`- Options.Logger.LogError("Authentication failed because the access token was invalid.");`
	`86`	`+ Logger.LogError("Authentication failed because the access token was invalid.");`
`87`	`87`
`88`	`88`	`Context.Set(typeof(OAuthValidationError).FullName, new OAuthValidationError`
`89`	`89`	`{`
`@@ -98,8 +98,8 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`98`	`98`	`// to be used with this resource server.`
`99`	`99`	`if (!ValidateAudience(ticket))`
`100`	`100`	`{`
`101`		`- Options.Logger.LogError("Authentication failed because the access token " +`
`102`		`- "was not valid for this resource server.");`
	`101`	`+ Logger.LogError("Authentication failed because the access token " +`
	`102`	`+ "was not valid for this resource server.");`
`103`	`103`
`104`	`104`	`Context.Set(typeof(OAuthValidationError).FullName, new OAuthValidationError`
`105`	`105`	`{`
`@@ -114,7 +114,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`114`	`114`	`if (ticket.Properties.ExpiresUtc.HasValue &&`
`115`	`115`	`ticket.Properties.ExpiresUtc.Value < Options.SystemClock.UtcNow)`
`116`	`116`	`{`
`117`		`- Options.Logger.LogError("Authentication failed because the access token was expired.");`
	`117`	`+ Logger.LogError("Authentication failed because the access token was expired.");`
`118`	`118`
`119`	`119`	`Context.Set(typeof(OAuthValidationError).FullName, new OAuthValidationError`
`120`	`120`	`{`
`@@ -134,7 +134,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`134`	`134`	`// indicate that authentication was rejected by application code.`
`135`	`135`	`if (notification.Ticket == null)`
`136`	`136`	`{`
`137`		`- Options.Logger.LogInformation("Authentication was stopped by application code.");`
	`137`	`+ Logger.LogInformation("Authentication was stopped by application code.");`
`138`	`138`
`139`	`139`	`return null;`
`140`	`140`	`}`
`@@ -144,7 +144,7 @@ protected override async Task<AuthenticationTicket> AuthenticateCoreAsync()`
`144`	`144`
`145`	`145`	`else if (notification.Skipped)`
`146`	`146`	`{`
`147`		`- Options.Logger.LogInformation("Authentication was skipped by application code.");`
	`147`	`+ Logger.LogInformation("Authentication was skipped by application code.");`
`148`	`148`
`149`	`149`	`return null;`
`150`	`150`	`}`
`@@ -403,5 +403,7 @@ protected virtual async Task<AuthenticationTicket> CreateTicketAsync(string toke`
`403`	`403`
`404`	`404`	`return notification.Ticket;`
`405`	`405`	`}`
	`406`	`+`
	`407`	`+ public ILogger Logger => Options.Logger;`
`406`	`408`	`}`
`407`	`409`	`}`