[MM 15099] direct message notifications on off

server/command.go

@@ -14,11 +14,19 @@ const helpText = "###### Mattermost Jira Plugin - Slash Command Help\n" +
 	"* `/jira disconnect` - Disonnect your Mattermost account from your Jira account\n" +
 	"* `/jira create <text (optional)>` - Create a new Issue with 'text' inserted into the description field.\n" +
 	"* `/jira transition <issue-key> <state>` - Changes the state of a Jira issue.\n" +
+	"* `/jira settings [setting] [value]` - Update your user settings\n" +
+	"  * [setting] can be `notifications`\n" +
+	"  * [value] can be `on` or `off`\n" +
 	"\nFor system administrators:\n" +
 	"* `/jira install cloud <URL>` - connect Mattermost to a cloud Jira instance located at <URL>\n" +
 	"* `/jira install server <URL>` - connect Mattermost to a server Jira instance located at <URL>\n" +
 	""
 
+// Available settings
+const (
+	settingsNotifications = "notifications"
+)
+
 type CommandHandlerFunc func(p *Plugin, c *plugin.Context, header *model.CommandArgs, args ...string) *model.CommandResponse
 
 type CommandHandler struct {
@@ -33,6 +41,7 @@ var jiraCommandHandler = CommandHandler{
 		"transition":     executeTransition,
 		"connect":        executeConnect,
 		"disconnect":     executeDisconnect,
+		"settings":       executeSettings,
 		//"webhook":        executeWebhookURL,
 		//"webhook/url":    executeWebhookURL,
 		//"list":        executeList,
@@ -84,6 +93,30 @@ func executeDisconnect(p *Plugin, c *plugin.Context, header *model.CommandArgs,
 		p.GetPluginURL(), routeUserDisconnect)
 }
 
+func executeSettings(p *Plugin, c *plugin.Context, header *model.CommandArgs, args ...string) *model.CommandResponse {
+	if len(args) != 2 {
+		return help()
+	}
+
+	ji, err := p.LoadCurrentJIRAInstance()
+	if err != nil {
+		return responsef("Failed to load current Jira instance: %v. Please contact your system administrator.", err)
+	}
+
+	mattermostUserId := header.UserId
+	jiraUser, err := p.LoadJIRAUser(ji, mattermostUserId)
+	if err != nil {
+		return responsef("Your username is not connected to Jira. Please type `jira connect`. %v", err)
+	}
+
+	switch args[0] {
+	case settingsNotifications:
+		return p.settingsNotifications(ji, mattermostUserId, jiraUser, args[1:])
+	default:
+		return responsef("Unknown setting.")
+	}
+}
+
 func executeList(p *Plugin, c *plugin.Context, header *model.CommandArgs, args ...string) *model.CommandResponse {
 	authorized, err := authorizedSysAdmin(p, header.UserId)
 	if err != nil {
@@ -280,7 +313,7 @@ func getCommand() *model.Command {
 		DisplayName:      "Jira",
 		Description:      "Integration with Jira.",
 		AutoComplete:     true,
-		AutoCompleteDesc: "Available commands: connect, disconnect, create, transition, install cloud, install server, help",
+		AutoCompleteDesc: "Available commands: connect, disconnect, create, transition, settings, install cloud, install server, help",
 		AutoCompleteHint: "[command]",
 	}
 }

server/settings.go

@@ -0,0 +1,41 @@
+package main
+
+import "github.com/mattermost/mattermost-server/model"
+
+const (
+	settingOn  = "on"
+	settingOff = "off"
+)
+
+func (p *Plugin) settingsNotifications(ji Instance, mattermostUserId string, jiraUser JIRAUser, args []string) *model.CommandResponse {
+	var value bool
+	switch args[0] {
+	case settingOn:
+		value = true
+	case settingOff:
+		value = false
+	default:
+		return responsef("Invalid value. Accepted values are: `on` or `off`.")
+	}
+
+	if jiraUser.Settings == nil {
+		jiraUser.Settings = &UserSettings{}
+	}
+	jiraUser.Settings.Notifications = value
+	if err := p.StoreUserInfo(ji, mattermostUserId, jiraUser); err != nil {
+		p.errorf("settingsNotifications, err: %v", err)
+		responsef("Could not store new settings. Please contact your system administrator. error: %v", err)
+	}
+
+	// send back the actual value
+	updatedJiraUser, err := p.LoadJIRAUser(ji, mattermostUserId)
+	if err != nil {
+		return responsef("Your username is not connected to Jira. Please type `jira connect`. %v", err)
+	}
+	notifications := "off"
+	if updatedJiraUser.Settings.Notifications {
+		notifications = "on"
+	}
+
+	return responsef("Settings updated. Notifications %s.", notifications)
+}

server/subscribe.go

@@ -357,6 +357,13 @@ func httpSubscribeWebhook(p *Plugin, w http.ResponseWriter, r *http.Request) (in
 		}
 	}
 
+	// Notify any affected users using a direct channel
+	err = p.handleNotifications(parsed)
+	if err != nil {
+		p.errorf("httpSubscribeWebhook, handleNotifications: %v", err)
+		return http.StatusBadRequest, err
+	}
+
 	return http.StatusOK, nil
 }
 

server/testdata/webhook-comment-created.json

@@ -1 +1,93 @@
-{"timestamp":1550286678321,"webhookEvent":"comment_created","comment":{"self":"https://some-instance-test.atlassian.net/rest/api/2/issue/10040/comment/10019","id":"10019","author":{"self":"https://some-instance-test.atlassian.net/rest/api/2/user?accountId=5c5f880629be9642ba529340","name":"admin","key":"admin","accountId":"5c5f880629be9642ba529340","avatarUrls":{"48x48":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=48&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D48%26noRedirect%3Dtrue","24x24":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=24&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D24%26noRedirect%3Dtrue","16x16":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=16&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D16%26noRedirect%3Dtrue","32x32":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=32&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D32%26noRedirect%3Dtrue"},"displayName":"Test User","active":true,"timeZone":"America/Los_Angeles"},"body":"Added a comment","updateAuthor":{"self":"https://some-instance-test.atlassian.net/rest/api/2/user?accountId=5c5f880629be9642ba529340","name":"admin","key":"admin","accountId":"5c5f880629be9642ba529340","avatarUrls":{"48x48":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=48&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D48%26noRedirect%3Dtrue","24x24":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=24&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D24%26noRedirect%3Dtrue","16x16":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=16&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D16%26noRedirect%3Dtrue","32x32":"https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=32&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D32%26noRedirect%3Dtrue"},"displayName":"Test User","active":true,"timeZone":"America/Los_Angeles"},"created":"2019-02-15T19:11:18.321-0800","updated":"2019-02-15T19:11:18.321-0800","jsdPublic":true},"issue":{"id":"10040","self":"https://some-instance-test.atlassian.net/rest/api/2/issue/10040","key":"TES-41","fields":{"summary":"Unit test summary 1","issuetype":{"self":"https://some-instance-test.atlassian.net/rest/api/2/issuetype/10001","id":"10001","description":"Stories track functionality or features expressed as user goals.","iconUrl":"https://some-instance-test.atlassian.net/secure/viewavatar?size=xsmall&avatarId=10315&avatarType=issuetype","name":"Story","subtask":false,"avatarId":10315},"project":{"self":"https://some-instance-test.atlassian.net/rest/api/2/project/10000","id":"10000","key":"TES","name":"test1","projectTypeKey":"software","avatarUrls":{"48x48":"https://some-instance-test.atlassian.net/secure/projectavatar?avatarId=10324","24x24":"https://some-instance-test.atlassian.net/secure/projectavatar?size=small&avatarId=10324","16x16":"https://some-instance-test.atlassian.net/secure/projectavatar?size=xsmall&avatarId=10324","32x32":"https://some-instance-test.atlassian.net/secure/projectavatar?size=medium&avatarId=10324"}},"assignee":null,"priority":{"self":"https://some-instance-test.atlassian.net/rest/api/2/priority/2","iconUrl":"https://some-instance-test.atlassian.net/images/icons/priorities/high.svg","name":"High","id":"2"},"status":{"self":"https://some-instance-test.atlassian.net/rest/api/2/status/10001","description":"","iconUrl":"https://some-instance-test.atlassian.net/","name":"To Do","id":"10001","statusCategory":{"self":"https://some-instance-test.atlassian.net/rest/api/2/statuscategory/2","id":2,"key":"new","colorName":"blue-gray","name":"To Do"}}}}}
+{
+  "timestamp": 1550286678321,
+  "webhookEvent": "comment_created",
+  "comment": {
+    "self": "https://some-instance-test.atlassian.net/rest/api/2/issue/10040/comment/10019",
+    "id": "10019",
+    "author": {
+      "self": "https://some-instance-test.atlassian.net/rest/api/2/user?accountId=5c5f880629be9642ba529340",
+      "name": "admin",
+      "key": "admin",
+      "accountId": "5c5f880629be9642ba529340",
+      "avatarUrls": {
+        "48x48": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=48&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D48%26noRedirect%3Dtrue",
+        "24x24": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=24&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D24%26noRedirect%3Dtrue",
+        "16x16": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=16&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D16%26noRedirect%3Dtrue",
+        "32x32": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=32&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D32%26noRedirect%3Dtrue"
+      },
+      "displayName": "Test User",
+      "active": true,
+      "timeZone": "America/Los_Angeles"
+    },
+    "body": "Added a comment",
+    "updateAuthor": {
+      "self": "https://some-instance-test.atlassian.net/rest/api/2/user?accountId=5c5f880629be9642ba529340",
+      "name": "admin",
+      "key": "admin",
+      "accountId": "5c5f880629be9642ba529340",
+      "avatarUrls": {
+        "48x48": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=48&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D48%26noRedirect%3Dtrue",
+        "24x24": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=24&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D24%26noRedirect%3Dtrue",
+        "16x16": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=16&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D16%26noRedirect%3Dtrue",
+        "32x32": "https://avatar-cdn.atlassian.com/d991bc281c0c0ecb0bbb2db3979ddaff?s=32&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fd991bc281c0c0ecb0bbb2db3979ddaff%3Fd%3Dmm%26s%3D32%26noRedirect%3Dtrue"
+      },
+      "displayName": "Test User",
+      "active": true,
+      "timeZone": "America/Los_Angeles"
+    },
+    "created": "2019-02-15T19:11:18.321-0800",
+    "updated": "2019-02-15T19:11:18.321-0800",
+    "jsdPublic": true
+  },
+  "issue": {
+    "id": "10040",
+    "self": "https://some-instance-test.atlassian.net/rest/api/2/issue/10040",
+    "key": "TES-41",
+    "fields": {
+      "summary": "Unit test summary 1",
+      "issuetype": {
+        "self": "https://some-instance-test.atlassian.net/rest/api/2/issuetype/10001",
+        "id": "10001",
+        "description": "Stories track functionality or features expressed as user goals.",
+        "iconUrl": "https://some-instance-test.atlassian.net/secure/viewavatar?size=xsmall&avatarId=10315&avatarType=issuetype",
+        "name": "Story",
+        "subtask": false,
+        "avatarId": 10315
+      },
+      "project": {
+        "self": "https://some-instance-test.atlassian.net/rest/api/2/project/10000",
+        "id": "10000",
+        "key": "TES",
+        "name": "test1",
+        "projectTypeKey": "software",
+        "avatarUrls": {
+          "48x48": "https://some-instance-test.atlassian.net/secure/projectavatar?avatarId=10324",
+          "24x24": "https://some-instance-test.atlassian.net/secure/projectavatar?size=small&avatarId=10324",
+          "16x16": "https://some-instance-test.atlassian.net/secure/projectavatar?size=xsmall&avatarId=10324",
+          "32x32": "https://some-instance-test.atlassian.net/secure/projectavatar?size=medium&avatarId=10324"
+        }
+      },
+      "assignee": null,
+      "priority": {
+        "self": "https://some-instance-test.atlassian.net/rest/api/2/priority/2",
+        "iconUrl": "https://some-instance-test.atlassian.net/images/icons/priorities/high.svg",
+        "name": "High",
+        "id": "2"
+      },
+      "status": {
+        "self": "https://some-instance-test.atlassian.net/rest/api/2/status/10001",
+        "description": "",
+        "iconUrl": "https://some-instance-test.atlassian.net/",
+        "name": "To Do",
+        "id": "10001",
+        "statusCategory": {
+          "self": "https://some-instance-test.atlassian.net/rest/api/2/statuscategory/2",
+          "id": 2,
+          "key": "new",
+          "colorName": "blue-gray",
+          "name": "To Do"
+        }
+      }
+    }
+  }
+}