Directly pass in auth objects when publishing events

pkg/models/events.go

@@ -18,6 +18,7 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/user"
+	"code.vikunja.io/web"
 )
 
 /////////////////
@@ -26,7 +27,7 @@ import (
 
 type TaskCreatedEvent struct {
 	Task *Task
-	Doer *user.User
+	Doer web.Auth
 }
 
 func (t *TaskCreatedEvent) TopicName() string {
@@ -35,7 +36,7 @@ func (t *TaskCreatedEvent) TopicName() string {
 
 type TaskUpdatedEvent struct {
 	Task *Task
-	Doer *user.User
+	Doer web.Auth
 }
 
 func (t *TaskUpdatedEvent) TopicName() string {
@@ -45,7 +46,7 @@ func (t *TaskUpdatedEvent) TopicName() string {
 // TaskDeletedEvent represents a TaskDeletedEvent event
 type TaskDeletedEvent struct {
 	Task *Task
-	Doer *user.User
+	Doer web.Auth
 }
 
 // TopicName defines the name for TaskDeletedEvent
@@ -56,7 +57,7 @@ func (t *TaskDeletedEvent) TopicName() string {
 type TaskAssigneeCreatedEvent struct {
 	Task     *Task
 	Assignee *user.User
-	Doer     *user.User
+	Doer     web.Auth
 }
 
 func (t *TaskAssigneeCreatedEvent) TopicName() string {
@@ -66,7 +67,7 @@ func (t *TaskAssigneeCreatedEvent) TopicName() string {
 type TaskCommentCreatedEvent struct {
 	Task    *Task
 	Comment *TaskComment
-	Doer    *user.User
+	Doer    web.Auth
 }
 
 func (t *TaskCommentCreatedEvent) TopicName() string {
@@ -79,7 +80,7 @@ func (t *TaskCommentCreatedEvent) TopicName() string {
 
 type NamespaceCreatedEvent struct {
 	Namespace *Namespace
-	Doer      *user.User
+	Doer      web.Auth
 }
 
 func (n *NamespaceCreatedEvent) TopicName() string {
@@ -88,7 +89,7 @@ func (n *NamespaceCreatedEvent) TopicName() string {
 
 type NamespaceUpdatedEvent struct {
 	Namespace *Namespace
-	Doer      *user.User
+	Doer      web.Auth
 }
 
 func (n *NamespaceUpdatedEvent) TopicName() string {
@@ -98,7 +99,7 @@ func (n *NamespaceUpdatedEvent) TopicName() string {
 // NamespaceDeletedEvent represents a NamespaceDeletedEvent event
 type NamespaceDeletedEvent struct {
 	Namespace *Namespace
-	Doer      *user.User
+	Doer      web.Auth
 }
 
 // TopicName defines the name for NamespaceDeletedEvent
@@ -112,7 +113,7 @@ func (t *NamespaceDeletedEvent) TopicName() string {
 
 type ListCreatedEvent struct {
 	List *List
-	Doer *user.User
+	Doer web.Auth
 }
 
 func (l *ListCreatedEvent) TopicName() string {
@@ -121,7 +122,7 @@ func (l *ListCreatedEvent) TopicName() string {
 
 type ListUpdatedEvent struct {
 	List *List
-	Doer *user.User
+	Doer web.Auth
 }
 
 func (l *ListUpdatedEvent) TopicName() string {
@@ -130,7 +131,7 @@ func (l *ListUpdatedEvent) TopicName() string {
 
 type ListDeletedEvent struct {
 	List *List
-	Doer *user.User
+	Doer web.Auth
 }
 
 func (t *ListDeletedEvent) TopicName() string {
@@ -144,7 +145,7 @@ func (t *ListDeletedEvent) TopicName() string {
 type ListSharedWithUserEvent struct {
 	List *List
 	User *user.User
-	Doer *user.User
+	Doer web.Auth
 }
 
 func (l *ListSharedWithUserEvent) TopicName() string {
@@ -154,7 +155,7 @@ func (l *ListSharedWithUserEvent) TopicName() string {
 type ListSharedWithTeamEvent struct {
 	List *List
 	Team *Team
-	Doer *user.User
+	Doer web.Auth
 }
 
 func (l *ListSharedWithTeamEvent) TopicName() string {
@@ -164,7 +165,7 @@ func (l *ListSharedWithTeamEvent) TopicName() string {
 type NamespaceSharedWithUserEvent struct {
 	Namespace *Namespace
 	User      *user.User
-	Doer      *user.User
+	Doer      web.Auth
 }
 
 func (n *NamespaceSharedWithUserEvent) TopicName() string {
@@ -174,7 +175,7 @@ func (n *NamespaceSharedWithUserEvent) TopicName() string {
 type NamespaceSharedWithTeamEvent struct {
 	Namespace *Namespace
 	Team      *Team
-	Doer      *user.User
+	Doer      web.Auth
 }
 
 func (n *NamespaceSharedWithTeamEvent) TopicName() string {
@@ -188,7 +189,7 @@ func (n *NamespaceSharedWithTeamEvent) TopicName() string {
 type TeamMemberAddedEvent struct {
 	Team   *Team
 	Member *user.User
-	Doer   *user.User
+	Doer   web.Auth
 }
 
 func (t *TeamMemberAddedEvent) TopicName() string {
@@ -198,7 +199,7 @@ func (t *TeamMemberAddedEvent) TopicName() string {
 // TeamCreatedEvent represents a TeamCreatedEvent event
 type TeamCreatedEvent struct {
 	Team *Team
-	Doer *user.User
+	Doer web.Auth
 }
 
 // TopicName defines the name for TeamCreatedEvent
@@ -209,7 +210,7 @@ func (t *TeamCreatedEvent) TopicName() string {
 // TeamDeletedEvent represents a TeamDeletedEvent event
 type TeamDeletedEvent struct {
 	Team *Team
-	Doer *user.User
+	Doer web.Auth
 }
 
 // TopicName defines the name for TeamDeletedEvent

pkg/models/list.go

@@ -546,14 +546,9 @@ func (l *List) Update(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
-
 	return events.Publish(&ListUpdatedEvent{
 		List: l,
-		Doer: doer,
+		Doer: a,
 	})
 }
 
@@ -618,7 +613,7 @@ func (l *List) Create(s *xorm.Session, a web.Auth) (err error) {
 
 	return events.Publish(&ListCreatedEvent{
 		List: l,
-		Doer: doer,
+		Doer: a,
 	})
 }
 
@@ -648,13 +643,9 @@ func (l *List) Delete(s *xorm.Session, a web.Auth) (err error) {
 		return
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	return events.Publish(&ListDeletedEvent{
 		List: l,
-		Doer: doer,
+		Doer: a,
 	})
 }
 

pkg/models/list_team.go

@@ -18,7 +18,6 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/events"
-	"code.vikunja.io/api/pkg/user"
 	"time"
 
 	"code.vikunja.io/web"
@@ -107,14 +106,10 @@ func (tl *TeamList) Create(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	err = events.Publish(&ListSharedWithTeamEvent{
 		List: l,
 		Team: team,
-		Doer: doer,
+		Doer: a,
 	})
 
 	err = updateListLastUpdated(s, l)

pkg/models/list_users.go

@@ -113,14 +113,10 @@ func (lu *ListUser) Create(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	err = events.Publish(&ListSharedWithUserEvent{
 		List: l,
 		User: u,
-		Doer: doer,
+		Doer: a,
 	})
 	if err != nil {
 		return err

pkg/models/namespace.go

@@ -480,7 +480,7 @@ func (n *Namespace) Create(s *xorm.Session, a web.Auth) (err error) {
 
 	err = events.Publish(&NamespaceCreatedEvent{
 		Namespace: n,
-		Doer:      n.Owner,
+		Doer:      a,
 	})
 	if err != nil {
 		return err
@@ -550,13 +550,9 @@ func (n *Namespace) Delete(s *xorm.Session, a web.Auth) (err error) {
 		return
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	return events.Publish(&NamespaceDeletedEvent{
 		Namespace: n,
-		Doer:      doer,
+		Doer:      a,
 	})
 }
 
@@ -621,12 +617,8 @@ func (n *Namespace) Update(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	return events.Publish(&NamespaceUpdatedEvent{
 		Namespace: n,
-		Doer:      doer,
+		Doer:      a,
 	})
 }

pkg/models/namespace_team.go

@@ -18,7 +18,6 @@ package models
 
 import (
 	"code.vikunja.io/api/pkg/events"
-	user2 "code.vikunja.io/api/pkg/user"
 	"time"
 
 	"code.vikunja.io/web"
@@ -102,14 +101,10 @@ func (tn *TeamNamespace) Create(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user2.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	return events.Publish(&NamespaceSharedWithTeamEvent{
 		Namespace: namespace,
 		Team:      team,
-		Doer:      doer,
+		Doer:      a,
 	})
 }
 

pkg/models/namespace_users.go

@@ -110,14 +110,10 @@ func (nu *NamespaceUser) Create(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user2.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	return events.Publish(&NamespaceSharedWithUserEvent{
 		Namespace: n,
 		User:      user,
-		Doer:      doer,
+		Doer:      a,
 	})
 }
 

pkg/models/task_assignees.go

@@ -224,15 +224,10 @@ func (t *Task) addNewAssigneeByID(s *xorm.Session, newAssigneeID int64, list *Li
 		return err
 	}
 
-	doer, err := user.GetFromAuth(auth)
-	if err != nil {
-		return err
-	}
-
 	err = events.Publish(&TaskAssigneeCreatedEvent{
 		Task:     t,
 		Assignee: newAssignee,
-		Doer:     doer,
+		Doer:     auth,
 	})
 	if err != nil {
 		return err

pkg/models/task_comments.go

@@ -72,14 +72,10 @@ func (tc *TaskComment) Create(s *xorm.Session, a web.Auth) (err error) {
 		return
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	err = events.Publish(&TaskCommentCreatedEvent{
 		Task:    &task,
 		Comment: tc,
-		Doer:    doer,
+		Doer:    a,
 	})
 	if err != nil {
 		return err

pkg/models/tasks.go

@@ -828,7 +828,7 @@ func createTask(s *xorm.Session, t *Task, a web.Auth, updateAssignees bool) (err
 
 	err = events.Publish(&TaskCreatedEvent{
 		Task: t,
-		Doer: t.CreatedBy,
+		Doer: a,
 	})
 	if err != nil {
 		return err
@@ -1034,13 +1034,9 @@ func (t *Task) Update(s *xorm.Session, a web.Auth) (err error) {
 	}
 	t.Updated = nt.Updated
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	err = events.Publish(&TaskUpdatedEvent{
 		Task: t,
-		Doer: doer,
+		Doer: a,
 	})
 	if err != nil {
 		return err
@@ -1195,13 +1191,9 @@ func (t *Task) Delete(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	err = events.Publish(&TaskDeletedEvent{
 		Task: t,
-		Doer: doer,
+		Doer: a,
 	})
 	if err != nil {
 		return

pkg/models/team_members.go

@@ -69,14 +69,10 @@ func (tm *TeamMember) Create(s *xorm.Session, a web.Auth) (err error) {
 		return err
 	}
 
-	doer, err := user2.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	return events.Publish(&TeamMemberAddedEvent{
 		Team:   team,
 		Member: user,
-		Doer:   doer,
+		Doer:   a,
 	})
 }
 

pkg/models/teams.go

@@ -272,7 +272,7 @@ func (t *Team) Create(s *xorm.Session, a web.Auth) (err error) {
 
 	return events.Publish(&TeamCreatedEvent{
 		Team: t,
-		Doer: doer,
+		Doer: a,
 	})
 }
 
@@ -313,13 +313,9 @@ func (t *Team) Delete(s *xorm.Session, a web.Auth) (err error) {
 		return
 	}
 
-	doer, err := user.GetFromAuth(a)
-	if err != nil {
-		return err
-	}
 	return events.Publish(&TeamDeletedEvent{
 		Team: t,
-		Doer: doer,
+		Doer: a,
 	})
 }