From 06560dfb9247d0e020d02e54ee8e7c04e7e3e1ec Mon Sep 17 00:00:00 2001
From: Neil Schark <neil.schark@h-da.de>
Date: Thu, 25 Jul 2024 14:50:36 +0000
Subject: [PATCH] linting
---
controller/controller.go | 3 +--
controller/northbound/server/auth.go | 5 ++++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/controller/controller.go b/controller/controller.go
index dcd8e0676..c88134520 100644
--- a/controller/controller.go
+++ b/controller/controller.go
@@ -448,7 +448,7 @@ func ensureDefaultUserExists() error {
func deletAllExpiredUserTokens() error {
var usersToUpdate []rbac.User
- // Temporarly create JWT manager just to evaluate tokens here
+ // Temporary create JWT manager just to evaluate tokens here
jwtManager := rbacImpl.NewJWTManager(config.JWTSecret, config.JWTDuration)
users, err := c.userService.GetAll()
@@ -480,7 +480,6 @@ func deletAllExpiredUserTokens() error {
}
}
return nil
-
}
// Run calls initialize to start the controller.
diff --git a/controller/northbound/server/auth.go b/controller/northbound/server/auth.go
index 77477e3fb..0528efb19 100644
--- a/controller/northbound/server/auth.go
+++ b/controller/northbound/server/auth.go
@@ -95,7 +95,10 @@ func (s AuthServer) Login(ctx context.Context, request *apb.LoginRequest) (*apb.
userToUpdate.AddToken(token)
for len(userToUpdate.GetTokens()) > config.MaxTokensPerUser {
- userToUpdate.RemoveToken(userToUpdate.GetTokens()[0])
+ err = userToUpdate.RemoveToken(userToUpdate.GetTokens()[0])
+ if err != nil {
+ return nil, err
+ }
}
err = s.userService.Update(userToUpdate)
if err != nil {
--
GitLab