Release bump 1.8.1

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
 

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": {

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"+

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")

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)
 

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)

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 {

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{

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)