stufflog/server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename internal package xlerrors -> slerrors.

Browse Source
This commit is contained in:
gisle
2020-05-15 10:02:43 +02:00
parent 14c9425ee7
commit 381cda1f8f
23 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/auth.go
+10 -10
View File
@@ -5,7 +5,7 @@ import (
"errors"
"git.aiterp.net/stufflog/server/database/repositories"
"git.aiterp.net/stufflog/server/internal/generate"
"git.aiterp.net/stufflog/server/internal/xlerrors"
"git.aiterp.net/stufflog/server/internal/slerrors"
"git.aiterp.net/stufflog/server/models"
"github.com/gin-gonic/gin"
"math/rand"
@@ -68,7 +68,7 @@ func (auth *Auth) Login(ctx context.Context, username, password string) (*models
func (auth *Auth) Logout(ctx context.Context) (*models.User, error) {
user := auth.UserFromContext(ctx)
if user == nil {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
c, ok := ctx.Value(ginCtxKey).(*gin.Context)
@@ -84,7 +84,7 @@ func (auth *Auth) Logout(ctx context.Context) (*models.User, error) {
func (auth *Auth) CreateUser(ctx context.Context, username, password, name string, active, admin bool) (*models.User, error) {
loggedInUser := auth.UserFromContext(ctx)
if loggedInUser == nil || !loggedInUser.Admin {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
user := &models.User{
@@ -114,7 +114,7 @@ func (auth *Auth) UserFromContext(ctx context.Context) *models.User {
func (auth *Auth) ProjectPermission(ctx context.Context, project models.Project) (*models.ProjectPermission, error) {
user := auth.UserFromContext(ctx)
if user == nil || !user.Active {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
permission, err := auth.projects.GetPermission(ctx, project, *user)
@@ -122,7 +122,7 @@ func (auth *Auth) ProjectPermission(ctx context.Context, project models.Project)
return nil, ErrInternalPermissionFailure
}
if permission.Level == models.ProjectPermissionLevelNoAccess {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
return permission, nil
@@ -131,7 +131,7 @@ func (auth *Auth) ProjectPermission(ctx context.Context, project models.Project)
func (auth *Auth) IssuePermission(ctx context.Context, issue models.Issue) (*models.ProjectPermission, error) {
user := auth.UserFromContext(ctx)
if user == nil || !user.Active {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
isOwnedOrAssigned := issue.AssigneeID == user.ID || issue.OwnerID == user.ID
@@ -141,10 +141,10 @@ func (auth *Auth) IssuePermission(ctx context.Context, issue models.Issue) (*mod
return nil, ErrInternalPermissionFailure
}
if permission.Level == models.ProjectPermissionLevelNoAccess {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
if !(permission.CanViewAnyIssue() || (permission.CanViewOwnIssue() && isOwnedOrAssigned)) {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
return permission, nil
@@ -184,7 +184,7 @@ func (auth *Auth) CheckGinSession(c *gin.Context) {
func (auth *Auth) EditUser(ctx context.Context, username string, setName *string, currentPassword *string, newPassword *string) (*models.User, error) {
loggedInUser := auth.UserFromContext(ctx)
if loggedInUser == nil {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
user, err := auth.users.Find(ctx, username)
@@ -193,7 +193,7 @@ func (auth *Auth) EditUser(ctx context.Context, username string, setName *string
}
if user.ID != loggedInUser.ID && !loggedInUser.Admin {
return nil, xlerrors.PermissionDenied
return nil, slerrors.PermissionDenied
}
if newPassword != nil {