[MM-52887] Fix panic if todo is not part of a project (#378)

mattermost · Jun 19, 2023 · 9ec4c71 · 9ec4c71
1 parent 4eb8539
commit 9ec4c71
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/server/gitlab/api.go b/server/gitlab/api.go
@@ -611,9 +611,14 @@ func (g *gitlab) GetUnreads(ctx context.Context, user *UserInfo, token *oauth2.T
 		}
 		opt.Page = resp.NextPage
 	}
+
 	notifications := make([]*internGitlab.Todo, 0, len(todos))
 	for _, todo := range todos {
-		if g.checkGroup(strings.TrimSuffix(todo.Project.PathWithNamespace, "/"+todo.Project.Path)) != nil {
+		if todo == nil {
+			continue
+		}
+
+		if todo.Project != nil && g.checkGroup(strings.TrimSuffix(todo.Project.PathWithNamespace, "/"+todo.Project.Path)) != nil {
 			continue
 		}
 		notifications = append(notifications, todo)

diff --git a/server/plugin.go b/server/plugin.go
@@ -542,7 +542,11 @@ func (p *Plugin) GetToDo(ctx context.Context, user *gitlab.UserInfo) (bool, stri
 		notificationContent := ""
 
 		for _, n := range unreads {
-			if p.isNamespaceAllowed(n.Project.NameWithNamespace) != nil {
+			if n == nil {
+				continue
+			}
+
+			if n.Project != nil && p.isNamespaceAllowed(n.Project.NameWithNamespace) != nil {
 				continue
 			}
 			notificationCount++