modified: main_dc/yalarba/api_tp/internal/handlers/auth.go
modified: main_dc/yalarba/api_tp/internal/handlers/oauth.go modified: main_dc/yalarba/api_tp/internal/handlers/oauth_yandex.go modified: main_dc/yalarba/api_tp/internal/models/user.go modified: main_dc/yalarba/api_tp/internal/repository/user_repository.go modified: main_dc/yalarba/api_tp/internal/service/user_service.go modified: main_dc/yalarba/api_tp/internal/utils/oauth_utils.go modified: main_dc/yalarba/api_tp/pkg/database/postgres.go change naming for user into api
This commit is contained in:
@@ -21,7 +21,7 @@ func GenerateState() string {
|
||||
return fmt.Sprintf("%x", b)
|
||||
}
|
||||
|
||||
func (h *OAuthHandler) findOrCreateOAuthUser(provider, providerID, email, name string, token *oauth2.Token) (*models.User, error) {
|
||||
func (h *OAuthHandler) findOrCreateOAuthUser(provider, providerID, email, name string, token *oauth2.Token) (*models.UserT, error) {
|
||||
var oauthProvider models.OAuthProvider
|
||||
|
||||
err := h.DB.Where("provider = ? AND provider_id = ?", provider, providerID).
|
||||
@@ -37,7 +37,7 @@ func (h *OAuthHandler) findOrCreateOAuthUser(provider, providerID, email, name s
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var user models.User
|
||||
var user models.UserT
|
||||
if err := h.DB.First(&user, oauthProvider.UserID).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -45,12 +45,12 @@ func (h *OAuthHandler) findOrCreateOAuthUser(provider, providerID, email, name s
|
||||
}
|
||||
|
||||
// Ищем пользователя по email
|
||||
var user models.User
|
||||
var user models.UserT
|
||||
err = h.DB.Where("email = ?", email).First(&user).Error
|
||||
|
||||
if err != nil {
|
||||
// Создаем нового пользователя
|
||||
user = models.User{
|
||||
user = models.UserT{
|
||||
Email: email,
|
||||
Name: name,
|
||||
Password: GenerateRandomPassword(),
|
||||
|
||||
Reference in New Issue
Block a user