Update the migration

Signed-off-by: Nikolai Rodionov <iam@allanger.xyz>

internal/controllers/tokens.go

@@ -31,14 +31,15 @@ var (
 )
 
 type TokenData struct {
-	UUID       string
-	Name       string
-	UserID     string
-	CreatedAt  time.Time
-	LastUserAt time.Time
-	RevokedAt  time.Time
-	ExpiredAt  time.Time
-	Scopes     map[string][]string
+	UUID        string
+	Name        string
+	UserID      string
+	CreatedAt   time.Time
+	LastUserAt  time.Time
+	RevokedAt   time.Time
+	ExpiresAt   time.Time
+	GeneratedAt time.Time
+	Scopes      map[string][]string
 }
 
 type Scopes struct{}
@@ -93,7 +94,7 @@ func (ctrl *TokenController) Create(ctx context.Context, data *TokenData) (strin
 		scopesJson,
 		time.Now(),
 		time.Now(),
-		data.ExpiredAt,
+		data.ExpiresAt,
 	); err != nil {
 		log.Error(err, "Couldn't insert a token in the database")
 		return "", ErrServerError
@@ -161,7 +162,7 @@ func (ctrl *TokenController) Regenerate(ctx context.Context, id string) (string,
 		expires_at = NOW() + (expires_at - generated_at),
 	WHERE uuid = $3;`
 
-	if _, err := ctrl.DB.Query(query, tokenHash, time.Now(), data.UUID); err != nil {
+	if _, err := ctrl.DB.Query(query, tokenHash, time.Now(), id); err != nil {
 		log.Error(err, "Couldn't insert a token in the database")
 		return "", ErrServerError
 	}
@@ -175,22 +176,47 @@ func (ctrl *TokenController) Get(ctx context.Context, uuid string) error {
 }
 
 // List all available token
-func (ctrl *TokenController) List(ctx context.Context, userID string) error {
+func (ctrl *TokenController) List(ctx context.Context, userID string) ([]TokenData, error) {
+	log := logger.FromContext(ctx).WithValues("user_id", userID)
+	log.V(2).Info("Regenerating a token")
+
+	result := []TokenData{}
+
 	query := `
-		SELECT id, name, generated_at, expires_at
+		SELECT uuid, name, generated_at, expires_at
 		FROM tokens
 		WHERE user_id = $1`
-	err := ctrl.DB.QueryRowContext(ctx, query, userID).Scan(
-		&t.ID,
-		&t.UserID,
-		&t.Name,
-		&scopes,
-		&t.GeneratedAt,
-		&t.ExpiresAt,
-	)
+
+	rows, err := ctrl.DB.QueryContext(ctx, query, userID)
 	if err != nil {
-		return nil, err
+		log.Error(err, "Couldn't list tokens")
+		return nil, ErrServerError
 	}
+
+	defer rows.Close()
+
+	if err := rows.Err(); err != nil {
+		log.Error(err, "Couldn't list tokens")
+		return nil, ErrServerError
+	}
+
+	for rows.Next() {
+		var t TokenData
+
+		err := rows.Scan(
+			&t.UUID,
+			&t.Name,
+			&t.GeneratedAt,
+			&t.ExpiresAt,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		result = append(result, t)
+	}
+
+	return result, nil
 }
 
 // Lis all available permissions