feat: provide company name and tokens

snapp-incubator · Oct 23, 2024 · 371f367 · 371f367
1 parent de8b3aa
commit 371f367
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/internal/api/acl.go b/internal/api/acl.go
@@ -67,6 +67,8 @@ func (a API) ACLv2(c *fiber.Ctx) error {
 	span.SetAttributes(
 		attribute.String("access", request.Action),
 		attribute.String("topic", request.Topic),
+		attribute.String("username", request.Username),
+		attribute.String("password", request.Password),
 		attribute.String("authenticator", auth.GetCompany()),
 	)
 
@@ -85,7 +87,7 @@ func (a API) ACLv2(c *fiber.Ctx) error {
 			span.RecordError(err)
 		}
 
-		a.Metrics.ACLFailed(vendor, err)
+		a.Metrics.ACLFailed(auth.GetCompany(), err)
 
 		var tnaErr authenticator.TopicNotAllowedError
 
@@ -106,7 +108,7 @@ func (a API) ACLv2(c *fiber.Ctx) error {
 
 	logger.
 		Info("acl ok")
-	a.Metrics.ACLSuccess(vendor)
+	a.Metrics.ACLSuccess(auth.GetCompany())
 
 	return c.Status(http.StatusOK).JSON(ACLResponse{
 		Result: "allow",

diff --git a/internal/api/auth.go b/internal/api/auth.go
@@ -69,11 +69,13 @@ func (a API) Authv2(c *fiber.Ctx) error {
 		attribute.String("authenticator", auth.GetCompany()),
 		attribute.String("cliend-id", request.ClientID),
 		attribute.String("source", source),
+		attribute.String("username", request.Username),
+		attribute.String("password", request.Password),
 	)
 
 	if err := auth.Auth(ctx, token); err != nil {
 		span.RecordError(err)
-		a.Metrics.AuthFailed(vendor, source, err)
+		a.Metrics.AuthFailed(auth.GetCompany(), source, err)
 
 		if !errors.Is(err, jwt.ErrTokenExpired) {
 			logger.
@@ -91,7 +93,7 @@ func (a API) Authv2(c *fiber.Ctx) error {
 
 	logger.
 		Info("auth ok")
-	a.Metrics.AuthSuccess(vendor, source)
+	a.Metrics.AuthSuccess(auth.GetCompany(), source)
 
 	return c.Status(http.StatusOK).JSON(AuthResponse{
 		Result:      "allow",