Skip to content
Snippets Groups Projects
Commit d8a15727 authored by Jan Semmelink's avatar Jan Semmelink
Browse files

Replace username with user_id in api-log structure

parent 7816dc9c
No related branches found
No related tags found
No related merge requests found
......@@ -65,7 +65,7 @@ func LogIncomingAPIRequest(startTime time.Time, requestID string, claim map[stri
}
}
username, _ := claim["Username"].(string)
userID, _ := claim["UserID"].(int64)
accountID, _ := claim["AccountID"].(int64)
if accountID == 0 {
if accountIDParam, ok := req.QueryStringParameters["account_id"]; ok {
......@@ -88,7 +88,7 @@ func LogIncomingAPIRequest(startTime time.Time, requestID string, claim map[stri
InitialAuthUsername: authUsername,
SourceIP: req.RequestContext.Identity.SourceIP,
UserAgent: req.RequestContext.Identity.UserAgent,
Username: username,
UserID: userID,
AccountID: accountID,
Request: ApiLogRequest{
Headers: req.Headers,
......@@ -148,7 +148,7 @@ func LogOutgoingAPIRequest(startTime time.Time, requestID string, claim map[stri
//logger.Debugf("claim: %+v", claim)
endTime := time.Now()
username, _ := claim["Username"].(string)
userID, _ := claim["UserID"].(int64)
accountID, _ := claim["AccountID"].(int64)
params := map[string]string{}
parsedURL, err := url.Parse(urlString)
......@@ -168,7 +168,7 @@ func LogOutgoingAPIRequest(startTime time.Time, requestID string, claim map[stri
Address: parsedURL.Host,
ResponseCode: responseCode,
RequestID: requestID,
Username: username,
UserID: userID,
AccountID: accountID,
Request: ApiLogRequest{
//Headers: req.Headers,
......@@ -218,7 +218,7 @@ type ApiLog struct {
InitialAuthUsername string `json:"initial_auth_username,omitempty"`
InitialAuthType string `json:"initial_auth_type,omitempty"`
AccountID int64 `json:"account_id,omitempty"`
Username string `json:"username,omitempty"`
UserID int64 `json:"user_id,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"`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment