diff --git a/user/domain/domain.go b/user/domain/domain.go index 8a42fd5..4cbd14d 100644 --- a/user/domain/domain.go +++ b/user/domain/domain.go @@ -501,7 +501,7 @@ func (domain *Domain) CacheReadToken(ctx context.Context, token string) (string, expires, err := cache.Context(ctx).Get(token, email) - if err == cache.ErrNotFound { + if err != nil && err == cache.ErrNotFound { return "", errors.New("token not found") } else if time.Until(expires).Seconds() < 0 { return "", errors.New("token expired") diff --git a/user/handler/handler.go b/user/handler/handler.go index cac0129..14a1f34 100644 --- a/user/handler/handler.go +++ b/user/handler/handler.go @@ -437,15 +437,15 @@ func (s *User) VerifyToken(ctx context.Context, req *pb.VerifyTokenRequest, rsp // check if token is valid email, err := s.domain.CacheReadToken(ctx, token) - if err.Error() == "token not found" { + if err != nil && err.Error() == "token not found" { rsp.IsValid = false rsp.Message = err.Error() return nil - } else if err.Error() == "token expired" { + } else if err != nil && err.Error() == "token expired" { rsp.IsValid = false rsp.Message = err.Error() return nil - } else if err.Error() == "token empty" { + } else if err != nil && err.Error() == "token empty" { rsp.IsValid = false rsp.Message = err.Error() return nil