onasty @ 423cbf0b99dc599df0d35b331f87cdcf67c997be

···
        158
        158
         	}

      
        159
        159
         

      
        160
        160
         	// graceful shutdown

      
        161
        
        -	quit := make(chan os.Signal, 1)

      
        162
        
        -	signal.Notify(quit, os.Interrupt)

      
        163
        
        -	<-quit

      
        
        161
        +	quitCh := make(chan os.Signal, 1)

      
        
        162
        +	signal.Notify(quitCh, os.Interrupt)

      
        
        163
        +	<-quitCh

      
        164
        164
         

      
        165
        165
         	if err := srv.Stop(ctx); err != nil {

      
        166
        166
         		return errors.Join(errors.New("failed to stop http server"), err)

      

···
        274
        274
         }

      
        275
        275
         

      
        276
        276
         func (e *AppTestSuite) TestAuthV1_RefreshTokens_wrong() {

      
        277
        
        -	// requests a new token pair with a wrong refresh token

      
        278
        
        -

      
        279
        277
         	httpResp := e.httpRequest(

      
        280
        278
         		http.MethodPost,

      
        281
        279
         		"/api/v1/auth/refresh-tokens",

      

···
        27
        27
         		require.NoError(t, err)

      
        28
        28
         	})

      
        29
        29
         

      
        30
        
        -	t.Run("hashes mismatch", func(t *testing.T) {

      
        
        30
        +	t.Run("mismatch", func(t *testing.T) {

      
        31
        31
         		hashed, err := hasher.Hash(input + "4")

      
        32
        32
         		require.NoError(t, err)

      
        33
        33
         		require.NotEmpty(t, hashed)

      

···
        22
        22
         func (p ResetPasswordToken) IsExpired() bool {

      
        23
        23
         	return p.ExpiresAt.Before(time.Now())

      
        24
        24
         }

      
        
        25
        +

      
        
        26
        +type VerificationToken struct {

      
        
        27
        +	UserID    uuid.UUID

      
        
        28
        +	Token     string

      
        
        29
        +	CreatedAt time.Time

      
        
        30
        +	ExpiresAt time.Time

      
        
        31
        +}

      

···
        118
        118
         	}

      
        119
        119
         

      
        120
        120
         	verificationToken := uuid.Must(uuid.NewV4()).String()

      
        121
        
        -	if err := u.vertokrepo.Create(

      
        122
        
        -		ctx,

      
        123
        
        -		verificationToken,

      
        124
        
        -		userID,

      
        125
        
        -		time.Now(),

      
        126
        
        -		time.Now().Add(u.verificationTokenTTL),

      
        127
        
        -	); err != nil {

      
        
        121
        +	if err := u.vertokrepo.Create(ctx, models.VerificationToken{

      
        
        122
        +		UserID:    userID,

      
        
        123
        +		Token:     verificationToken,

      
        
        124
        +		CreatedAt: time.Now(),

      
        
        125
        +		ExpiresAt: time.Now().Add(u.verificationTokenTTL),

      
        
        126
        +	}); err != nil {

      
        128
        127
         		return uuid.Nil, err

      
        129
        128
         	}

      
        130
        129
         

      

···
        11
        11
         )

      
        12
        12
         

      
        13
        13
         type VerificationTokenStorer interface {

      
        14
        
        -	Create(

      
        15
        
        -		ctx context.Context,

      
        16
        
        -		token string,

      
        17
        
        -		userID uuid.UUID,

      
        18
        
        -		createdAt, expiresAt time.Time,

      
        19
        
        -	) error

      
        
        14
        +	Create(ctx context.Context, token models.VerificationToken) error

      
        20
        15
         

      
        21
        16
         	GetUserIDByTokenAndMarkAsUsed(

      
        22
        17
         		ctx context.Context,

      ···
        46
        41
         

      
        47
        42
         func (r *VerificationTokenRepo) Create(

      
        48
        43
         	ctx context.Context,

      
        49
        
        -	token string,

      
        50
        
        -	userID uuid.UUID,

      
        51
        
        -	createdAt, expiresAt time.Time,

      
        
        44
        +	token models.VerificationToken,

      
        52
        45
         ) error {

      
        53
        46
         	query, aggs, err := pgq.

      
        54
        47
         		Insert("verification_tokens").

      
        55
        48
         		Columns("user_id", "token", "created_at", "expires_at").

      
        56
        
        -		Values(userID, token, createdAt, expiresAt).

      
        
        49
        +		Values(token.UserID, token.Token, token.CreatedAt, token.ExpiresAt).

      
        57
        50
         		SQL()

      
        58
        51
         	if err != nil {

      
        59
        52
         		return err