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-564]: Fixed the subscribe permissions config preventing system admins from creating subscriptions in DM or GM #82

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[MM-564]: Fixed the subscribe permissions config preventing system admins from creating subscriptions in DM or GM #82

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
436a235
[MM-564]: Fixed the subscribe permissions config preventing system ad…
Kshitij-Katiyar Sep 4, 2024
bd206df
[MM-564]: review fixes
Kshitij-Katiyar Sep 9, 2024
e21ce63
[MM-564]: reverted the changes regarding creating subscription in DM/GM
Kshitij-Katiyar Sep 17, 2024
d8e6538
[MM-564]: Fixed merge conflicts
Kshitij-Katiyar Sep 23, 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
6 changes: 4 additions & 2 deletions server/subscribe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ func (p *Plugin) hasPermissionToManageSubscription(instanceID types.ID, userID,

switch cfg.RolesAllowedToEditJiraSubscriptions {
case "team_admin":
if !p.client.User.HasPermissionToChannel(userID, channelID, model.PermissionManageTeam) {
if !p.client.User.HasPermissionTo(userID, model.PermissionManageTeam) {
Kshitij-Katiyar marked this conversation as resolved.
Show resolved Hide resolved
return errors.New("is not team admin")
}
case "channel_admin":
Expand All @@ -702,7 +702,9 @@ func (p *Plugin) hasPermissionToManageSubscription(instanceID types.ID, userID,
return errors.New("is not channel admin")
}
default:
return errors.New("can only subscribe in public and private channels")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this makes me feel that subs were not allowed in DM/GM and our changes overrides that

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, as requested in the issue, the current PR changes allow the system admin to create subscriptions in DM/GM. Let me know if we need to get the approval from Doug before doing these changes, I will revert the changes

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kshitij-Katiyar Yes we should get a confirmation here, that the current implmentation does not allow subs in DM/GM, do we need to update that.

Also, it was mentioned in the issue that the error they are receiving is regarding permisssions and not "not allowed in DM/gM.....". Did we look into that?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot from 2024-09-17 10-05-07

This is the error mentioned in the issue, the error message is apt to the condition. Reverting the changes involving change with plugin functionality. Will add a confirmation from Doug once we create a PR on mm

if !p.client.User.HasPermissionTo(userID, model.PermissionManageSystem) {
return errors.New("is not system admin")
}
}
case "users":
default:
Expand Down
Loading