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

Delete subscription upon disconnecting user #42

Merged
merged 10 commits into from
Mar 31, 2020
Merged

Delete subscription upon disconnecting user #42

Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fea430b
Delete subscription upon disconnecting user
MatthewDorner Mar 3, 2020
e78b458
Don't return err if remote deletion fails
MatthewDorner Mar 3, 2020
a7f1823
Remove debug statement
MatthewDorner Mar 3, 2020
57c0a52
Log error if remote sub deletion fails
MatthewDorner Mar 5, 2020
ed11196
Merge branch 'master' into disconnect-delete-subscription
mattermod Mar 18, 2020
324c448
Delete Daily Summary Settings
MatthewDorner Mar 29, 2020
a13f926
Merge remote-tracking branch 'upstream/master' into disconnect-delete…
MatthewDorner Mar 29, 2020
75b88c6
Merge branch 'disconnect-delete-subscription' of /~https://github.com/m…
MatthewDorner Mar 29, 2020
1656872
Merge branch 'master' into disconnect-delete-subscription
hanzei Mar 31, 2020
c364d6e
Merge branch 'master' into disconnect-delete-subscription
levb Mar 31, 2020
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
25 changes: 25 additions & 0 deletions server/mscalendar/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,31 @@ func (user *User) Markdown() string {
}

func (m *mscalendar) DisconnectUser(mattermostUserID string) error {
err := m.Filter(
withClient,
)
if err != nil {
return err
}

storedUser, err := m.Store.LoadUser(mattermostUserID)
if err != nil {
return err
}

eventSubscriptionID := storedUser.Settings.EventSubscriptionID
if eventSubscriptionID != "" {
err = m.Store.DeleteUserSubscription(storedUser, eventSubscriptionID)
if err != nil && err != store.ErrNotFound {
return errors.WithMessagef(err, "failed to delete subscription %s", eventSubscriptionID)
}

err = m.client.DeleteSubscription(eventSubscriptionID)
if err != nil {
m.Logger.Errorf("failed to delete remote subscription %s. %s", eventSubscriptionID, err.Error())
}
}

return m.Store.DeleteUser(mattermostUserID)
}

Expand Down