Skip to content
Snippets Groups Projects
Commit f563aa57 authored by Fabian Seidl's avatar Fabian Seidl
Browse files

updated naming, check for login didn'T make any sense

parent a294a36a
No related branches found
No related tags found
No related merge requests found
Pipeline #110216 failed
...@@ -130,7 +130,7 @@ func (s AuthServer) handleLogout(ctx context.Context, userName string) error { ...@@ -130,7 +130,7 @@ func (s AuthServer) handleLogout(ctx context.Context, userName string) error {
if len(md["authorize"]) > 0 { if len(md["authorize"]) > 0 {
token := md["authorize"][0] token := md["authorize"][0]
claims, err := s.jwtManager.GetClaimsFromToken(token, false) claims, err := s.jwtManager.GetClaimsFromToken(token, true)
if err != nil { if err != nil {
return err return err
} }
......
...@@ -39,7 +39,7 @@ func (man *JWTManager) GenerateToken(user User) (string, error) { ...@@ -39,7 +39,7 @@ func (man *JWTManager) GenerateToken(user User) (string, error) {
} }
// VerifyToken verifies if a given token string is a valid jwt token. // VerifyToken verifies if a given token string is a valid jwt token.
func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims, error) { func (man *JWTManager) VerifyToken(accessToken string, logout bool) (*UserClaims, error) {
token, err := jwt.ParseWithClaims( token, err := jwt.ParseWithClaims(
accessToken, accessToken,
&UserClaims{}, &UserClaims{},
...@@ -53,7 +53,7 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims, ...@@ -53,7 +53,7 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims,
}, },
) )
if err != nil && login { if err != nil && !logout {
return nil, status.Errorf(codes.Unauthenticated, "invalid token: %v", err) return nil, status.Errorf(codes.Unauthenticated, "invalid token: %v", err)
} }
...@@ -66,8 +66,8 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims, ...@@ -66,8 +66,8 @@ func (man *JWTManager) VerifyToken(accessToken string, login bool) (*UserClaims,
} }
// GetClaimsFromToken returns the UserClaims associated to the provided token. // GetClaimsFromToken returns the UserClaims associated to the provided token.
func (man *JWTManager) GetClaimsFromToken(token string, login bool) (*UserClaims, error) { func (man *JWTManager) GetClaimsFromToken(token string, logout bool) (*UserClaims, error) {
claims, err := man.VerifyToken(token, login) claims, err := man.VerifyToken(token, logout)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment