Added support for notification with server version greater than 9 by Kshitij-Katiyar · Pull Request #127 · mattermost/mattermost-plugin-confluence

Kshitij-Katiyar · 2025-02-04T12:48:16Z

Summary

Added support for notification with server version greater than 9
Use OAuth authentication to get extra data to send notifications

Screenshots

…n-confluence-fork into notification_setup

…ost-plugin-confluence into notification_setup

server/client_server.go

server/flow.go

server/user.go

server/util/util.go

Kshitij-Katiyar · 2025-02-05T10:31:26Z

@wiggin77 Fixed the comments

server/confluence_server.go

wiggin77 · 2025-02-05T15:00:14Z

server/util/util.go

+	var previousStartToken html.Token
+
+	for {
+		tt := domDoc.Next()


Since the only way out of this loop is when a html.ErrorToken is received, are we guaranteed to get this error at some point? There is no EOF token?

Yes, html.ErrorToken is guaranteed.
html.ErrorToken is used to indicate an EOF

wiggin77

LGTM 👍 One minor edit and a question.

…ost-plugin-confluence into notification_setup

server/client_server.go

server/confluence_server.go

server/flow.go

server/notification.go

server/store/store.go

server/util/util.go

server/plugin.go

Kshitij-Katiyar · 2025-03-10T15:19:22Z

@fmartingr Please re-review, i have fixed the comments

fmartingr · 2025-03-10T16:21:19Z

@wiggin77 You merged this branch but #128 and #129 depend on this one. We should merge from the oldest to the newest to generate the feature branch.

* refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * removed extra lines in flow instructions * updated flow messages * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * review fixes * review fixes * removed unused code * fixed go mod enteries * removed external css sheet * review fixes

* refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * refactored code and added constants * fixed lint * added support for generic notification when user not connected * fixed lint * removed extra lines in flow instructions * updated flow messages * review fixes and removed unused codes * fixed lint * moved types out of functions * add more log information * fixed log info * review fixes * review fixes * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * fixed lint * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * fixed missing var * review fixes * review fixes * review fixes * removed unused code * fixed go mod enteries * removed external css sheet * review fixes

* refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * refactored code and added constants * fixed lint * added support for generic notification when user not connected * fixed lint * added support for admin api token * removed unused code * fixed lint * fixed import issues * removed extra lines in flow instructions * saved server version in plugin config * updated flow messages * review fixes and removed unused codes * fixed lint * moved types out of functions * add more log information * fixed log info * removed unwanted code and improved logs * fixed type in config descriptions * updated config descriptions * review fixes * review fixes * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * fixed lint * removed unused variables * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * review fixes * fixed missing var * added comment to notification logic * review fixes * review fixes * review fixes * fixed lint * review fixes * removed unused code * fixed go mod enteries * replaced marshalling with byte conversion * removed external css sheet * review fixes * Update server/confluence_cloud.go log info Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com> * removed unused vars --------- Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com>

* refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * refactored code and added constants * fixed lint * added support for generic notification when user not connected * fixed lint * added support for admin api token * removed unused code * fixed lint * fixed import issues * removed extra lines in flow instructions * saved server version in plugin config * updated flow messages * review fixes and removed unused codes * fixed lint * moved types out of functions * add more log information * fixed log info * removed unwanted code and improved logs * fixed type in config descriptions * updated config descriptions * review fixes * review fixes * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * fixed lint * removed unused variables * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * review fixes * fixed missing var * added comment to notification logic * review fixes * review fixes * review fixes * fixed lint * review fixes * removed unused code * fixed go mod enteries * replaced marshalling with byte conversion * removed external css sheet * review fixes * Update server/confluence_cloud.go log info Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com> * removed encryption for admin api token * improved help text for encryption key * removed unused var in plugin struct --------- Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com>

… than 9 (#134) * Refactored the code and added flow manager for Oauth setup (#125) * refactored the code and added flow manager * removed unused code * fixed lint * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed extra lines in flow instructions * review fixes * fixed lint * review fixes * removed unused code * fixed go mod enteries * Added Oauth setup and connect disconnect command (#126) * refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * removed extra lines in flow instructions * updated flow messages * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * review fixes * review fixes * removed unused code * fixed go mod enteries * removed external css sheet * review fixes * Added support for generic notification when user is not connected (#128) * refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * refactored code and added constants * fixed lint * added support for generic notification when user not connected * fixed lint * removed extra lines in flow instructions * updated flow messages * review fixes and removed unused codes * fixed lint * moved types out of functions * add more log information * fixed log info * review fixes * review fixes * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * fixed lint * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * fixed missing var * review fixes * review fixes * review fixes * removed unused code * fixed go mod enteries * removed external css sheet * review fixes * Added support for using admin API token for webhook notifications (#129) * refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * refactored code and added constants * fixed lint * added support for generic notification when user not connected * fixed lint * added support for admin api token * removed unused code * fixed lint * fixed import issues * removed extra lines in flow instructions * saved server version in plugin config * updated flow messages * review fixes and removed unused codes * fixed lint * moved types out of functions * add more log information * fixed log info * removed unwanted code and improved logs * fixed type in config descriptions * updated config descriptions * review fixes * review fixes * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * fixed lint * removed unused variables * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * review fixes * fixed missing var * added comment to notification logic * review fixes * review fixes * review fixes * fixed lint * review fixes * removed unused code * fixed go mod enteries * replaced marshalling with byte conversion * removed external css sheet * review fixes * Update server/confluence_cloud.go log info Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com> * removed unused vars --------- Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com> * Removed encryption for admin API token (#133) * refactored the code and added flow manager * removed unused code * fixed lint * added oauth setup and connect disconnect command * removed unrelated changes from package lock * fixed lint * fixed missing go mod entry * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * removed unwanted code and added mutliple status code handling * fixed lint * fixed step title * removed unwanted variables * refactored code and added constants * fixed lint * added support for generic notification when user not connected * fixed lint * added support for admin api token * removed unused code * fixed lint * fixed import issues * removed extra lines in flow instructions * saved server version in plugin config * updated flow messages * review fixes and removed unused codes * fixed lint * moved types out of functions * add more log information * fixed log info * removed unwanted code and improved logs * fixed type in config descriptions * updated config descriptions * review fixes * review fixes * review fixes * fixed callJSONwithURL call * review fixes * fixed lint * fixed lint * fixed lint * removed unused variables * Added support for notification with server version greater than 9 (#127) * Added support for notification with server version > 9 * fixed disconnect error * fixed lint issues * refactored code and added constants * fixed lint * review fixes and removed unused codes * fixed lint * moved types out of functions * review fixes * review fixes * fixed lint * review fixes * removed unused code * review fixes * fixed missing var * added comment to notification logic * review fixes * review fixes * review fixes * fixed lint * review fixes * removed unused code * fixed go mod enteries * replaced marshalling with byte conversion * removed external css sheet * review fixes * Update server/confluence_cloud.go log info Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com> * removed encryption for admin api token * improved help text for encryption key * removed unused var in plugin struct --------- Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com> * fix issues reported by QA * Fixed lint and testcases * fixed import orders * fixed issue of system admin required for API call * removed unused vars * updated the system admin check for webapp based slash command * updated message for system admin commands * updated msg for non admin user running confluence commands for server version < 9 --------- Co-authored-by: Raghav Aggarwal <raghav.aggarwal@brightscout.com>

Kshitij-Katiyar added 11 commits January 8, 2025 14:30

Added support for notification with server version > 9

3c32e46

fixed disconnect error

7e28e91

fixed lint issues

2171451

Merge branch 'oauth_setup' of github.com:Brightscout/mattermost-plugi…

06231dd

…n-confluence-fork into notification_setup

refactored code and added constants

9fea899

fixed lint

db8971f

Merge branch 'oauth_setup' of github.com:Brightscout/mattermost-plugi…

c3c647d

…n-confluence-fork into notification_setup

Merge branch 'oauth_setup' of github.com:mattermost-community/matterm…

df69cb9

…ost-plugin-confluence into notification_setup

review fixes and removed unused codes

d59784f

fixed lint

ca73e3d

moved types out of functions

9176172

Kshitij-Katiyar added the 2: Dev Review Requires review by a core committer label Feb 4, 2025

Kshitij-Katiyar requested review from raghavaggarwal2308 and wiggin77 February 4, 2025 12:48

Kshitij-Katiyar self-assigned this Feb 4, 2025

wiggin77 reviewed Feb 4, 2025

View reviewed changes

server/client_server.go Outdated Show resolved Hide resolved

wiggin77 reviewed Feb 4, 2025

View reviewed changes

server/flow.go Outdated Show resolved Hide resolved

wiggin77 reviewed Feb 4, 2025

View reviewed changes

server/user.go Outdated Show resolved Hide resolved

wiggin77 reviewed Feb 4, 2025

View reviewed changes

server/util/util.go Outdated Show resolved Hide resolved

review fixes

870c1b8

Kshitij-Katiyar requested a review from wiggin77 February 5, 2025 10:31

wiggin77 reviewed Feb 5, 2025

View reviewed changes

server/confluence_server.go Outdated Show resolved Hide resolved

wiggin77 reviewed Feb 5, 2025

View reviewed changes

wiggin77 approved these changes Feb 5, 2025

View reviewed changes

Kshitij-Katiyar added 3 commits February 7, 2025 15:28

review fixes

cdbce1a

Merge branch 'oauth_setup' of github.com:mattermost-community/matterm…

b65ffee

…ost-plugin-confluence into notification_setup

fixed lint

fda20f0

fmartingr self-requested a review March 10, 2025 09:24

fmartingr reviewed Mar 10, 2025

View reviewed changes

Kshitij-Katiyar added 2 commits March 10, 2025 20:37

review fixes

c665bf2

removed unused code

1945d8b

Kshitij-Katiyar requested a review from fmartingr March 10, 2025 15:19

fmartingr approved these changes Mar 10, 2025

View reviewed changes

wiggin77 merged commit c43c30a into oauth_setup Mar 10, 2025
3 checks passed

wiggin77 deleted the notification_setup branch March 10, 2025 16:02

Conversation

Kshitij-Katiyar commented Feb 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Screenshots

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kshitij-Katiyar commented Feb 5, 2025

Uh oh!

Uh oh!

wiggin77 Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Kshitij-Katiyar Feb 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

wiggin77 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Kshitij-Katiyar commented Mar 10, 2025

Uh oh!

Uh oh!

fmartingr commented Mar 10, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Kshitij-Katiyar commented Feb 4, 2025 •

edited

Loading

wiggin77 Feb 5, 2025 •

edited

Loading

Kshitij-Katiyar Feb 7, 2025 •

edited

Loading