[MM-537]: Added message to delete webhook after subscription deletion (…

…#538) * [MM-537]: Added message to delete webhook after subscription deletion * handling for groups webhook * fixed groups subscription delete msg * fixed lint * fixed lint build
mattermost · Feb 11, 2025 · 0f886e5 · 0f886e5
1 parent fa5857b
commit 0f886e5
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 2 deletions.
diff --git a/server/command.go b/server/command.go
@@ -593,7 +593,7 @@ func parseTriggers(triggersCsv string) *gitlab.AddWebhookOptions {
 	}
 }
 
-func (p *Plugin) subscriptionDelete(_ *gitlab.UserInfo, config *configuration, fullPath, channelID string) (string, error) {
+func (p *Plugin) subscriptionDelete(userInfo *gitlab.UserInfo, config *configuration, fullPath, channelID string) (string, error) {
 	normalizedPath := normalizePath(fullPath, config.GitlabURL)
 	deleted, updatedSubscriptions, err := p.Unsubscribe(channelID, normalizedPath)
 	if err != nil {
@@ -607,7 +607,67 @@ func (p *Plugin) subscriptionDelete(_ *gitlab.UserInfo, config *configuration, f
 
 	p.sendChannelSubscriptionsUpdated(updatedSubscriptions, channelID)
 
-	return fmt.Sprintf("Successfully deleted subscription for %s.", normalizedPath), nil
+	baseURL := config.GitlabURL
+	if !strings.HasSuffix(baseURL, "/") {
+		baseURL += "/"
+	}
+
+	owner := strings.Split(normalizedPath, "/")[0]
+	remainingPath := strings.Split(normalizedPath, "/")[1:]
+
+	ctx, cancel := context.WithTimeout(context.Background(), webhookTimeout)
+	defer cancel()
+
+	var project *gitlabLib.Project
+	var getProjectError error
+	err = p.useGitlabClient(userInfo, func(info *gitlab.UserInfo, token *oauth2.Token) error {
+		//nolint:govet // Ignore variable shadowing warning
+		resp, err := p.GitlabClient.GetProject(ctx, info, token, owner, strings.Join(remainingPath, "/"))
+		if err != nil {
+			getProjectError = err
+		} else {
+			project = resp
+		}
+		return nil
+	})
+	if project == nil || err != nil {
+		if err != nil {
+			p.client.Log.Warn("Can't get group in subscription delete", "err", err.Error(), "group", normalizedPath)
+		}
+	}
+
+	var webhookMsg string
+	if getProjectError == nil && project != nil {
+		webhookMsg = fmt.Sprintf("\n Please delete the [webhook](%s) for this subscription unless it's required for other subscriptions.", fmt.Sprintf("%s%s/-/hooks", baseURL, normalizedPath))
+	} else {
+		var group *gitlabLib.Group
+		var getGroupError error
+		err = p.useGitlabClient(userInfo, func(info *gitlab.UserInfo, token *oauth2.Token) error {
+			//nolint:govet // Ignore variable shadowing warning
+			resp, err := p.GitlabClient.GetGroup(ctx, info, token, owner, strings.Join(remainingPath, "/"))
+			if err != nil {
+				getGroupError = err
+			} else {
+				group = resp
+			}
+			return nil
+		})
+		if group == nil || err != nil {
+			if err != nil {
+				p.client.Log.Warn("Can't get project in subscription delete", "err", err.Error(), "project", normalizedPath)
+			}
+		}
+		if getGroupError == nil && group != nil {
+			webhookMsg = fmt.Sprintf("\n Please delete the [webhook](%s) for this subscription unless it's required for other subscriptions.", fmt.Sprintf("%sgroups/%s/-/hooks", baseURL, normalizedPath))
+		} else {
+			webhookMsg = "\n Please delete the webhook for this subscription unless it's required for other subscriptions."
+		}
+	}
+
+	unsubscribeMessage := fmt.Sprintf("Successfully deleted subscription for %s.", fmt.Sprintf("[%s](%s)", normalizedPath, baseURL+normalizedPath))
+	unsubscribeMessage += webhookMsg
+
+	return unsubscribeMessage, nil
 }
 
 // subscriptionsListCommand list GitLab subscriptions in a channel

diff --git a/server/gitlab/api.go b/server/gitlab/api.go
@@ -323,6 +323,26 @@ func (g *gitlab) GetProject(ctx context.Context, user *UserInfo, token *oauth2.T
 	return project, nil
 }
 
+func (g *gitlab) GetGroup(ctx context.Context, user *UserInfo, token *oauth2.Token, group, subgroup string) (*internGitlab.Group, error) {
+	client, err := g.GitlabConnect(*token)
+	if err != nil {
+		return nil, err
+	}
+
+	groupData, resp, err := client.Groups.GetGroup(group,
+		&internGitlab.GetGroupOptions{},
+		internGitlab.WithContext(ctx),
+	)
+	if respErr := checkResponse(resp); respErr != nil {
+		return nil, respErr
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return groupData, nil
+}
+
 func (g *gitlab) GetLHSData(ctx context.Context, user *UserInfo, token *oauth2.Token) (*LHSContent, error) {
 	client, err := g.GitlabConnect(*token)
 	if err != nil {

diff --git a/server/gitlab/gitlab.go b/server/gitlab/gitlab.go
@@ -39,6 +39,7 @@ type Gitlab interface {
 	GetMergeRequestByID(ctx context.Context, user *UserInfo, owner, repo string, mergeRequestID int, token *oauth2.Token) (*MergeRequest, error)
 	GetUserDetails(ctx context.Context, user *UserInfo, token *oauth2.Token) (*internGitlab.User, error)
 	GetProject(ctx context.Context, user *UserInfo, token *oauth2.Token, owner, repo string) (*internGitlab.Project, error)
+	GetGroup(ctx context.Context, user *UserInfo, token *oauth2.Token, owner, repo string) (*internGitlab.Group, 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) ([]*internGitlab.MergeRequest, error)
 	GetYourAssignedPrs(ctx context.Context, user *UserInfo, client *internGitlab.Client) ([]*internGitlab.MergeRequest, error)

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