[GH-618]: Added slack attachment for webhook posts, in order to comment, edit, and close issues.

server/plugin/api_test.go

@@ -118,7 +118,7 @@ func TestPlugin_ServeHTTP(t *testing.T) {
 			p.SetAPI(&plugintest.API{})
 
 			req := test.httpTest.CreateHTTPRequest(test.request)
-			req.Header.Add("Mattermost-User-ID", test.userID)
+			req.Header.Add(headerMattermostUserID, test.userID)
 			rr := httptest.NewRecorder()
 			p.ServeHTTP(&plugin.Context{}, rr, req)
 			test.httpTest.CompareHTTPResponse(rr, test.expectedResponse)

server/plugin/error.go

@@ -0,0 +1,11 @@
+package plugin
+
+type APIErrorResponse struct {
+	ID         string `json:"id"`
+	Message    string `json:"message"`
+	StatusCode int    `json:"status_code"`
+}
+
+func (e *APIErrorResponse) Error() string {
+	return e.Message
+}

server/plugin/mm_34646_token_refresh.go

@@ -112,7 +112,7 @@ func (p *Plugin) forceResetUserTokenMM34646(ctx context.Context, config *Configu
 	info.MM34646ResetTokenDone = true
 	err = p.storeGitHubUserInfo(info)
 	if err != nil {
-		return "", errors.Wrap(err, "failed to store updated GitHubUserInfo")
+		return "", errors.Wrap(err, "failed to store updated serializer.GitHubUserInfo")
 	}
 	p.client.Log.Debug("Updated user access token for MM-34646", "user_id", info.UserID)
 

server/plugin/oauth.go

@@ -1,14 +1,72 @@
 package plugin
 
 import (
+	"context"
 	"sync"
+
+	"github.com/mattermost/mattermost/server/public/pluginapi/experimental/bot/logger"
+	"golang.org/x/oauth2"
 )
 
+type Context struct {
+	Ctx    context.Context
+	UserID string
+	Log    logger.Logger
+}
+
+type GitHubUserRequest struct {
+	UserID string `json:"user_id"`
+}
+
+type GitHubUserResponse struct {
+	Username string `json:"username"`
+}
+
+type ConnectedResponse struct {
+	Connected           bool                   `json:"connected"`
+	GitHubUsername      string                 `json:"github_username"`
+	GitHubClientID      string                 `json:"github_client_id"`
+	EnterpriseBaseURL   string                 `json:"enterprise_base_url,omitempty"`
+	Organizations       []string               `json:"organizations"`
+	UserSettings        *UserSettings          `json:"user_settings"`
+	ClientConfiguration map[string]interface{} `json:"configuration"`
+}
+
+type UserSettings struct {
+	SidebarButtons        string `json:"sidebar_buttons"`
+	DailyReminder         bool   `json:"daily_reminder"`
+	DailyReminderOnChange bool   `json:"daily_reminder_on_change"`
+	Notifications         bool   `json:"notifications"`
+}
+
+type GitHubUserInfo struct {
+	UserID              string
+	Token               *oauth2.Token
+	GitHubUsername      string
+	LastToDoPostAt      int64
+	Settings            *UserSettings
+	AllowedPrivateRepos bool
+
+	// MM34646ResetTokenDone is set for a user whose token has been reset for MM-34646.
+	MM34646ResetTokenDone bool
+}
+
 type OAuthCompleteEvent struct {
 	UserID string
 	Err    error
 }
 
+type UserContext struct {
+	Context
+	GHInfo *GitHubUserInfo
+}
+
+type OAuthState struct {
+	UserID         string `json:"user_id"`
+	Token          string `json:"token"`
+	PrivateAllowed bool   `json:"private_allowed"`
+}
+
 type OAuthBroker struct {
 	sendOAuthCompleteEvent func(event OAuthCompleteEvent)
 

server/plugin/plugin.go

@@ -2,7 +2,6 @@ package plugin
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -11,6 +10,7 @@ import (
 	"regexp"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/google/go-github/v54/github"
 	"github.com/gorilla/mux"
@@ -28,10 +28,14 @@ import (
 )
 
 const (
-	githubTokenKey       = "_githubtoken"
-	githubOauthKey       = "githuboauthkey_"
-	githubUsernameKey    = "_githubusername"
-	githubPrivateRepoKey = "_githubprivate"
+	githubTokenKey                    = "_githubtoken"
+	githubOauthKey                    = "githuboauthkey_"
+	githubUsernameKey                 = "_githubusername"
+	githubPrivateRepoKey              = "_githubprivate"
+	githubObjectTypeIssue             = "issue"
+	githubObjectTypeIssueComment      = "issue_comment"
+	githubObjectTypePRReviewComment   = "pr_review_comment"
+	githubObjectTypeDiscussionComment = "discussion_comment"
 
 	mm34646MutexKey = "mm34646_token_reset_mutex"
 	mm34646DoneKey  = "mm34646_token_reset_done"
@@ -56,6 +60,54 @@ const (
 	dailySummary                 = "_dailySummary"
 
 	chimeraGitHubAppIdentifier = "plugin-github"
+
+	apiErrorIDNotConnected = "not_connected"
+
+	// TokenTTL is the OAuth token expiry duration in seconds
+	tokenTTL = 600
+
+	requestTimeout         = 30 * time.Second
+	oauthCompleteTimeout   = 2 * time.Minute
+	headerMattermostUserID = "Mattermost-User-ID"
+	ownerQueryParam        = "owner"
+	repoQueryParam         = "repo"
+	numberQueryParam       = "number"
+	postIDQueryParam       = "postId"
+
+	issueStatus         = "status"
+	assigneesForProps   = "assignees"
+	labelsForProps      = "labels"
+	descriptionForProps = "description"
+	titleForProps       = "title"
+	attachmentsForProps = "attachments"
+	issueNumberForProps = "issue_number"
+	issueURLForProps    = "issue_url"
+	repoOwnerForProps   = "repo_owner"
+	repoNameForProps    = "repo_name"
+
+	statusClose  = "Close"
+	statusReopen = "Reopen"
+
+	issueCompleted  = "completed"
+	issueNotPlanned = "not_planned"
+	issueClose      = "closed"
+	issueOpen       = "open"
+
+	// Actions of webhook events
+	actionOpened               = "opened"
+	actionClosed               = "closed"
+	actionReopened             = "reopened"
+	actionSubmitted            = "submitted"
+	actionLabeled              = "labeled"
+	actionAssigned             = "assigned"
+	actionCreated              = "created"
+	actionDeleted              = "deleted"
+	actionEdited               = "edited"
+	actionMarkedReadyForReview = "ready_for_review"
+
+	postPropGithubRepo       = "gh_repo"
+	postPropGithubObjectID   = "gh_object_id"
+	postPropGithubObjectType = "gh_object_type"
 )
 
 var (
@@ -586,25 +638,6 @@ func (p *Plugin) getOAuthConfigForChimeraApp(scopes []string) *oauth2.Config {
 	}
 }
 
-type GitHubUserInfo struct {
-	UserID              string
-	Token               *oauth2.Token
-	GitHubUsername      string
-	LastToDoPostAt      int64
-	Settings            *UserSettings
-	AllowedPrivateRepos bool
-
-	// MM34646ResetTokenDone is set for a user whose token has been reset for MM-34646.
-	MM34646ResetTokenDone bool
-}
-
-type UserSettings struct {
-	SidebarButtons        string `json:"sidebar_buttons"`
-	DailyReminder         bool   `json:"daily_reminder"`
-	DailyReminderOnChange bool   `json:"daily_reminder_on_change"`
-	Notifications         bool   `json:"notifications"`
-}
-
 func (p *Plugin) storeGitHubUserInfo(info *GitHubUserInfo) error {
 	config := p.getConfiguration()
 
@@ -1037,7 +1070,7 @@ func (p *Plugin) sendRefreshEvent(userID string) {
 		return
 	}
 
-	contentMap, err := sidebarContent.toMap()
+	contentMap, err := sidebarContent.ToMap()
 	if err != nil {
 		p.client.Log.Warn("Failed to convert sidebar content to map", "error", err.Error())
 		return
@@ -1050,20 +1083,6 @@ func (p *Plugin) sendRefreshEvent(userID string) {
 	)
 }
 
-func (s *SidebarContent) toMap() (map[string]interface{}, error) {
-	var m map[string]interface{}
-	bytes, err := json.Marshal(&s)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = json.Unmarshal(bytes, &m); err != nil {
-		return nil, err
-	}
-
-	return m, nil
-}
-
 // getUsername returns the GitHub username for a given Mattermost user,
 // if the user is connected to GitHub via this plugin.
 // Otherwise it return the Mattermost username. It will be escaped via backticks.
@@ -1084,3 +1103,7 @@ func (p *Plugin) getUsername(mmUserID string) (string, error) {
 
 	return "@" + info.GitHubUsername, nil
 }
+
+func (p *Plugin) GetPluginAPIPath() string {
+	return fmt.Sprintf("%s/plugins/%s/api/v1", *p.client.Configuration.GetConfig().ServiceSettings.SiteURL, Manifest.Id)
+}

server/plugin/sidebar.go

@@ -0,0 +1,33 @@
+package plugin
+
+import (
+	"encoding/json"
+
+	"github.com/google/go-github/v54/github"
+)
+
+type FilteredNotification struct {
+	github.Notification
+	HTMLURL string `json:"html_url"`
+}
+
+type SidebarContent struct {
+	PRs         []*github.Issue         `json:"prs"`
+	Reviews     []*github.Issue         `json:"reviews"`
+	Assignments []*github.Issue         `json:"assignments"`
+	Unreads     []*FilteredNotification `json:"unreads"`
+}
+
+func (s *SidebarContent) ToMap() (map[string]interface{}, error) {
+	var m map[string]interface{}
+	bytes, err := json.Marshal(&s)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = json.Unmarshal(bytes, &m); err != nil {
+		return nil, err
+	}
+
+	return m, nil
+}

server/plugin/template.go

@@ -126,7 +126,7 @@ func init() {
 
 	// The repo template links to the corresponding repository.
 	template.Must(masterTemplate.New("repo").Parse(
-		`[\[{{.GetFullName}}\]]({{.GetHTMLURL}})`,
+		`[{{.GetFullName}}]({{.GetHTMLURL}})`,
 	))
 
 	// The eventRepoPullRequest links to the corresponding pull request, anchored at the repo.
@@ -256,19 +256,7 @@ Assignees: {{range $i, $el := .Assignees -}} {{- if $i}}, {{end}}{{template "use
 {{.GetPullRequest.GetBody | trimBody | quote | replaceAllGitHubUsernames}}`))
 
 	template.Must(masterTemplate.New("newIssue").Funcs(funcMap).Parse(`
-{{ if eq .Config.Style "collapsed" -}}
-{{template "repo" .Event.GetRepo}} New issue {{template "issue" .Event.GetIssue}} opened by {{template "user" .Event.GetSender}}.
-{{- else -}}
-#### {{.Event.GetIssue.GetTitle}}
-##### {{template "eventRepoIssue" .Event}}
-#new-issue by {{template "user" .Event.GetSender}}
-{{- if ne .Config.Style "skip-body" -}}
-{{- template "labels" dict "Labels" .Event.GetIssue.Labels "RepositoryURL" .Event.GetRepo.GetHTMLURL  }}
-{{- template "assignee" .Event.GetIssue }}
-
-{{.Event.GetIssue.GetBody | removeComments | replaceAllGitHubUsernames}}
-{{- end -}}
-{{- end }}
+{{template "user" .Event.GetSender}} created a new issue in {{template "repo" .Event.GetRepo}}
 `))
 
 	template.Must(masterTemplate.New("closedIssue").Funcs(funcMap).Parse(`