Skip to content

fix: clear ws connection after refresh error #1012

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.

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

Merged
merged 1 commit into from
Apr 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/modules/Phone/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ import {
import {
WebSocketSubscription as Subscription,
} from '@ringcentral-integration/commons/modules/WebSocketSubscription';
import { RingCentralExtensions } from '@ringcentral-integration/commons/modules/RingCentralExtensions';
import {
ActiveCallsUI,
} from '@ringcentral-integration/widgets/modules/ActiveCallsUI';
Expand Down Expand Up @@ -199,6 +198,7 @@ import { MessageDetailsUI } from '../MessageDetailsUI';
import { NoiseReduction } from '../NoiseReduction';
import { NumberValidate } from '../NumberValidate';
import { OAuth } from '../OAuth';
import { RingCentralExtensions } from '../RingCentralExtensions';
import { RcVideo } from '../RcVideo';
import { RingtoneSettingsUI } from '../RingtoneSettingsUI';
import { SettingsUI } from '../SettingsUI';
Expand Down
49 changes: 49 additions & 0 deletions src/modules/RingCentralExtensions/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { Module } from '@ringcentral-integration/commons/lib/di';
import { RingCentralExtensions as RingCentralExtensionsBase } from '@ringcentral-integration/commons/modules/RingCentralExtensions';
import type { ApiError } from '@ringcentral/sdk';
import validateIsOffline from '@ringcentral-integration/commons/lib/validateIsOffline';

@Module({
name: 'NewRingCentralExtensions',
deps: []
})
export class RingCentralExtensions extends RingCentralExtensionsBase {
// TODO: fix connection not revoked after token refresh error
override async _bindEvents() {
const platform = this._deps.client.service.platform();
platform.addListener(
platform.events.refreshError,
async (error: ApiError) => {
const isOffline = validateIsOffline(error.message);
const resStatus = Number(error.response?.status);
const refreshTokenValid =
(isOffline || resStatus >= 500) &&
(await platform.auth().refreshTokenValid());
if (!refreshTokenValid) {
if (this.isWebSocketReady && !(this.disconnectOnInactive && !this.isTabActive)) {
try {
await this._webSocketExtension?.revoke(true);
this._exposeConnectionEvents();
this._clearTokens();
} catch (e) {
console.error('Error while revoking connection:', e);
}
}
}
const isTokenNoFoundError =
resStatus === 400 &&
(await error.response?.clone().json())?.errors?.some(
({ errorCode = '' } = {}) => errorCode === 'OAU-213',
);
if (
isTokenNoFoundError &&
(await platform.auth().data()).refresh_token !== ''
) {
// TODO: this logic should be moved to commons/Auth
platform._cache.clean();
}
},
);
return super._bindEvents();
}
}