Skip to content
Snippets Groups Projects
Commit 06560dfb authored by Neil-Jocelyn Schark's avatar Neil-Jocelyn Schark Committed by Neil-Jocelyn Schark
Browse files

linting

parent b13c893f
No related branches found
No related tags found
1 merge request!977Resolve "Improve token usage for users"
This commit is part of merge request !977. Comments created here will be created in the context of that merge request.
...@@ -448,7 +448,7 @@ func ensureDefaultUserExists() error { ...@@ -448,7 +448,7 @@ func ensureDefaultUserExists() error {
func deletAllExpiredUserTokens() error { func deletAllExpiredUserTokens() error {
var usersToUpdate []rbac.User 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) jwtManager := rbacImpl.NewJWTManager(config.JWTSecret, config.JWTDuration)
users, err := c.userService.GetAll() users, err := c.userService.GetAll()
...@@ -480,7 +480,6 @@ func deletAllExpiredUserTokens() error { ...@@ -480,7 +480,6 @@ func deletAllExpiredUserTokens() error {
} }
} }
return nil return nil
} }
// Run calls initialize to start the controller. // Run calls initialize to start the controller.
......
...@@ -95,7 +95,10 @@ func (s AuthServer) Login(ctx context.Context, request *apb.LoginRequest) (*apb. ...@@ -95,7 +95,10 @@ func (s AuthServer) Login(ctx context.Context, request *apb.LoginRequest) (*apb.
userToUpdate.AddToken(token) userToUpdate.AddToken(token)
for len(userToUpdate.GetTokens()) > config.MaxTokensPerUser { 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) err = s.userService.Update(userToUpdate)
if err != nil { if err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment