diff --git a/logs/api-logs.go b/logs/api-logs.go index f1e2af38af9641952df6c1918d8bc7be29120b87..22da97e82c56f000d84d7928816cf494841a9024 100644 --- a/logs/api-logs.go +++ b/logs/api-logs.go @@ -66,6 +66,7 @@ func LogIncomingAPIRequest(startTime time.Time, requestID string, claim map[stri } userID, _ := claim["UserID"].(int64) + username, _ := claim["Username"].(string) accountID, _ := claim["AccountID"].(int64) if accountID == 0 { if accountIDParam, ok := req.QueryStringParameters["account_id"]; ok { @@ -89,6 +90,7 @@ func LogIncomingAPIRequest(startTime time.Time, requestID string, claim map[stri SourceIP: req.RequestContext.Identity.SourceIP, UserAgent: req.RequestContext.Identity.UserAgent, UserID: userID, + Username: username, AccountID: accountID, Request: ApiLogRequest{ Headers: req.Headers, @@ -149,6 +151,7 @@ func LogOutgoingAPIRequest(startTime time.Time, requestID string, claim map[stri endTime := time.Now() userID, _ := claim["UserID"].(int64) + username, _ := claim["Username"].(string) accountID, _ := claim["AccountID"].(int64) params := map[string]string{} parsedURL, err := url.Parse(urlString) @@ -169,6 +172,7 @@ func LogOutgoingAPIRequest(startTime time.Time, requestID string, claim map[stri ResponseCode: responseCode, RequestID: requestID, UserID: userID, + Username: username, AccountID: accountID, Request: ApiLogRequest{ //Headers: req.Headers, @@ -219,6 +223,7 @@ type ApiLog struct { InitialAuthType string `json:"initial_auth_type,omitempty"` AccountID int64 `json:"account_id,omitempty"` UserID int64 `json:"user_id,omitempty"` + Username string `json:"username,omitempty"` SourceIP string `json:"source_ip,omitempty"` //only logged for incoming API UserAgent string `json:"user_agent,omitempty"` //only for incoming, indicate type of browser when UI RelevantID string `json:"relevant_id,omitempty"`