diff --git a/admin/src/plugins/apolloProvider.js b/admin/src/plugins/apolloProvider.js index 1f51be20a..95b7aab7e 100644 --- a/admin/src/plugins/apolloProvider.js +++ b/admin/src/plugins/apolloProvider.js @@ -10,6 +10,7 @@ const authLink = new ApolloLink((operation, forward) => { operation.setContext({ headers: { Authorization: token && token.length > 0 ? `Bearer ${token}` : '', + clientRequestTime: new Date().toString(), }, }) return forward(operation).map((response) => { diff --git a/admin/src/plugins/apolloProvider.test.js b/admin/src/plugins/apolloProvider.test.js index 75e415901..7889c3318 100644 --- a/admin/src/plugins/apolloProvider.test.js +++ b/admin/src/plugins/apolloProvider.test.js @@ -94,6 +94,7 @@ describe('apolloProvider', () => { expect(setContextMock).toBeCalledWith({ headers: { Authorization: 'Bearer some-token', + clientRequestTime: expect.any(String), }, }) }) @@ -109,6 +110,7 @@ describe('apolloProvider', () => { expect(setContextMock).toBeCalledWith({ headers: { Authorization: '', + clientRequestTime: expect.any(String), }, }) }) diff --git a/backend/src/server/context.ts b/backend/src/server/context.ts index d9fd55fe4..5bfc22e72 100644 --- a/backend/src/server/context.ts +++ b/backend/src/server/context.ts @@ -9,6 +9,7 @@ export interface Context { setHeaders: { key: string; value: string }[] role?: Role user?: dbUser + clientRequestTime?: string // hack to use less DB calls for Balance Resolver lastTransaction?: dbTransaction transactionCount?: number @@ -18,14 +19,17 @@ export interface Context { const context = (args: ExpressContext): Context => { const authorization = args.req.headers.authorization - let token: string | null = null - if (authorization) { - token = authorization.replace(/^Bearer /, '') - } - const context = { - token, + const clientRequestTime = args.req.headers.clientrequesttime + const context: Context = { + token: null, setHeaders: [], } + if (authorization) { + context.token = authorization.replace(/^Bearer /, '') + } + if (clientRequestTime && typeof clientRequestTime === 'string') { + context.clientRequestTime = clientRequestTime + } return context } diff --git a/frontend/src/plugins/apolloProvider.js b/frontend/src/plugins/apolloProvider.js index 4a0ff9914..05954d36b 100644 --- a/frontend/src/plugins/apolloProvider.js +++ b/frontend/src/plugins/apolloProvider.js @@ -12,6 +12,7 @@ const authLink = new ApolloLink((operation, forward) => { operation.setContext({ headers: { Authorization: token && token.length > 0 ? `Bearer ${token}` : '', + clientRequestTime: new Date().toString(), }, }) return forward(operation).map((response) => { diff --git a/frontend/src/plugins/apolloProvider.test.js b/frontend/src/plugins/apolloProvider.test.js index aeb02243c..31e1a664b 100644 --- a/frontend/src/plugins/apolloProvider.test.js +++ b/frontend/src/plugins/apolloProvider.test.js @@ -98,6 +98,7 @@ describe('apolloProvider', () => { expect(setContextMock).toBeCalledWith({ headers: { Authorization: 'Bearer some-token', + clientRequestTime: expect.any(String), }, }) }) @@ -113,6 +114,7 @@ describe('apolloProvider', () => { expect(setContextMock).toBeCalledWith({ headers: { Authorization: '', + clientRequestTime: expect.any(String), }, }) })