[GH-85,84,71,49] Confluence Phase-2 (Authorisation/Notifications)

.golangci.yml

@@ -29,7 +29,6 @@ linters:
     - ineffassign
     - misspell
     - nakedret
-    - revive
     - staticcheck
     - stylecheck
     - typecheck

Makefile

@@ -3,7 +3,7 @@ NPM ?= $(shell command -v npm 2> /dev/null)
 CURL ?= $(shell command -v curl 2> /dev/null)
 MM_DEBUG ?=
 GOPATH ?= $(shell go env GOPATH)
-GO_TEST_FLAGS ?= -race
+GO_TEST_FLAGS ?= -race -gcflags=-l
 GO_BUILD_FLAGS ?=
 MM_UTILITIES_DIR ?= ../mattermost-utilities
 DLV_DEBUG_PORT := 2346
@@ -96,7 +96,7 @@ endif
 ## Ensures NPM dependencies are installed without having to run this all the time.
 webapp/node_modules: $(wildcard webapp/package.json)
 ifneq ($(HAS_WEBAPP),)
-	cd webapp && $(NPM) install
+	cd webapp && $(NPM) install --verbose
 	touch $@
 endif
 
@@ -142,7 +142,7 @@ dist: apply server webapp bundle
 ## Builds and installs the plugin to a server.
 .PHONY: deploy
 deploy: dist
-	./build/bin/pluginctl deploy $(PLUGIN_ID) dist/$(BUNDLE_NAME)
+	./build/bin/deploy deploy $(PLUGIN_ID) dist/$(BUNDLE_NAME)
 
 ## Builds and installs the plugin to a server, updating the webapp automatically when changed.
 .PHONY: watch

README.md

@@ -27,9 +27,17 @@ A Mattermost plugin for Confluence. Supports Confluence Cloud, Server, and Data
 With the Confluence plugin, you can subscribe to a variety of events in Confluence, and specify which channels the associated notifications will appear in. 
 
 - In a Mattermost channel, setup subscriptions to get updates from Confluence and manage your notification subscriptions directly within Mattermost.
-- Notify a channel whenever something occurs on a Confluence object:
-  - Confluence spaces, including those created, updated, deleted, and restored, and those with added comments.
-  - Confluence pages, including those created, updated, deleted, restored, and those with added, deleted, or updated comments.
+- Notify a channel whenever something occurs on a Confluence object, we support the following events:
+  - space_updated
+  - page_created
+  - page_restored
+  - page_trashed
+  - page_updated
+  - comment_created
+  - comment_updated
+- Users can only create subscriptions for the spaces and pages for which they have permission and same for the notifications as well. 
+- Admins can change permissions for both Mattermost and Confluence side from the plugin configuration.
+    ![image](https://github.com/Brightscout/mattermost-plugin-confluence-fork/assets/90389917/b94fbf84-f345-4ded-aa8d-21de1b870062)
 
 ## Configure notifications
 
@@ -46,9 +54,13 @@ With the Confluence plugin, you can subscribe to a variety of events in Confluen
     ![image](https://github.com/mattermost/mattermost-plugin-confluence/assets/74422101/9314abd2-8562-456e-9661-7f23c91db206)
 
 - `Events` are the internal confluence events that will trigger a notification from Confluence. The following events are currently included:
-    - Confluence spaces, including those created, updated, deleted, and restored, and those with added comments.
-    - Confluence pages, inlcuidng those created, updated, deleted, restored, and those with added, deleted, or updated comments.
-
+  - space_updated
+  - page_created
+  - page_restored
+  - page_trashed
+  - page_updated
+  - comment_created
+  - comment_updated
 Example of a configured notification:
 
 ![image](https://github.com/mattermost/mattermost-plugin-confluence/assets/74422101/33bc67f8-8d36-4e79-a386-7791f4dcd1ee)

assets/templates/atlassian-connect.json

@@ -54,6 +54,18 @@
             {
                 "event": "page_updated",
                 "url": "/cloud/page_updated?secret={{ .SharedSecret }}"
+            },
+            {
+                "event": "space_created",
+                "url": "/cloud/space_created?secret={{ .SharedSecret }}"
+            },
+            {
+                "event": "space_updated",
+                "url": "/cloud/space_updated?secret={{ .SharedSecret }}"
+            },
+            {
+                "event": "space_removed",
+                "url": "/cloud/space_removed?secret={{ .SharedSecret }}"
             }
         ]
     }

assets/templates/command/install_cloud.md

@@ -0,0 +1,23 @@
+{{ .ConfluenceURL }} has been successfully added. To finish the configuration, create a new app in your Confluence instance following these steps:
+
+1. Go to the Atlassian [Developer Console](https://developer.atlassian.com/console/myapps/).
+    ![image](https://user-images.githubusercontent.com/90389917/202149604-1f0b8758-96ab-49b0-bd9f-f23ce9d6beda.png)
+2. Select **Create > OAuth2.0 integration**.
+3. Select **Authorization** in the left menu.
+4. Next to OAuth 2.0 (3LO), select **Configure**.
+5. In the **Callback URL** field enter:
+``
+    {{ .RedirectURL }}
+``.
+6. Select **Permissions** in the left menu.
+7. Add the **Confluence API**, and then select `Read user`, `Write Confluence content`, `Read Confluence content all`, and `Read Confluence detailed content` scopes, and select **Save**.
+8. Copy the `clientID` and `clientSecret` from **Settings**, and paste them into the modal in mattermost which can be opened by using "/confluence config add" slash command.
+9. In Mattermost, use the "/confluence connect" slash command to connect your Mattermost account with your Confluence account.
+To finish the configuration, add a new app in your Confluence Cloud instance by following these steps:
+1. Go to **Settings > Apps > Manage Apps**.
+2. Select **Settings** at the bottom of the page, enable development mode, and apply the change. Development mode allows you to install apps from outside of the Atlassian Marketplace.
+3. Select **Upload App**.
+4. In the **From this URL** field, enter: `{{ .CloudURL }}`.
+5. Once installed, you'll see the "Installed and ready to go!" message.
+
+If you see an option to create a Confluence issue, you're all set! If not, refer to our [documentation](https://mattermost.gitbook.io/plugin-confluence) for troubleshooting help.

assets/templates/command/install_server.md

@@ -0,0 +1,18 @@
+{{ .ConfluenceURL }} has been successfully added. To finish the configuration, add an Application Link in your Confluence instance following these steps:
+
+1. Go to [**Settings > Applications > Application Links**]({{ .ConfluenceURL }}/plugins/servlet/applinks/listApplicationLinks)
+   ![image](https://user-images.githubusercontent.com/90389917/202149868-a3044351-37bc-43c0-9671-aba169706917.png)
+2. Select **Create link**.
+3. On the **Create Link** screen, select **External Application** and **Incoming** as
+   `Application type` and `Direction` respectively. Select **Continue**.
+4. On the **Link Applications** screen, set the following values:
+**Name**: `Mattermost`
+**Redirect URL**: ```{{ .RedirectURL }}```.
+**Application Permissions**: `Admin`
+Select **Continue**
+5. Copy the `clientID` and `clientSecret` from **Settings**, and paste them into the modal in mattermost which can be opened by using "/confluence config add" slash command.
+6. In Mattermost, use the "/confluence connect ```{{ .ConfluenceURL }}``` admin" slash command to connect your Mattermost account with your confluence admin account and save the token of the admin to handle admin restricted functions.
+7. Use the "/confluence connect" slash command to connect your Mattermost account with your
+Confluence account for all other users.
+
+If you see an option to create a Confluence issue, you're all set! If not, refer to our [documentation](https://mattermost.gitbook.io/plugin-confluence) for troubleshooting help.

assets/templates/oauth2/complete.html

@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<style>
+			body {
+				color: rgb(23, 43, 77);
+				letter-spacing: -0.01em;
+			}
+
+			.flex-parent {
+				padding: 50px;
+			}
+
+			.btn {
+				-webkit-transition: all 0.15s ease;
+				-webkit-transition-delay: 0s;
+				-moz-transition: all 0.15s ease;
+				-o-transition: all 0.15s ease;
+				transition: all 0.15s ease false;
+				padding-right: 1em;
+				padding-left: 1em;
+				font-size: inherit;
+				border: none;
+				height: 2.4em;
+				border-radius: 4px;
+				cursor: pointer;
+			}
+
+			.btn-primary {
+				color: rgb(255, 255, 255);
+				background: rgb(0, 82, 204);
+			}
+
+			.btn-primary:hover,
+			.btn-primary:active {
+				background: rgb(0, 101, 255);
+			}
+
+			.btn-link {
+				color: #505f79;
+				background: #f4f5f7;
+			}
+
+			.btn-link:hover,
+			.btn-link:active {
+				background: #ebecf0;
+			}
+
+			.accounts-container {
+				padding: 1.6em 0 0.8em;
+				opacity: .6;
+			}
+			.icon--check {
+				margin-right: 4px;
+			}
+		</style>
+		<link rel="stylesheet" href="https://unpkg.com/@atlaskit/[email protected]/dist/bundle.css" media="all">
+	</head>
+	<body>
+		<div class="flex-parent">
+			<h3>
+				<svg xmlns="http://www.w3.org/2000/svg" width="20" height="15" class="icon--check" viewBox="0 0 18 14">
+					<path fill="#0052CC" d="M100.649576,76.1740942 C100.649576,76.4531124 100.537969,76.7321306 100.337075,76.9330237 L90.7388497,86.5312494 C90.5379566,86.7321425 90.2589384,86.8437498 89.9799202,86.8437498 C89.700902,86.8437498 89.4218838,86.7321425 89.2209908,86.5312494 L83.6629484,80.9732071 C83.4620553,80.772314 83.350448,80.4932958 83.350448,80.2142776 C83.350448,79.9352594 83.4620553,79.6562412 83.6629484,79.4553481 L85.1808074,77.9374892 C85.3817005,77.7365961 85.6607186,77.6249888 85.9397368,77.6249888 C86.218755,77.6249888 86.4977732,77.7365961 86.6986663,77.9374892 L89.9799202,81.2299038 L97.3013575,73.8973058 C97.5022506,73.6964127 97.7812688,73.5848054 98.060287,73.5848054 C98.3393052,73.5848054 98.6183234,73.6964127 98.8192165,73.8973058 L100.337075,75.4151648 C100.537969,75.6160579 100.649576,75.895076 100.649576,76.1740942 Z" transform="translate(-83 -73)"/>
+				</svg>
+				Mattermost user is now connected to Confluence
+			</h3>
+			<div class="accounts-container">
+				<div>Mattermost account: {{ .MattermostDisplayName }}</div>
+				<div>Confluence account: {{ .ConfluenceDisplayName }}</div>
+			</div>
+		</div>
+	</body>
+</html>

assets/templates/other/message.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<style>
+			body {
+				color: rgb(23, 43, 77);
+				letter-spacing: -0.01em;
+			}
+
+			.flex-parent {
+				padding: 50px;
+			}
+
+			.message-container {
+				padding: 1.6em 0 0.8em;
+				opacity: .6;
+			}
+		</style>
+		<link rel="stylesheet" href="https://unpkg.com/@atlaskit/[email protected]/dist/bundle.css" media="all">
+	</head>
+	<body>
+		<div class="flex-parent">
+			<h3>
+				{{ .Header}}
+			</h3>
+			<div class="message-container">
+				<div>{{ .Message }}</div>
+			</div>
+		</div>
+	</body>
+</html>

build/setup.mk

@@ -13,7 +13,7 @@ BUILD_TAG_CURRENT = $(shell git tag --points-at HEAD)
 $(shell cd build/manifest && $(GO) build -ldflags '-X "main.BuildHashShort=$(BUILD_HASH_SHORT)" -X "main.BuildTagLatest=$(BUILD_TAG_LATEST)" -X "main.BuildTagCurrent=$(BUILD_TAG_CURRENT)"' -o ../bin/manifest)
 
 # Ensure that the deployment tools are compiled. Go's caching makes this quick.
-$(shell cd build/pluginctl && $(GO) build -o ../bin/pluginctl)
+$(shell cd build/deploy && $(GO) build -o ../bin/deploy)
 
 # Extract the plugin id from the manifest.
 PLUGIN_ID ?= $(shell build/bin/manifest id)

go.mod

@@ -5,11 +5,13 @@ go 1.21
 require (
 	bou.ke/monkey v1.0.2
 	github.com/gorilla/mux v1.8.1
+	github.com/levigross/exp-html v0.0.0-20120902181939-8df60c69a8f5
 	github.com/mattermost/mattermost/server/public v0.0.12
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4
 	github.com/thoas/go-funk v0.6.0
-	go.uber.org/atomic v1.6.0
+	go.uber.org/atomic v1.10.0
+	golang.org/x/oauth2 v0.15.0
 )
 
 require (
@@ -38,17 +40,24 @@ require (
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/philhofer/fwd v1.1.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rudderlabs/analytics-go v3.3.3+incompatible // indirect
+	github.com/segmentio/backo-go v1.0.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stretchr/objx v0.5.1 // indirect
+	github.com/tidwall/gjson v1.17.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tinylib/msgp v1.1.9 // indirect
 	github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
 	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/wiggin77/merror v1.0.5 // indirect
 	github.com/wiggin77/srslog v1.0.1 // indirect
+	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
 	golang.org/x/crypto v0.16.0 // indirect
 	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
 	google.golang.org/grpc v1.60.0 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect