Page MenuHomePhabricator
Files F3383928

D14025.diff
No OneTemporary
Actions

D14025.diff
View Options

diff --git a/web/grpc/identity-service-context-provider.react.js b/web/grpc/identity-service-context-provider.react.js
--- a/web/grpc/identity-service-context-provider.react.js
+++ b/web/grpc/identity-service-context-provider.react.js
@@ -3,6 +3,7 @@
import _isEqual from 'lodash/fp/isEqual.js';
import * as React from 'react';
+import { useInvalidCSATLogOut } from 'lib/actions/user-actions.js';
import {
IdentityClientContext,
type AuthMetadata,
@@ -12,6 +13,7 @@
IdentityServiceAuthLayer,
} from 'lib/types/identity-service-types.js';
import { getContentSigningKey } from 'lib/utils/crypto-utils.js';
+import { getMessageForException } from 'lib/utils/errors.js';
import { useSelector } from '../redux/redux-utils.js';
import { getCommSharedWorker } from '../shared-worker/shared-worker-provider.js';
@@ -83,17 +85,27 @@
void ensureThatWorkerClientAuthMetadataIsCurrent();
}, [ensureThatWorkerClientAuthMetadataIsCurrent]);
+ const invalidTokenLogOut = useInvalidCSATLogOut();
const proxyMethodToWorker: CreateMethodWorkerProxy = React.useCallback(
method =>
async (...args: $ReadOnlyArray<mixed>) => {
await ensureThatWorkerClientAuthMetadataIsCurrent();
const sharedWorker = await getCommSharedWorker();
- const result = await sharedWorker.schedule({
- type: workerRequestMessageTypes.CALL_IDENTITY_CLIENT_METHOD,
- method,
- args,
- });
+ let result;
+ try {
+ result = await sharedWorker.schedule({
+ type: workerRequestMessageTypes.CALL_IDENTITY_CLIENT_METHOD,
+ method,
+ args,
+ });
+ } catch (e) {
+ const message = getMessageForException(e);
+ if (message === 'bad_credentials') {
+ void invalidTokenLogOut();
+ }
+ throw e;
+ }
if (!result) {
throw new Error(
@@ -112,7 +124,7 @@
// Worker should return a message with the corresponding return type
return (result.result: any);
},
- [ensureThatWorkerClientAuthMetadataIsCurrent],
+ [ensureThatWorkerClientAuthMetadataIsCurrent, invalidTokenLogOut],
);
const client = React.useMemo<IdentityServiceClient>(() => {

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 29, 6:23 PM (19 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2597770
Default Alt Text
D14025.diff (2 KB)

Event Timeline