optclblast/block-accounting
1
0
Fork 0
mirror of https://github.com/emo2007/block-accounting.git synced 2024-09-19 16:56:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

small changes

Browse Source
This commit is contained in:
r8zavetr8v 2024-05-25 02:58:05 +03:00
parent 8ae32f0235
commit 471de27582
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/internal/interface/rest/presenters/auth.go
View File

@ -29,7 +29,7 @@ func NewAuthPresenter(
} }
func (p *authPresenter) ResponseJoin(user *models.User) ([]byte, error) { func (p *authPresenter) ResponseJoin(user *models.User) ([]byte, error) {
tokens, err := p.jwtInteractor.NewToken(user, 24*time.Hour) tokens, err := p.jwtInteractor.NewToken(user, 24*time.Hour, "")
if err != nil { if err != nil {
return nil, fmt.Errorf("error create access token. %w", err) return nil, fmt.Errorf("error create access token. %w", err)
} }
@ -48,7 +48,7 @@ func (p *authPresenter) ResponseJoin(user *models.User) ([]byte, error) {
} }
func (p *authPresenter) ResponseLogin(user *models.User) ([]byte, error) { func (p *authPresenter) ResponseLogin(user *models.User) ([]byte, error) {
tokens, err := p.jwtInteractor.NewToken(user, 24*time.Hour) tokens, err := p.jwtInteractor.NewToken(user, 24*time.Hour, "")
if err != nil { if err != nil {
return nil, fmt.Errorf("error create access token. %w", err) return nil, fmt.Errorf("error create access token. %w", err)
} }

4
backend/internal/usecase/interactors/jwt/jwt.go
View File

@ -21,7 +21,7 @@ var (
) )
type JWTInteractor interface { type JWTInteractor interface {
NewToken(user models.UserIdentity, duration time.Duration) (AccessToken, error) NewToken(user models.UserIdentity, duration time.Duration, remoteAddr string) (AccessToken, error)
User(token string) (*models.User, error) User(token string) (*models.User, error)
RefreshToken(ctx context.Context, token string, rToken string) (AccessToken, error) RefreshToken(ctx context.Context, token string, rToken string) (AccessToken, error)
} }
@ -53,7 +53,7 @@ type AccessToken struct {
} }
// NewToken creates new JWT token for given user // NewToken creates new JWT token for given user
func (w *jwtInteractor) NewToken(user models.UserIdentity, duration time.Duration) (AccessToken, error) { func (w *jwtInteractor) NewToken(user models.UserIdentity, duration time.Duration, remoteAddr string) (AccessToken, error) {
tokens, err := w.newTokens(user.Id(), duration) tokens, err := w.newTokens(user.Id(), duration)
if err != nil { if err != nil {
return AccessToken{}, fmt.Errorf("error create new tokens. %w", err) return AccessToken{}, fmt.Errorf("error create new tokens. %w", err)

4
backend/internal/usecase/repository/auth/repository.go
View File

@ -22,6 +22,8 @@ type AddTokenParams struct {
RefreshTokenExpiredAt time.Time RefreshTokenExpiredAt time.Time
CreatedAt time.Time CreatedAt time.Time
RemoteAddr string
} }
type GetTokenParams struct { type GetTokenParams struct {
@ -73,6 +75,7 @@ func (r *repositorySQL) AddToken(ctx context.Context, params AddTokenParams) err
"refresh_token", "refresh_token",
"token_expired_at", "token_expired_at",
"refresh_token_expired_at", "refresh_token_expired_at",
"remote_addr",
). ).
Values( Values(
params.UserId, params.UserId,
@ -80,6 +83,7 @@ func (r *repositorySQL) AddToken(ctx context.Context, params AddTokenParams) err
params.RefreshToken, params.RefreshToken,
params.TokenExpiredAt, params.TokenExpiredAt,
params.RefreshTokenExpiredAt, params.RefreshTokenExpiredAt,
params.RemoteAddr,
).PlaceholderFormat(sq.Dollar) ).PlaceholderFormat(sq.Dollar)
if _, err := query.RunWith(r.Conn(ctx)).ExecContext(ctx); err != nil { if _, err := query.RunWith(r.Conn(ctx)).ExecContext(ctx); err != nil {