Update all calls to CanRead methods
This commit is contained in:
parent
98c4dad64e
commit
224fa4fd10
|
@ -113,7 +113,7 @@ func (lt *LabelTask) Create(a web.Auth) (err error) {
|
||||||
func (lt *LabelTask) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
func (lt *LabelTask) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
||||||
// Check if the user has the right to see the task
|
// Check if the user has the right to see the task
|
||||||
task := Task{ID: lt.TaskID}
|
task := Task{ID: lt.TaskID}
|
||||||
canRead, err := task.CanRead(a)
|
canRead, _, err := task.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,7 @@ func (share *LinkSharing) ReadOne() (err error) {
|
||||||
// @Router /lists/{list}/shares [get]
|
// @Router /lists/{list}/shares [get]
|
||||||
func (share *LinkSharing) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) {
|
func (share *LinkSharing) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) {
|
||||||
list := &List{ID: share.ListID}
|
list := &List{ID: share.ListID}
|
||||||
can, err := list.CanRead(a)
|
can, _, err := list.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ type ListDuplicate struct {
|
||||||
func (ld *ListDuplicate) CanCreate(a web.Auth) (canCreate bool, err error) {
|
func (ld *ListDuplicate) CanCreate(a web.Auth) (canCreate bool, err error) {
|
||||||
// List Exists + user has read access to list
|
// List Exists + user has read access to list
|
||||||
ld.List = &List{ID: ld.ListID}
|
ld.List = &List{ID: ld.ListID}
|
||||||
canRead, err := ld.List.CanRead(a)
|
canRead, _, err := ld.List.CanRead(a)
|
||||||
if err != nil || !canRead {
|
if err != nil || !canRead {
|
||||||
return canRead, err
|
return canRead, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -168,7 +168,7 @@ func (tl *TeamList) Delete() (err error) {
|
||||||
func (tl *TeamList) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) {
|
func (tl *TeamList) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, totalItems int64, err error) {
|
||||||
// Check if the user can read the namespace
|
// Check if the user can read the namespace
|
||||||
l := &List{ID: tl.ListID}
|
l := &List{ID: tl.ListID}
|
||||||
canRead, err := l.CanRead(a)
|
canRead, _, err := l.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -174,7 +174,7 @@ func (lu *ListUser) Delete() (err error) {
|
||||||
func (lu *ListUser) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
func (lu *ListUser) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
||||||
// Check if the user has access to the list
|
// Check if the user has access to the list
|
||||||
l := &List{ID: lu.ListID}
|
l := &List{ID: lu.ListID}
|
||||||
canRead, err := l.CanRead(a)
|
canRead, _, err := l.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,7 @@ func (tn *TeamNamespace) Delete() (err error) {
|
||||||
func (tn *TeamNamespace) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
func (tn *TeamNamespace) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
||||||
// Check if the user can read the namespace
|
// Check if the user can read the namespace
|
||||||
n := Namespace{ID: tn.NamespaceID}
|
n := Namespace{ID: tn.NamespaceID}
|
||||||
canRead, err := n.CanRead(a)
|
canRead, _, err := n.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -160,7 +160,7 @@ func (nu *NamespaceUser) Delete() (err error) {
|
||||||
func (nu *NamespaceUser) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
func (nu *NamespaceUser) ReadAll(a web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
||||||
// Check if the user has access to the namespace
|
// Check if the user has access to the namespace
|
||||||
l := Namespace{ID: nu.NamespaceID}
|
l := Namespace{ID: nu.NamespaceID}
|
||||||
canRead, err := l.CanRead(a)
|
canRead, _, err := l.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -207,7 +207,7 @@ func (t *Task) addNewAssigneeByID(newAssigneeID int64, list *List) (err error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
canRead, err := list.CanRead(newAssignee)
|
canRead, _, err := list.CanRead(newAssignee)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -247,7 +247,7 @@ func (la *TaskAssginee) ReadAll(a web.Auth, search string, page int, perPage int
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
can, err := task.CanRead(a)
|
can, _, err := task.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -166,7 +166,7 @@ func (tf *TaskCollection) ReadAll(a web.Auth, search string, page int, perPage i
|
||||||
} else {
|
} else {
|
||||||
// Check the list exists and the user has acess on it
|
// Check the list exists and the user has acess on it
|
||||||
list := &List{ID: tf.ListID}
|
list := &List{ID: tf.ListID}
|
||||||
canRead, err := list.CanRead(a)
|
canRead, _, err := list.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,7 +165,7 @@ func (tc *TaskComment) ReadOne() (err error) {
|
||||||
func (tc *TaskComment) ReadAll(auth web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
func (tc *TaskComment) ReadAll(auth web.Auth, search string, page int, perPage int) (result interface{}, resultCount int, numberOfTotalItems int64, err error) {
|
||||||
|
|
||||||
// Check if the user has access to the task
|
// Check if the user has access to the task
|
||||||
canRead, err := tc.CanRead(auth)
|
canRead, _, err := tc.CanRead(auth)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, 0, 0, err
|
return nil, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ func (rel *TaskRelation) CanCreate(a web.Auth) (bool, error) {
|
||||||
|
|
||||||
// We explicitly don't check if the two tasks are on the same list.
|
// We explicitly don't check if the two tasks are on the same list.
|
||||||
otherTask := &Task{ID: rel.OtherTaskID}
|
otherTask := &Task{ID: rel.OtherTaskID}
|
||||||
has, err = otherTask.CanRead(a)
|
has, _, err = otherTask.CanRead(a)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -191,7 +191,7 @@ func GetListBackground(c echo.Context) error {
|
||||||
|
|
||||||
// Check if a background for this list exists + Rights
|
// Check if a background for this list exists + Rights
|
||||||
list := &models.List{ID: listID}
|
list := &models.List{ID: listID}
|
||||||
can, err := list.CanRead(auth)
|
can, _, err := list.CanRead(auth)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return handler.HandleHTTPError(err, c)
|
return handler.HandleHTTPError(err, c)
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,7 +79,7 @@ func getNamespace(c echo.Context) (namespace *models.Namespace, err error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
namespace = &models.Namespace{ID: namespaceID}
|
namespace = &models.Namespace{ID: namespaceID}
|
||||||
canRead, err := namespace.CanRead(user)
|
canRead, _, err := namespace.CanRead(user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return namespace, err
|
return namespace, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -119,7 +119,7 @@ func GetTaskAttachment(c echo.Context) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return handler.HandleHTTPError(err, c)
|
return handler.HandleHTTPError(err, c)
|
||||||
}
|
}
|
||||||
can, err := taskAttachment.CanRead(auth)
|
can, _, err := taskAttachment.CanRead(auth)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return handler.HandleHTTPError(err, c)
|
return handler.HandleHTTPError(err, c)
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,7 +78,7 @@ func ListUsersForList(c echo.Context) error {
|
||||||
return handler.HandleHTTPError(err, c)
|
return handler.HandleHTTPError(err, c)
|
||||||
}
|
}
|
||||||
|
|
||||||
canRead, err := list.CanRead(auth)
|
canRead, _, err := list.CanRead(auth)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return handler.HandleHTTPError(err, c)
|
return handler.HandleHTTPError(err, c)
|
||||||
}
|
}
|
||||||
|
|
|
@ -383,7 +383,7 @@ func (vlra *VikunjaListResourceAdapter) GetModTime() time.Time {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (vcls *VikunjaCaldavListStorage) getListRessource(isCollection bool) (rr VikunjaListResourceAdapter, err error) {
|
func (vcls *VikunjaCaldavListStorage) getListRessource(isCollection bool) (rr VikunjaListResourceAdapter, err error) {
|
||||||
can, err := vcls.list.CanRead(vcls.user)
|
can, _, err := vcls.list.CanRead(vcls.user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue