Moved lgoin from AccessHandler into Guard Service
This commit is contained in:
@@ -25,19 +25,19 @@ func init() {
|
||||
passSrv = NewPasswordService()
|
||||
}
|
||||
|
||||
type Auth struct {
|
||||
type AuthService struct {
|
||||
userRepo *domain.UserRepository
|
||||
cache *redis.Client
|
||||
}
|
||||
|
||||
func NewAuthService(userRepo *domain.UserRepository, cache *redis.Client) *Auth {
|
||||
return &Auth{
|
||||
func NewAuthService(userRepo *domain.UserRepository, cache *redis.Client) *AuthService {
|
||||
return &AuthService{
|
||||
userRepo: userRepo,
|
||||
cache: cache,
|
||||
}
|
||||
}
|
||||
|
||||
func (a *Auth) Login(login, passwd string) (string, error) {
|
||||
func (a *AuthService) Login(login, passwd string) (string, error) {
|
||||
user, err := a.userRepo.FindByUsername(login)
|
||||
if err != nil {
|
||||
// if err = database.NoRowsInQuerySet(err); err != nil {
|
||||
@@ -66,7 +66,7 @@ func (a *Auth) Login(login, passwd string) (string, error) {
|
||||
return accessToken, nil
|
||||
}
|
||||
|
||||
func (a *Auth) RefreshToken(accessToken string) (string, error) {
|
||||
func (a *AuthService) RefreshToken(accessToken string) (string, error) {
|
||||
token, claims, err := jwtSrv.ValidateAccessToken(accessToken)
|
||||
if err != nil || !token.Valid {
|
||||
return "", ErrInvalidAccessToken
|
||||
@@ -95,7 +95,7 @@ func (a *Auth) RefreshToken(accessToken string) (string, error) {
|
||||
return newAccessToken, nil
|
||||
}
|
||||
|
||||
func (a *Auth) Register(email, login, passwd string) (string, error) {
|
||||
func (a *AuthService) Register(email, login, passwd string) (string, error) {
|
||||
passwd, _ = passSrv.Hash(passwd)
|
||||
|
||||
id, err := a.userRepo.Create(&entity.User{
|
||||
@@ -110,7 +110,7 @@ func (a *Auth) Register(email, login, passwd string) (string, error) {
|
||||
return id, nil
|
||||
}
|
||||
|
||||
func (a *Auth) GetTokenFromAuthorizationHeader(header string) (string, error) {
|
||||
func (a *AuthService) getTokenFromAuthorizationHeader(header string) (string, error) {
|
||||
split := strings.Split(header, " ")
|
||||
if len(split) != 2 {
|
||||
return "", ErrParsingAccessToken
|
||||
@@ -119,7 +119,7 @@ func (a *Auth) GetTokenFromAuthorizationHeader(header string) (string, error) {
|
||||
return split[1], nil
|
||||
}
|
||||
|
||||
func (a *Auth) GetUIDByAccesssToken(aToken string) (string, error) {
|
||||
func (a *AuthService) getUIDByAccesssToken(aToken string) (string, error) {
|
||||
res := a.cache.Get(context.Background(), "user:"+aToken)
|
||||
if err := res.Err(); err != nil {
|
||||
return "", err
|
||||
@@ -130,7 +130,7 @@ func (a *Auth) GetUIDByAccesssToken(aToken string) (string, error) {
|
||||
return uid, nil
|
||||
}
|
||||
|
||||
func (a *Auth) saveTokensToCache(id, aToken, rToken string) error {
|
||||
func (a *AuthService) saveTokensToCache(id, aToken, rToken string) error {
|
||||
res := a.cache.Set(context.Background(), "auth:access_token:"+id, aToken, accessTokenExpireTime)
|
||||
if err := res.Err(); err != nil {
|
||||
fmt.Println("failed to save access token in cache: ", err.Error())
|
||||
|
||||
Reference in New Issue
Block a user