Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/models/usertoken/user_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ type UserToken struct {
UpdatedAt int64
RevokedAt int64
UnhashedToken string
IdToken string `xorm:"-" json:"-"`
IdToken string
}

const UrgentRotateTime = 1 * time.Minute
Expand Down
1 change: 1 addition & 0 deletions pkg/services/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ type CreateTokenCommand struct {
ClientIP net.IP
UserAgent string
ExternalSession *ExternalSession
IdToken string
}

// UserTokenService are used for generating and validating user tokens
Expand Down
9 changes: 5 additions & 4 deletions pkg/services/auth/authimpl/auth_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (s *UserAuthTokenService) CreateToken(ctx context.Context, cmd *auth.Create
SeenAt: 0,
RevokedAt: 0,
AuthTokenSeen: false,
// IdToken: cmd.IdToken,
IdToken: cmd.IdToken,
}

err = s.sqlStore.InTransaction(ctx, func(ctx context.Context) error {
Expand Down Expand Up @@ -124,9 +124,10 @@ func (s *UserAuthTokenService) CreateToken(ctx context.Context, cmd *auth.Create
var userToken auth.UserToken
err = userAuthToken.toUserToken(&userToken)

if cmd.IdToken != "" {
userToken.IdToken = cmd.IdToken
}
// 메모리저장 테스트
// if cmd.IdToken != "" {
// userToken.IdToken = cmd.IdToken
// }

return &userToken, err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/auth/authimpl/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type userAuthToken struct {
RevokedAt int64
UnhashedToken string `xorm:"-"`
ExternalSessionId int64
IdToken string `xorm:"-"`
IdToken string
}

func userAuthTokenFromUserToken(ut *auth.UserToken) (*userAuthToken, error) {
Expand Down
Loading