Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MM-809]: fix the issue of getting errors when using github api with revoked/invalid token #40

Closed
wants to merge 2 commits into from
Closed

[MM-809]: fix the issue of getting errors when using github api with revoked/invalid token #40

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
442ed85
[MM-809]: fix the issue of getting errors when using github api with …
Kshitij-Katiyar Aug 30, 2024
8a961c3
Merge branch 'master' into MM-809
raghavaggarwal2308 Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 132 additions & 45 deletions server/plugin/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,9 +651,17 @@ func (p *Plugin) getMentions(c *UserContext, w http.ResponseWriter, r *http.Requ
orgList := p.configuration.getOrganizations()
query := getMentionSearchQuery(username, orgList)

result, _, err := githubClient.Search.Issues(c.Ctx, query, &github.SearchOptions{})
if err != nil {
c.Log.WithError(err).With(logger.LogContext{"query": query}).Warnf("Failed to search for issues")
var result *github.IssuesSearchResult
var err error
cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
result, _, err = githubClient.Search.Issues(c.Ctx, query, &github.SearchOptions{})
if err != nil {
return err
}
return nil
})
if cErr != nil {
c.Log.WithError(cErr).With(logger.LogContext{"query": query}).Warnf("Failed to search for issues")
return
}

Expand All @@ -662,9 +670,17 @@ func (p *Plugin) getMentions(c *UserContext, w http.ResponseWriter, r *http.Requ

func (p *Plugin) getUnreadsData(c *UserContext) []*FilteredNotification {
githubClient := p.githubConnectUser(c.Context.Ctx, c.GHInfo)
notifications, _, err := githubClient.Activity.ListNotifications(c.Ctx, &github.NotificationListOptions{})
if err != nil {
c.Log.WithError(err).Warnf("Failed to list notifications")
var notifications []*github.Notification
var err error
cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
notifications, _, err = githubClient.Activity.ListNotifications(c.Ctx, &github.NotificationListOptions{})
if err != nil {
return err
}
return nil
})
if cErr != nil {
c.Log.WithError(cErr).Warnf("Failed to list notifications")
return nil
}

Expand Down Expand Up @@ -803,9 +819,17 @@ func (p *Plugin) searchIssues(c *UserContext, w http.ResponseWriter, r *http.Req
allIssues := []*github.Issue{}
for _, org := range orgsList {
query := getIssuesSearchQuery(org, searchTerm)
result, _, err := githubClient.Search.Issues(c.Ctx, query, &github.SearchOptions{})
if err != nil {
c.Log.WithError(err).With(logger.LogContext{"query": query}).Warnf("Failed to search for issues")
var result *github.IssuesSearchResult
var err error
cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
result, _, err = githubClient.Search.Issues(c.Ctx, query, &github.SearchOptions{})
if err != nil {
return err
}
return nil
})
if cErr != nil {
c.Log.WithError(cErr).With(logger.LogContext{"query": query}).Warnf("Failed to search for issues")
p.writeJSON(w, make([]*github.Issue, 0))
return
}
Expand Down Expand Up @@ -909,8 +933,15 @@ func (p *Plugin) createIssueComment(c *UserContext, w http.ResponseWriter, r *ht
Body: &req.Comment,
}

result, rawResponse, err := githubClient.Issues.CreateComment(c.Ctx, req.Owner, req.Repo, req.Number, comment)
if err != nil {
var result *github.IssueComment
var rawResponse *github.Response
if cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
result, rawResponse, err = githubClient.Issues.CreateComment(c.Ctx, req.Owner, req.Repo, req.Number, comment)
if err != nil {
return err
}
return nil
}); cErr != nil {
statusCode := 500
if rawResponse != nil {
statusCode = rawResponse.StatusCode
Expand Down Expand Up @@ -979,9 +1010,8 @@ func (p *Plugin) getSidebarContent(c *UserContext, w http.ResponseWriter, r *htt

func (p *Plugin) postToDo(c *UserContext, w http.ResponseWriter, r *http.Request) {
githubClient := p.githubConnectUser(c.Context.Ctx, c.GHInfo)
username := c.GHInfo.GitHubUsername

text, err := p.GetToDo(c.Ctx, username, githubClient)
text, err := p.GetToDo(c.Ctx, c.GHInfo, githubClient)
if err != nil {
c.Log.WithError(err).Warnf("Failed to get Todos")
p.writeAPIError(w, &APIErrorResponse{ID: "", Message: "Encountered an error getting the to do items.", StatusCode: http.StatusUnauthorized})
Expand Down Expand Up @@ -1034,12 +1064,18 @@ func (p *Plugin) getIssueByNumber(c *UserContext, w http.ResponseWriter, r *http

githubClient := p.githubConnectUser(c.Context.Ctx, c.GHInfo)

result, _, err := githubClient.Issues.Get(c.Ctx, owner, repo, numberInt)
if err != nil {
var result *github.Issue
if cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
result, _, err = githubClient.Issues.Get(c.Ctx, owner, repo, numberInt)
if err != nil {
return err
}
return nil
}); cErr != nil {
// If the issue is not found, it's probably behind a private repo.
// Return an empty repose in this case.
var gerr *github.ErrorResponse
if errors.As(err, &gerr) && gerr.Response.StatusCode == http.StatusNotFound {
if errors.As(cErr, &gerr) && gerr.Response.StatusCode == http.StatusNotFound {
c.Log.WithError(err).With(logger.LogContext{
"owner": owner,
"repo": repo,
Expand All @@ -1049,7 +1085,7 @@ func (p *Plugin) getIssueByNumber(c *UserContext, w http.ResponseWriter, r *http
return
}

c.Log.WithError(err).With(logger.LogContext{
c.Log.WithError(cErr).With(logger.LogContext{
"owner": owner,
"repo": repo,
"number": numberInt,
Expand All @@ -1075,13 +1111,18 @@ func (p *Plugin) getPrByNumber(c *UserContext, w http.ResponseWriter, r *http.Re
}

githubClient := p.githubConnectUser(c.Context.Ctx, c.GHInfo)

result, _, err := githubClient.PullRequests.Get(c.Ctx, owner, repo, numberInt)
if err != nil {
var result *github.PullRequest
if cErr := p.useGitHubClient(c.GHInfo, func(userInfo *GitHubUserInfo, token *oauth2.Token) error {
result, _, err = githubClient.PullRequests.Get(c.Ctx, owner, repo, numberInt)
if err != nil {
return err
}
return nil
}); cErr != nil {
// If the pull request is not found, it's probably behind a private repo.
// Return an empty repose in this case.
var gerr *github.ErrorResponse
if errors.As(err, &gerr) && gerr.Response.StatusCode == http.StatusNotFound {
if errors.As(cErr, &gerr) && gerr.Response.StatusCode == http.StatusNotFound {
c.Log.With(logger.LogContext{
"owner": owner,
"repo": repo,
Expand All @@ -1092,7 +1133,7 @@ func (p *Plugin) getPrByNumber(c *UserContext, w http.ResponseWriter, r *http.Re
return
}

c.Log.WithError(err).With(logger.LogContext{
c.Log.WithError(cErr).With(logger.LogContext{
"owner": owner,
"repo": repo,
"number": numberInt,
Expand All @@ -1118,9 +1159,16 @@ func (p *Plugin) getLabels(c *UserContext, w http.ResponseWriter, r *http.Reques
opt := github.ListOptions{PerPage: 50}

for {
labels, resp, err := githubClient.Issues.ListLabels(c.Ctx, owner, repo, &opt)
if err != nil {
c.Log.WithError(err).Warnf("Failed to list labels")
var labels []*github.Label
var resp *github.Response
if cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
labels, resp, err = githubClient.Issues.ListLabels(c.Ctx, owner, repo, &opt)
if err != nil {
return err
}
return nil
}); cErr != nil {
c.Log.WithError(cErr).Warnf("Failed to list labels")
p.writeAPIError(w, &APIErrorResponse{Message: "Failed to fetch labels", StatusCode: http.StatusInternalServerError})
return
}
Expand All @@ -1146,9 +1194,16 @@ func (p *Plugin) getAssignees(c *UserContext, w http.ResponseWriter, r *http.Req
opt := github.ListOptions{PerPage: 50}

for {
assignees, resp, err := githubClient.Issues.ListAssignees(c.Ctx, owner, repo, &opt)
if err != nil {
c.Log.WithError(err).Warnf("Failed to list assignees")
var assignees []*github.User
var resp *github.Response
if cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
assignees, resp, err = githubClient.Issues.ListAssignees(c.Ctx, owner, repo, &opt)
if err != nil {
return err
}
return nil
}); cErr != nil {
c.Log.WithError(cErr).Warnf("Failed to list assignees")
p.writeAPIError(w, &APIErrorResponse{Message: "Failed to fetch assignees", StatusCode: http.StatusInternalServerError})
return
}
Expand All @@ -1174,9 +1229,16 @@ func (p *Plugin) getMilestones(c *UserContext, w http.ResponseWriter, r *http.Re
opt := github.ListOptions{PerPage: 50}

for {
milestones, resp, err := githubClient.Issues.ListMilestones(c.Ctx, owner, repo, &github.MilestoneListOptions{ListOptions: opt})
if err != nil {
c.Log.WithError(err).Warnf("Failed to list milestones")
var milestones []*github.Milestone
var resp *github.Response
if cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
milestones, resp, err = githubClient.Issues.ListMilestones(c.Ctx, owner, repo, &github.MilestoneListOptions{ListOptions: opt})
if err != nil {
return err
}
return nil
}); cErr != nil {
c.Log.WithError(cErr).Warnf("Failed to list milestones")
p.writeAPIError(w, &APIErrorResponse{Message: "Failed to fetch milestones", StatusCode: http.StatusInternalServerError})
return
}
Expand All @@ -1190,12 +1252,21 @@ func (p *Plugin) getMilestones(c *UserContext, w http.ResponseWriter, r *http.Re
p.writeJSON(w, allMilestones)
}

func getRepositoryList(c context.Context, userName string, githubClient *github.Client, opt github.ListOptions) ([]*github.Repository, error) {
func (p *Plugin) getRepositoryList(c context.Context, ghInfo *GitHubUserInfo, userName string, githubClient *github.Client, opt github.ListOptions) ([]*github.Repository, error) {
var allRepos []*github.Repository
for {
repos, resp, err := githubClient.Repositories.List(c, userName, &github.RepositoryListOptions{ListOptions: opt})
if err != nil {
return nil, err
var repos []*github.Repository
var resp *github.Response
var err error
cErr := p.useGitHubClient(ghInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
repos, resp, err = githubClient.Repositories.List(c, userName, &github.RepositoryListOptions{ListOptions: opt})
if err != nil {
return err
}
return nil
})
if cErr != nil {
return nil, cErr
}

allRepos = append(allRepos, repos...)
Expand All @@ -1209,12 +1280,21 @@ func getRepositoryList(c context.Context, userName string, githubClient *github.
return allRepos, nil
}

func getRepositoryListByOrg(c context.Context, org string, githubClient *github.Client, opt github.ListOptions) ([]*github.Repository, int, error) {
func (p *Plugin) getRepositoryListByOrg(c context.Context, ghInfo *GitHubUserInfo, org string, githubClient *github.Client, opt github.ListOptions) ([]*github.Repository, int, error) {
var allRepos []*github.Repository
for {
repos, resp, err := githubClient.Repositories.ListByOrg(c, org, &github.RepositoryListByOrgOptions{Sort: "full_name", ListOptions: opt})
if err != nil {
return nil, resp.StatusCode, err
var repos []*github.Repository
var resp *github.Response
var err error
cErr := p.useGitHubClient(ghInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
repos, resp, err = githubClient.Repositories.ListByOrg(c, org, &github.RepositoryListByOrgOptions{Sort: "full_name", ListOptions: opt})
if err != nil {
return err
}
return nil
})
if cErr != nil {
return nil, resp.StatusCode, cErr
}

allRepos = append(allRepos, repos...)
Expand All @@ -1237,7 +1317,7 @@ func (p *Plugin) getRepositories(c *UserContext, w http.ResponseWriter, r *http.
opt := github.ListOptions{PerPage: 50}

if org == "" {
allRepos, err = getRepositoryList(c.Ctx, "", githubClient, opt)
allRepos, err = p.getRepositoryList(c.Ctx, c.GHInfo, "", githubClient, opt)
if err != nil {
c.Log.WithError(err).Warnf("Failed to list repositories")
p.writeAPIError(w, &APIErrorResponse{Message: "Failed to fetch repositories", StatusCode: http.StatusInternalServerError})
Expand All @@ -1246,10 +1326,10 @@ func (p *Plugin) getRepositories(c *UserContext, w http.ResponseWriter, r *http.
} else {
orgsList := p.configuration.getOrganizations()
for _, org := range orgsList {
orgRepos, statusCode, err := getRepositoryListByOrg(c.Ctx, org, githubClient, opt)
orgRepos, statusCode, err := p.getRepositoryListByOrg(c.Ctx, c.GHInfo, org, githubClient, opt)
if err != nil {
if statusCode == http.StatusNotFound {
orgRepos, err = getRepositoryList(c.Ctx, org, githubClient, opt)
orgRepos, err = p.getRepositoryList(c.Ctx, c.GHInfo, org, githubClient, opt)
if err != nil {
c.Log.WithError(err).Warnf("Failed to list repositories", "Organization", org)
p.writeAPIError(w, &APIErrorResponse{Message: "Failed to fetch repositories", StatusCode: http.StatusInternalServerError})
Expand Down Expand Up @@ -1376,14 +1456,21 @@ func (p *Plugin) createIssue(c *UserContext, w http.ResponseWriter, r *http.Requ
repoName := splittedRepo[1]

githubClient := p.githubConnectUser(c.Context.Ctx, c.GHInfo)
result, resp, err := githubClient.Issues.Create(c.Ctx, owner, repoName, ghIssue)
if err != nil {
var resp *github.Response
var result *github.Issue
if cErr := p.useGitHubClient(c.GHInfo, func(info *GitHubUserInfo, token *oauth2.Token) error {
result, resp, err = githubClient.Issues.Create(c.Ctx, owner, repoName, ghIssue)
if err != nil {
return err
}
return nil
}); cErr != nil {
if resp != nil && resp.Response.StatusCode == http.StatusGone {
p.writeAPIError(w, &APIErrorResponse{ID: "", Message: "Issues are disabled on this repository.", StatusCode: http.StatusMethodNotAllowed})
return
}

c.Log.WithError(err).Warnf("Failed to create issue")
c.Log.WithError(cErr).Warnf("Failed to create issue")
p.writeAPIError(w,
&APIErrorResponse{
ID: "",
Expand Down
Loading
Loading