diff --git a/server/internal/api/auth/auth_api.go b/server/internal/api/auth/auth_api.go index 7bce6f05..c9e57eed 100644 --- a/server/internal/api/auth/auth_api.go +++ b/server/internal/api/auth/auth_api.go @@ -19,7 +19,7 @@ const ( ) var ( - errAuthRequired = core.New(http.StatusUnauthorized, "auth_required", "authorization required") + errAuthRequired = core.NewError(http.StatusUnauthorized, "auth_required", "authorization required") ) func CreateApiAuthHandler(a *core.App) func(c *gin.Context) { diff --git a/server/internal/api/routes/auth.go b/server/internal/api/routes/auth.go index 4a2aa886..d3d4da0e 100644 --- a/server/internal/api/routes/auth.go +++ b/server/internal/api/routes/auth.go @@ -21,11 +21,11 @@ func createLoginRouteHandler(a *core.App) func(c *gin.Context) { return func(c *gin.Context) { email, ok := c.GetQuery("email") if !ok { - panic(core.New(http.StatusBadRequest, "missing_email", "Email Not Specified")) + panic(core.NewError(http.StatusBadRequest, "missing_email", "Email Not Specified")) } password, ok := c.GetQuery("password") if !ok { - panic(core.New(http.StatusBadRequest, "missing_password", "Password Not Specified")) + panic(core.NewError(http.StatusBadRequest, "missing_password", "Password Not Specified")) } if user, err := a.VerifyUserPassword(c.Request.Context(), email, password); err != nil { diff --git a/server/internal/api/routes/fs/routes.go b/server/internal/api/routes/fs/routes.go index 3b054123..a309045d 100644 --- a/server/internal/api/routes/fs/routes.go +++ b/server/internal/api/routes/fs/routes.go @@ -8,8 +8,8 @@ import ( ) var ( - errResourceIDInvalid = core.New(http.StatusBadRequest, "resource_id_invalid", "Invalid UUID") - errInvalidParams = core.New(http.StatusBadRequest, "invalid_parameters", "Invalid Request Parameters") + errResourceIDInvalid = core.NewError(http.StatusBadRequest, "resource_id_invalid", "Invalid UUID") + errInvalidParams = core.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Request Parameters") ) func SetupRoutes(r *gin.RouterGroup) { diff --git a/server/internal/core/auth.go b/server/internal/core/auth.go index 7705b03a..448bad6c 100644 --- a/server/internal/core/auth.go +++ b/server/internal/core/auth.go @@ -21,7 +21,7 @@ var accessTokenValiditiy = pgtype.Interval{ Valid: true, } -var ErrCredentialsInvalid = New(http.StatusUnauthorized, "credentials_invalid", "invalid Credentials") +var ErrCredentialsInvalid = NewError(http.StatusUnauthorized, "credentials_invalid", "invalid Credentials") func (a App) VerifyUserPassword(ctx context.Context, email, password string) (User, error) { if user, err := a.db.UserByUsername(ctx, email); err != nil { diff --git a/server/internal/core/errors.go b/server/internal/core/errors.go index 35f3a069..67c60f4e 100644 --- a/server/internal/core/errors.go +++ b/server/internal/core/errors.go @@ -8,7 +8,7 @@ type Error struct { Message string `json:"msg"` } -func New(httpStatus int, code, msg string) error { +func NewError(httpStatus int, code, msg string) error { return &Error{ Status: httpStatus, Code: code, @@ -20,16 +20,16 @@ func (e Error) Error() string { return e.Message } -var ErrInsufficientPermissions = New(http.StatusUnauthorized, "insufficient_permissions", "insufficient permissions") -var ErrUserNotFound = New(http.StatusNotFound, "user_not_found", "no such user") +var ErrInsufficientPermissions = NewError(http.StatusUnauthorized, "insufficient_permissions", "insufficient permissions") +var ErrUserNotFound = NewError(http.StatusNotFound, "user_not_found", "no such user") var ( - ErrResourceNotFound = New(http.StatusNotFound, "resource_not_found", "no such file or directory") - ErrResourceNotCollection = New(http.StatusMethodNotAllowed, "resource_not_collection", "cannot add member to non-collection resource") - ErrResourceCollection = New(http.StatusMethodNotAllowed, "resource_collection", "cannot write to collection resource") - ErrResourceIDConflict = New(http.StatusConflict, "resource_id_conflict", "resource id already exists") - ErrResourceNameInvalid = New(http.StatusBadRequest, "resource_name_invalid", "invalid name") - ErrResourceNameConflict = New(http.StatusPreconditionFailed, "resource_name_conflict", "resource name already exists") - ErrResourceMoveTargetSubdirectory = New(http.StatusConflict, "move_target_subdirectory", "cannot move resource to its own subdirectory") - ErrParentNotFound = New(http.StatusConflict, "parent_not_found", "parent not found") + ErrResourceNotFound = NewError(http.StatusNotFound, "resource_not_found", "no such file or directory") + ErrResourceNotCollection = NewError(http.StatusMethodNotAllowed, "resource_not_collection", "cannot add member to non-collection resource") + ErrResourceCollection = NewError(http.StatusMethodNotAllowed, "resource_collection", "cannot write to collection resource") + ErrResourceIDConflict = NewError(http.StatusConflict, "resource_id_conflict", "resource id already exists") + ErrResourceNameInvalid = NewError(http.StatusBadRequest, "resource_name_invalid", "invalid name") + ErrResourceNameConflict = NewError(http.StatusPreconditionFailed, "resource_name_conflict", "resource name already exists") + ErrResourceMoveTargetSubdirectory = NewError(http.StatusConflict, "move_target_subdirectory", "cannot move resource to its own subdirectory") + ErrParentNotFound = NewError(http.StatusConflict, "parent_not_found", "parent not found") )