Logout

internal/services/token.go

@@ -25,8 +25,9 @@ type TokenService interface {
 
 	Refresh(string) (*models.Token, error)
 
-	Generate(string, int64, string) (string, error)
-	Verify(tokenString string) (*jwt.Token, error)
+	Generate(int64, int64, string) (string, error)
+	Verify(string) (*jwt.Token, error)
+	Invalid(int64, string) error
 
 	GetJwtToken(string) (*jwt.Token, error)
 	ExtractTokenString(string) string
@@ -90,7 +91,12 @@ func (s *tokenService) Verify(tokenString string) (*jwt.Token, error) {
 	return jwtToken, err
 }
 
-func (s *tokenService) Generate(user_id string, expire_at int64, role string) (string, error) {
+func (s *tokenService) Invalid(user_id int64, tokenString string) error {
+	err := s.repository.Invalid(user_id, tokenString)
+	return err
+}
+
+func (s *tokenService) Generate(user_id int64, expire_at int64, role string) (string, error) {
 	claims := jwt.MapClaims{}
 	claims["authorized"] = true
 	claims["sub"] = user_id
@@ -153,14 +159,6 @@ func (s *tokenService) Refresh(refreshToken string) (*models.Token, error) {
 	})
 
 	if err != nil {
-		fmt.Println("refresh token is not valid")
-	} else {
-
-		fmt.Println("refresh token is  valid")
-	}
-
-	if err != nil {
-		fmt.Println("error", err.Error())
 		return nil, err
 	}
 
@@ -173,6 +171,7 @@ func (s *tokenService) Refresh(refreshToken string) (*models.Token, error) {
 	if err != nil {
 		return nil, errors.New("wrong user")
 	}
+
 	role := claims["role"].(string)
 
 	token, err := s.repository.FindByRefreshToken(sub, refreshToken)

internal/services/userquiz.go

@@ -80,6 +80,7 @@ func (s *userQuizService) Generate(quiz_paper_id int64, userQuizPaper *models.Us
 			UserQuizPaperID: userQuizPaper.ID,
 			UserID:          userQuizPaper.UserID,
 			No:              quiz.No,
+			QuizID:          quiz.ID,
 			QuestionType:    quiz.QuestionType,
 			Question:        quiz.Question,
 			Content:         quiz.Content,