Added eventlog implementation for refresh and token exchange operations

Altinn · Sep 8, 2023 · c0c6a05 · c0c6a05
1 parent efbdaa8
commit c0c6a05
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/Authentication/Controllers/AuthenticationController.cs b/src/Authentication/Controllers/AuthenticationController.cs
@@ -266,6 +266,8 @@ public async Task<ActionResult> RefreshJwtCookie()
 
             string serializedToken = await GenerateToken(principal);
 
+            UserAuthenticationModel userAuthentication = AuthenticationHelper.GetUserFromToken(serializedToken, null);
+            EventlogHelper.CreateAuthenticationEvent(_featureManager, _eventLog, userAuthentication, AuthenticationEventType.Refresh);
             _logger.LogInformation("End of refreshing token");
 
             return Ok(serializedToken);
@@ -365,6 +367,8 @@ private async Task<ActionResult> AuthenticateAltinnStudioToken(string originalTo
                 ClaimsPrincipal principal = new ClaimsPrincipal(identity);
 
                 string serializedToken = await GenerateToken(principal);
+                UserAuthenticationModel userAuthentication = AuthenticationHelper.GetUserFromToken(serializedToken, null);
+                EventlogHelper.CreateAuthenticationEvent(_featureManager, _eventLog, userAuthentication, AuthenticationEventType.TokenExchange);
                 return Ok(serializedToken);
             }
             catch (Exception ex)
@@ -484,6 +488,8 @@ private async Task<ActionResult> AuthenticateMaskinportenToken(string originalTo
                 ClaimsPrincipal principal = new ClaimsPrincipal(identity);
 
                 string serializedToken = await GenerateToken(principal);
+                UserAuthenticationModel userAuthentication = AuthenticationHelper.GetUserFromToken(serializedToken, null);
+                EventlogHelper.CreateAuthenticationEvent(_featureManager, _eventLog, userAuthentication, AuthenticationEventType.TokenExchange);
                 return Ok(serializedToken);
             }
             catch (Exception ex)
@@ -617,6 +623,8 @@ private async Task<ActionResult> AuthenticateIdPortenToken(string originalToken)
                 ClaimsPrincipal principal = new ClaimsPrincipal(identity);
 
                 string serializedToken = await GenerateToken(principal, token.ValidTo);
+                UserAuthenticationModel userAuthentication = AuthenticationHelper.GetUserFromToken(serializedToken, null);
+                EventlogHelper.CreateAuthenticationEvent(_featureManager, _eventLog, userAuthentication, AuthenticationEventType.TokenExchange);
                 return Ok(serializedToken);
             }
             catch (Exception ex)

diff --git a/src/Authentication/Enum/AuthenticationEventType.cs b/src/Authentication/Enum/AuthenticationEventType.cs
@@ -7,6 +7,8 @@ public enum AuthenticationEventType
     {
         AuthenticationFailed,
         Authenticated,
-        Logout
+        Refresh,
+        TokenExchange,
+        Logout,
     }
 }
diff --git a/src/Authentication/Helpers/AuthenticationHelper.cs b/src/Authentication/Helpers/AuthenticationHelper.cs
@@ -99,6 +99,24 @@ public static UserAuthenticationModel GetUserFromToken(JwtSecurityToken jwtSecur
             return userAuthenticationModel;
         }
 
+        /// <summary>
+        /// Get user information from the serializwd token string
+        /// </summary>
+        /// <param name="jwtToken">serialized jwt token string</param>
+        /// <param name="provider">token provider</param>
+        /// <returns></returns>
+        public static UserAuthenticationModel GetUserFromToken(string jwtToken, OidcProvider provider)
+        {
+            JwtSecurityTokenHandler tokenHandler = new JwtSecurityTokenHandler();
+            if (!string.IsNullOrEmpty(jwtToken))
+            {
+                JwtSecurityToken token = tokenHandler.ReadJwtToken(jwtToken);
+                return GetUserFromToken(token, provider);
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Converts IDporten acr claim �Authentication Context Class Reference� - The security level of assurance for the
         /// authentication. Possible values are Level3 (i.e. MinID was used) or Level4 (other eIDs).