Release bump 1.8.1 (#460)

* Remove check for client secret length (#419) * support client secrets longer than 64 chars * remove length check * change client secret length check to assume at least 64 chars * change wording of error message * [GH-321]:Fixed issue #321 'Wrong notification in case of assigned prs' (#395) Co-authored-by: Abhishek Verma <[email protected]> Co-authored-by: ayusht2810 <[email protected]> * [MI-3405] Fix issues #271: Sidebar header MR count should show assigned MRs instead of opened MRs (#39) (#394) * [MI-3405] Get proper data in sidebar buttons: 1. Get assigned PRs instead of the user's PRs. 2. Updated the name of sidebar buttons. 3. Updated API path. 4. Updated the name of API functions. 5. Updated the name of unreads to todos in the code. * [MI-3405] Updated name of variables and functions * [MI-3405] Updated icons in sidebar * [MI-3405] Updated documentation * [MI-3405] Reverted package-lock file changes * [MI-3405] Review fixes * [MM-42] Fix CI error: implicit memory aliasing (#429) * [MI-3588] Fix issue: Image attachment breaking in comment notification (#406) * [MI-3719] Send the users an ephemeral message if they try to connect their account via MM desktop app (#416) * [MI-3719] Send the users an ephemeral message if they try to connect their account via MM desktop app * [MI-3713] Handles the following cases as well for desktop app: 1. Connecting using the button from the teams sidebar. 2. Connecting using the button from RHS. * [MI-3719] Review fixes * [MI-3719] Review fixes Co-authored-by: Michael Kochell <[email protected]> * [MI-3719] Fix lint error --------- Co-authored-by: Michael Kochell <[email protected]> * Fix lint errors * Update plugin version --------- Co-authored-by: Michael Kochell <[email protected]> Co-authored-by: kshitij katiyar <[email protected]> Co-authored-by: Abhishek Verma <[email protected]> Co-authored-by: ayusht2810 <[email protected]>
mattermost · Feb 20, 2024 · 270b234 · 270b234
1 parent 475df6a
commit 270b234
Show file tree

Hide file tree

Showing 28 changed files with 319 additions and 170 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Each user in Mattermost is connected with their own personal GitLab account. Use
 
 ### Sidebar buttons
 
-Team members can stay up-to-date with how many reviews, unread messages, assignments, and open merge requests they have by using buttons in the Mattermost sidebar.
+Team members can stay up-to-date with how many reviews, todos, assigned issues, and assigned merge requests they have by using buttons in the Mattermost sidebar.
 
 ## Admin guide
 
@@ -142,7 +142,7 @@ Connect your Mattermost account to your GitLab account using `/gitlab connect` a
 
 ### Get "To Do" items
 
-Use `/gitlab todo` to get a list of unread messages and merge requests awaiting your review.
+Use `/gitlab todo` to get a list of todos, assigned issues, assigned merge requests and merge requests awaiting your review.
 
 ### Update settings
 

diff --git a/plugin.json b/plugin.json
@@ -6,7 +6,7 @@
     "support_url": "https://github.com/mattermost/mattermost-plugin-gitlab/issues",
     "release_notes_url": "https://github.com/mattermost/mattermost-plugin-gitlab/releases/tag/v1.8.0",
     "icon_path": "assets/icon.svg",
-    "version": "1.8.0",
+    "version": "1.8.1",
     "min_server_version": "7.1.0",
     "server": {
         "executables": {

diff --git a/server/api.go b/server/api.go
@@ -392,10 +392,10 @@ func (p *Plugin) completeConnectUserToGitlab(c *Context, w http.ResponseWriter,
 			"Turn off notifications with `/gitlab settings notifications off`.\n\n"+
 			"##### Sidebar Buttons\n"+
 			"Check out the buttons in the left-hand sidebar of Mattermost.\n"+
-			"* The first button tells you how many merge requests you have submitted.\n"+
+			"* The first button tells you how many merge requests you are assigned to.\n"+
 			"* The second shows the number of merge requests that are awaiting your review.\n"+
-			"* The third shows the number of merge requests and issues you are assigned to.\n"+
-			"* The fourth tracks the number of unread messages you have.\n"+
+			"* The third shows the number of issues you are assigned to.\n"+
+			"* The fourth tracks the number of todos you have.\n"+
 			"* The fifth will refresh the numbers.\n\n"+
 			"Click on them!\n\n"+
 			"##### Slash Commands\n"+

diff --git a/server/command.go b/server/command.go
@@ -19,7 +19,7 @@ import (
 
 const commandHelp = `* |/gitlab connect| - Connect your Mattermost account to your GitLab account
 * |/gitlab disconnect| - Disconnect your Mattermost account from your GitLab account
-* |/gitlab todo| - Get a list of unread messages and merge requests awaiting your review
+* |/gitlab todo| - Get a list of todos, assigned issues, assigned merge requests and merge requests awaiting your review
 * |/gitlab subscriptions list| - Will list the current channel subscriptions
 * |/gitlab subscriptions add owner[/repo] [features]| - Subscribe the current channel to receive notifications about opened merge requests and issues for a group or repository
   * |features| is a comma-delimited list of one or more the following:
@@ -248,7 +248,7 @@ func (p *Plugin) ExecuteCommand(c *plugin.Context, args *model.CommandArgs) (res
 		_, text, err := p.GetToDo(ctx, info)
 		if err != nil {
 			p.client.Log.Warn("can't get todo in command", "err", err.Error())
-			return p.getCommandResponse(args, "Encountered an error getting your to do items."), nil
+			return p.getCommandResponse(args, "Encountered an error getting your todo items."), nil
 		}
 		return p.getCommandResponse(args, text), nil
 	case "me":
@@ -773,7 +773,7 @@ func getAutocompleteData(config *configuration) *model.AutocompleteData {
 	disconnect := model.NewAutocompleteData("disconnect", "", "disconnect your GitLab account")
 	gitlab.AddCommand(disconnect)
 
-	todo := model.NewAutocompleteData("todo", "", "Get a list of unread messages and merge requests awaiting your review")
+	todo := model.NewAutocompleteData("todo", "", "Get a list of todos, assigned issues, assigned merge requests and merge requests awaiting your review")
 	gitlab.AddCommand(todo)
 
 	subscriptions := model.NewAutocompleteData("subscriptions", "[command]", "Available commands: Add, List, Delete")

diff --git a/server/command_test.go b/server/command_test.go
@@ -380,7 +380,7 @@ func TestAddWebhookCommand(t *testing.T) {
 			p.GitlabClient = mockedClient
 
 			conf := &model.Config{}
-			conf.ServiceSettings.SiteURL = &test.siteURL
+			conf.ServiceSettings.SiteURL = model.NewString(test.siteURL)
 
 			encryptedToken, _ := encrypt([]byte(testEncryptionKey), testGitlabToken)
 

diff --git a/server/configuration_test.go b/server/configuration_test.go
@@ -66,15 +66,15 @@ func TestSetDefaults(t *testing.T) {
 	for _, testCase := range []struct {
 		description string
 		isCloud     bool
-		config      configuration
+		config      *configuration
 
 		shouldChange bool
 		outputCheck  func(*testing.T, *configuration)
 		errMsg       string
 	}{
 		{
 			description: "noop",
-			config: configuration{
+			config: &configuration{
 				EncryptionKey: "abcd",
 				WebhookSecret: "efgh",
 			},
@@ -85,7 +85,7 @@ func TestSetDefaults(t *testing.T) {
 			},
 		}, {
 			description: "set encryption key",
-			config: configuration{
+			config: &configuration{
 				EncryptionKey: "",
 			},
 			shouldChange: true,
@@ -94,7 +94,7 @@ func TestSetDefaults(t *testing.T) {
 			},
 		}, {
 			description: "set webhook key",
-			config: configuration{
+			config: &configuration{
 				WebhookSecret: "",
 			},
 			shouldChange: true,
@@ -103,7 +103,7 @@ func TestSetDefaults(t *testing.T) {
 			},
 		}, {
 			description: "set webhook and encryption key",
-			config: configuration{
+			config: &configuration{
 				EncryptionKey: "",
 				WebhookSecret: "",
 			},
@@ -115,7 +115,7 @@ func TestSetDefaults(t *testing.T) {
 		}, {
 			description: "Should not set UsePreregisteredApplication in on-prem",
 			isCloud:     false,
-			config: configuration{
+			config: &configuration{
 				EncryptionKey:               "abcd",
 				WebhookSecret:               "efgh",
 				UsePreregisteredApplication: false,
@@ -128,7 +128,7 @@ func TestSetDefaults(t *testing.T) {
 		}, {
 			description: "Should set UsePreregisteredApplication in cloud if no OAuth secret is configured",
 			isCloud:     true,
-			config: configuration{
+			config: &configuration{
 				EncryptionKey:               "abcd",
 				WebhookSecret:               "efgh",
 				UsePreregisteredApplication: false,
@@ -143,7 +143,7 @@ func TestSetDefaults(t *testing.T) {
 		}, {
 			description: "Should set not UsePreregisteredApplication in cloud if OAuth secret is configured",
 			isCloud:     true,
-			config: configuration{
+			config: &configuration{
 				EncryptionKey:               "abcd",
 				WebhookSecret:               "efgh",
 				UsePreregisteredApplication: false,
@@ -163,7 +163,7 @@ func TestSetDefaults(t *testing.T) {
 			changed, err := testCase.config.setDefaults(testCase.isCloud)
 
 			assert.Equal(t, testCase.shouldChange, changed)
-			testCase.outputCheck(t, &testCase.config)
+			testCase.outputCheck(t, testCase.config)
 
 			if testCase.errMsg != "" {
 				require.Error(t, err)

diff --git a/server/flow.go b/server/flow.go
@@ -509,8 +509,8 @@ func (fm *FlowManager) submitOAuthConfig(f *flow.Flow, submitted map[string]inte
 
 	clientID = strings.TrimSpace(clientID)
 
-	if len(clientID) != 64 {
-		errorList["client_id"] = "Client ID should be 64 characters long"
+	if len(clientID) < 64 {
+		errorList["client_id"] = "Client ID should be at least 64 characters long"
 	}
 
 	clientSecretRaw, ok := submitted["client_secret"]
@@ -524,8 +524,8 @@ func (fm *FlowManager) submitOAuthConfig(f *flow.Flow, submitted map[string]inte
 
 	clientSecret = strings.TrimSpace(clientSecret)
 
-	if len(clientSecret) != 64 {
-		errorList["client_secret"] = "Client Secret should be 64 characters long"
+	if len(clientSecret) < 64 {
+		errorList["client_secret"] = "Client Secret should be at least 64 characters long"
 	}
 
 	if len(errorList) != 0 {

diff --git a/server/gitlab/api.go b/server/gitlab/api.go
@@ -41,10 +41,10 @@ type Issue struct {
 }
 
 type LHSContent struct {
-	PRs         []*MergeRequest      `json:"prs"`
-	Reviews     []*MergeRequest      `json:"reviews"`
-	Assignments []*Issue             `json:"assignments"`
-	Unreads     []*internGitlab.Todo `json:"unreads"`
+	AssignedPRs    []*MergeRequest      `json:"yourAssignedPrs"`
+	Reviews        []*MergeRequest      `json:"reviews"`
+	AssignedIssues []*Issue             `json:"yourAssignedIssues"`
+	Todos          []*internGitlab.Todo `json:"todos"`
 }
 
 // NewGroupHook creates a webhook associated with a GitLab group
@@ -303,21 +303,21 @@ func (g *gitlab) GetLHSData(ctx context.Context, user *UserInfo, token *oauth2.T
 		return err
 	})
 
-	var assignments []*Issue
+	var issues []*Issue
 	grp.Go(func() error {
-		assignments, err = g.GetYourAssignments(ctx, user, client)
+		issues, err = g.GetYourAssignedIssues(ctx, user, client)
 		return err
 	})
 
 	var mergeRequests []*MergeRequest
 	grp.Go(func() error {
-		mergeRequests, err = g.GetYourPrs(ctx, user, client)
+		mergeRequests, err = g.GetYourAssignedPrs(ctx, user, client)
 		return err
 	})
 
-	var unreads []*internGitlab.Todo
+	var todos []*internGitlab.Todo
 	grp.Go(func() error {
-		unreads, err = g.GetUnreads(ctx, user, client)
+		todos, err = g.GetToDoList(ctx, user, client)
 		return err
 	})
 
@@ -326,10 +326,10 @@ func (g *gitlab) GetLHSData(ctx context.Context, user *UserInfo, token *oauth2.T
 	}
 
 	return &LHSContent{
-		Reviews:     reviews,
-		PRs:         mergeRequests,
-		Assignments: assignments,
-		Unreads:     unreads,
+		Reviews:        reviews,
+		AssignedPRs:    mergeRequests,
+		AssignedIssues: issues,
+		Todos:          todos,
 	}, nil
 }
 
@@ -394,13 +394,13 @@ func (g *gitlab) GetReviews(ctx context.Context, user *UserInfo, client *internG
 	return mergeRequests, nil
 }
 
-func (g *gitlab) GetYourPrs(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*MergeRequest, error) {
+func (g *gitlab) GetYourAssignedPrs(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*MergeRequest, error) {
 	opened := stateOpened
 	scope := scopeAll
 	var mrs []*internGitlab.MergeRequest
 	if g.gitlabGroup == "" {
 		opt := &internGitlab.ListMergeRequestsOptions{
-			AuthorID:    &user.GitlabUserID,
+			AssigneeID:  internGitlab.AssigneeID(user.GitlabUserID),
 			State:       &opened,
 			Scope:       &scope,
 			ListOptions: internGitlab.ListOptions{Page: 1, PerPage: perPage},
@@ -418,7 +418,7 @@ func (g *gitlab) GetYourPrs(ctx context.Context, user *UserInfo, client *internG
 		}
 	} else {
 		opt := &internGitlab.ListGroupMergeRequestsOptions{
-			AuthorID:    &user.GitlabUserID,
+			AssigneeID:  internGitlab.AssigneeID(user.GitlabUserID),
 			State:       &opened,
 			Scope:       &scope,
 			ListOptions: internGitlab.ListOptions{Page: 1, PerPage: perPage},
@@ -547,7 +547,7 @@ func (g *gitlab) fetchYourPrDetails(c context.Context, log logger.Logger, client
 	return nil
 }
 
-func (g *gitlab) GetYourAssignments(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*Issue, error) {
+func (g *gitlab) GetYourAssignedIssues(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*Issue, error) {
 	opened := stateOpened
 	scope := scopeAll
 	var issues []*internGitlab.Issue
@@ -607,7 +607,7 @@ func (g *gitlab) GetYourAssignments(ctx context.Context, user *UserInfo, client
 	return result, nil
 }
 
-func (g *gitlab) GetUnreads(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*internGitlab.Todo, error) {
+func (g *gitlab) GetToDoList(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*internGitlab.Todo, error) {
 	var todos []*internGitlab.Todo
 
 	opt := &internGitlab.ListTodosOptions{

diff --git a/server/gitlab/gitlab.go b/server/gitlab/gitlab.go
@@ -29,10 +29,10 @@ type Gitlab interface {
 	GetProject(ctx context.Context, user *UserInfo, token *oauth2.Token, owner, repo string) (*internGitlab.Project, error)
 	GetYourPrDetails(ctx context.Context, log logger.Logger, user *UserInfo, token *oauth2.Token, prList []*PRDetails) ([]*PRDetails, error)
 	GetReviews(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*MergeRequest, error)
-	GetYourPrs(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*MergeRequest, error)
+	GetYourAssignedPrs(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*MergeRequest, error)
 	GetLHSData(ctx context.Context, user *UserInfo, token *oauth2.Token) (*LHSContent, error)
-	GetYourAssignments(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*Issue, error)
-	GetUnreads(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*internGitlab.Todo, error)
+	GetYourAssignedIssues(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*Issue, error)
+	GetToDoList(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*internGitlab.Todo, error)
 	GetProjectHooks(ctx context.Context, user *UserInfo, token *oauth2.Token, owner string, repo string) ([]*WebhookInfo, error)
 	GetGroupHooks(ctx context.Context, user *UserInfo, token *oauth2.Token, owner string) ([]*WebhookInfo, error)
 	NewProjectHook(ctx context.Context, user *UserInfo, token *oauth2.Token, projectID interface{}, projectHookOptions *AddWebhookOptions) (*WebhookInfo, error)

diff --git a/server/gitlab/mocks/mock_gitlab.go b/server/gitlab/mocks/mock_gitlab.go