Sprint/2020 22

src/ApiCommons/Middleware/LoggingMiddleware.cs

-using Coscine.ApiCommons.Utils;
-using Coscine.Configuration;
+using Coscine.Configuration;
+using Coscine.JwtHandler;
 using Coscine.Logging;
-using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 using System;
 using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Coscine.ApiCommons.Middleware
@@ -29,7 +27,7 @@ namespace Coscine.ApiCommons.Middleware
             if (context.Request.Path.Value.Contains("TOS"))
             {
                 await _next(context);
-            } 
+            }
             else
             {
                 string _uri = "";
@@ -78,10 +76,11 @@ namespace Coscine.ApiCommons.Middleware
                                 bearer = bearer.Replace("Bearer", "").Trim();
                                 JWTHandler jwtHandler = new JWTHandler(new ConsulConfiguration());
                                 var claims = jwtHandler.GetContents(bearer);
-                                var userClaim = (from claimObj in claims
-                                                 where claimObj.Type == "UserId"
-                                                 select claimObj).First();
-                                CoscineLoggerMetadata.SetUserId(userClaim.Value);
+                                var userId = Authenticator.GetUserId(claims);
+                                if (userId != null)
+                                {
+                                    CoscineLoggerMetadata.SetUserId(userId);
+                                }
                             }
 
                             // Get the corrolation Id
@@ -90,7 +89,7 @@ namespace Coscine.ApiCommons.Middleware
                             {
                                 CoscineLoggerMetadata.SetClientCorrolationId(clientCorrolationId.ToString());
                             }
-                            CoscineLoggerMetadata.SetCorrolationId();                        
+                            CoscineLoggerMetadata.SetCorrolationId();
 
                             /*******************************************
                              * preparation of the logging process
@@ -160,7 +159,7 @@ namespace Coscine.ApiCommons.Middleware
                                 {
                                     _responseBody = "No Response Body or Response Body to long.";
                                 }
-                            
+
                                 responseBodyStream.Seek(0, SeekOrigin.Begin);
                                 await responseBodyStream.CopyToAsync(originalResponseBody);
                             }