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

fix: catch unhandled error when adding or refreshing oauth apps #35089

Merged
merged 4 commits into from
Feb 4, 2025
Merged

fix: catch unhandled error when adding or refreshing oauth apps #35089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df76610
Add try/catch to service.ts
julio-rocketchat Feb 2, 2025
27f1d03
Use wrapExceptions instead of try/catch
julio-rocketchat Feb 3, 2025
ec4e1e1
Add changeset
julio-rocketchat Feb 3, 2025
7aa49c3
Merge branch 'develop' into fix-catch-error-when-adding-oauth-app
julio-rocketchat Feb 3, 2025
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
5 changes: 5 additions & 0 deletions .changeset/twenty-camels-worry.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Adds wrapExceptions to handle an unhandled promise rejection when adding and/or updating OAuth apps
5 changes: 3 additions & 2 deletions apps/meteor/server/services/meteor/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { api, ServiceClassInternal } from '@rocket.chat/core-services';
import type { AutoUpdateRecord, IMeteor } from '@rocket.chat/core-services';
import type { ILivechatAgent, LoginServiceConfiguration, UserStatus } from '@rocket.chat/core-typings';
import { LoginServiceConfiguration as LoginServiceConfigurationModel, Users } from '@rocket.chat/models';
import { wrapExceptions } from '@rocket.chat/tools';
import { Meteor } from 'meteor/meteor';
import { MongoInternals } from 'meteor/mongo';

Expand Down Expand Up @@ -146,14 +147,14 @@ export class MeteorService extends ServiceClassInternal implements IMeteor {
this.onEvent('watch.loginServiceConfiguration', ({ clientAction, id, data }) => {
if (clientAction === 'removed') {
serviceConfigCallbacks.forEach((callbacks) => {
callbacks.removed?.(id);
wrapExceptions(() => callbacks.removed?.(id)).suppress();
});
return;
}

if (data) {
serviceConfigCallbacks.forEach((callbacks) => {
callbacks[clientAction === 'inserted' ? 'added' : 'changed']?.(id, data);
wrapExceptions(() => callbacks[clientAction === 'inserted' ? 'added' : 'changed']?.(id, data)).suppress();
});
}
});
Expand Down
Loading