cleanup names

equinor · Oct 9, 2024 · 13ad01b · 13ad01b
1 parent d125ae7
commit 13ad01b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/api/middleware/auth/authentication.go b/api/middleware/auth/authentication.go
@@ -94,7 +94,7 @@ func NewZerologAuthenticationDetailsMiddleware() negroni.HandlerFunc {
 
 		logContext := log.Ctx(ctx).With()
 		if user.IsAuthenticated() {
-			logContext = logContext.Str("azure_oid", user.Id())
+			logContext = logContext.Str("user_id", user.Id())
 		} else {
 			logContext = logContext.Bool("anonymous", true)
 		}

diff --git a/api/utils/token/unchecked_principal.go b/api/utils/token/unchecked_principal.go
@@ -25,28 +25,28 @@ func (p *unchechedClaimsPrincipal) IsAuthenticated() bool {
 }
 func (p *unchechedClaimsPrincipal) Id() string {
 	if p.azureClaims.ObjectId != "" {
-		return fmt.Sprintf("unverified: %s", p.azureClaims.ObjectId)
+		return fmt.Sprintf("oid:%s", p.azureClaims.ObjectId)
 	}
 
-	return fmt.Sprintf("unverified: %s (sub!)", p.claims.Subject)
+	return fmt.Sprintf("sub:%s", p.claims.Subject)
 }
 
 func (p *unchechedClaimsPrincipal) Name() string {
 	if p.azureClaims.Upn != "" {
-		return fmt.Sprintf("unverified: %s", p.azureClaims.Upn)
+		return p.azureClaims.Upn
 	}
 
 	if p.azureClaims.AppDisplayName != "" {
-		return fmt.Sprintf("unverified: %s", p.azureClaims.AppDisplayName)
+		return p.azureClaims.AppDisplayName
 	}
 
 	if p.azureClaims.AppId != "" {
-		return fmt.Sprintf("unverified: %s", p.azureClaims.AppId)
+		return p.azureClaims.AppId
 	}
 
 	if p.azureClaims.ObjectId != "" {
-		return fmt.Sprintf("unverified: %s", p.azureClaims.ObjectId)
+		return p.azureClaims.ObjectId
 	}
 
-	return fmt.Sprintf("unverified: %s", p.claims.Subject)
+	return p.claims.Subject
 }