mirror of
https://github.com/get-drexa/drive.git
synced 2025-12-06 08:11:39 +00:00
fix: ret invalid cred if usr not found in login
This commit is contained in:
@@ -7,13 +7,30 @@ import (
|
||||
)
|
||||
|
||||
type NotFoundError struct {
|
||||
// ID is the ID that was used to try to find the user.
|
||||
// Not set if not tried.
|
||||
id uuid.UUID
|
||||
|
||||
// Email is the email that was used to try to find the user.
|
||||
// Not set if not tried.
|
||||
email string
|
||||
}
|
||||
|
||||
func newNotFoundError(id uuid.UUID) *NotFoundError {
|
||||
return &NotFoundError{id}
|
||||
func newNotFoundError(id uuid.UUID, email string) *NotFoundError {
|
||||
return &NotFoundError{id, email}
|
||||
}
|
||||
|
||||
func (e *NotFoundError) Error() string {
|
||||
return fmt.Sprintf("user not found: %v", e.id)
|
||||
}
|
||||
|
||||
type AlreadyExistsError struct {
|
||||
// Email is the email that was used to try to create the user.
|
||||
Email string
|
||||
}
|
||||
|
||||
func newAlreadyExistsError(email string) *AlreadyExistsError {
|
||||
return &AlreadyExistsError{email}
|
||||
}
|
||||
func (e *AlreadyExistsError) Error() string {
|
||||
return fmt.Sprintf("user with email %s already exists", e.Email)
|
||||
}
|
||||
|
||||
@@ -5,6 +5,8 @@ import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
|
||||
"github.com/get-drexa/drexa/internal/database"
|
||||
"github.com/get-drexa/drexa/internal/password"
|
||||
"github.com/google/uuid"
|
||||
"github.com/uptrace/bun"
|
||||
)
|
||||
@@ -13,20 +15,60 @@ type Service struct {
|
||||
db *bun.DB
|
||||
}
|
||||
|
||||
type UserRegistrationOptions struct {
|
||||
Email string
|
||||
DisplayName string
|
||||
Password password.Hashed
|
||||
}
|
||||
|
||||
func NewService(db *bun.DB) *Service {
|
||||
return &Service{
|
||||
db: db,
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Service) RegisterUser(ctx context.Context, opts UserRegistrationOptions) (*User, error) {
|
||||
u := User{
|
||||
Email: opts.Email,
|
||||
DisplayName: opts.DisplayName,
|
||||
Password: opts.Password,
|
||||
}
|
||||
|
||||
_, err := s.db.NewInsert().Model(&u).Returning("*").Exec(ctx)
|
||||
if err != nil {
|
||||
if database.IsUniqueViolation(err) {
|
||||
return nil, newAlreadyExistsError(u.Email)
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &u, nil
|
||||
}
|
||||
|
||||
func (s *Service) UserByID(ctx context.Context, id uuid.UUID) (*User, error) {
|
||||
var user User
|
||||
err := s.db.NewSelect().Model(&user).Where("id = ?", id).Scan(ctx)
|
||||
if err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, newNotFoundError(id)
|
||||
return nil, newNotFoundError(id, "")
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
func (s *Service) UserByEmail(ctx context.Context, email string) (*User, error) {
|
||||
var user User
|
||||
err := s.db.NewSelect().Model(&user).Where("email = ?", email).Scan(ctx)
|
||||
if err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, newNotFoundError(uuid.Nil, email)
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
func (s *Service) UserExistsByEmail(ctx context.Context, email string) (bool, error) {
|
||||
return s.db.NewSelect().Model(&User{}).Where("email = ?", email).Exists(ctx)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package user
|
||||
|
||||
import (
|
||||
"github.com/get-drexa/drexa/internal/password"
|
||||
"github.com/google/uuid"
|
||||
"github.com/uptrace/bun"
|
||||
)
|
||||
@@ -8,10 +9,10 @@ import (
|
||||
type User struct {
|
||||
bun.BaseModel `bun:"users"`
|
||||
|
||||
ID uuid.UUID `bun:",pk,type:uuid" json:"id"`
|
||||
DisplayName string `bun:"display_name,notnull" json:"displayName"`
|
||||
Email string `bun:"email,unique,notnull" json:"email"`
|
||||
Password string `bun:"password,notnull" json:"-"`
|
||||
StorageUsageBytes int64 `bun:"storage_usage_bytes,notnull" json:"storageUsageBytes"`
|
||||
StorageQuotaBytes int64 `bun:"storage_quota_bytes,notnull" json:"storageQuotaBytes"`
|
||||
ID uuid.UUID `bun:",pk,type:uuid" json:"id"`
|
||||
DisplayName string `bun:"display_name,notnull" json:"displayName"`
|
||||
Email string `bun:"email,unique,notnull" json:"email"`
|
||||
Password password.Hashed `bun:"password,notnull" json:"-"`
|
||||
StorageUsageBytes int64 `bun:"storage_usage_bytes,notnull" json:"storageUsageBytes"`
|
||||
StorageQuotaBytes int64 `bun:"storage_quota_bytes,notnull" json:"storageQuotaBytes"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user