From 710de07fa62915165675f2a341f77371b5ec7b43 Mon Sep 17 00:00:00 2001 From: Kiwi Date: Fri, 8 Feb 2019 23:40:20 +0100 Subject: [PATCH] chore: harmonize authToken to accessToken (#2184) --- src/core/client/admin/local/local.graphql | 6 ++--- .../mutations/CompleteAccountMutation.ts | 10 ++++--- .../containers/AccountCompletionContainer.tsx | 10 ++++--- .../test/auth/accountCompletion.spec.tsx | 4 +-- .../admin/test/auth/addEmailAddress.spec.tsx | 4 +-- .../admin/test/auth/createPassword.spec.tsx | 4 +-- .../admin/test/auth/createUsername.spec.tsx | 4 +-- .../admin/test/auth/redirectLoggedIn.spec.tsx | 6 ++--- .../admin/test/auth/restricted.spec.tsx | 4 +-- .../admin/test/auth/signInWithEmail.spec.tsx | 6 ++--- .../containers/AccountCompletionContainer.tsx | 6 ++--- .../__snapshots__/initLocalState.spec.ts.snap | 10 +++---- .../client/auth/local/initLocalState.spec.ts | 4 +-- src/core/client/auth/local/local.graphql | 6 ++--- .../auth/mutations/CompleteAccountMutation.ts | 4 +-- .../auth/test/accountCompletion.spec.tsx | 8 +++--- src/core/client/auth/test/signIn.spec.tsx | 6 ++--- src/core/client/auth/test/signUp.spec.tsx | 6 ++--- src/core/client/embed/StreamEmbed.ts | 4 +-- src/core/client/embed/Talk.ts | 4 +-- .../embed/decorators/withConfig.spec.ts | 2 +- .../framework/lib/bootstrap/createManaged.tsx | 2 +- .../client/framework/lib/externalConfig.ts | 2 +- src/core/client/framework/lib/relay/index.ts | 2 +- .../client/framework/lib/relay/localState.ts | 26 +++++++++---------- ...spec.ts => SetAccessTokenMutation.spec.ts} | 22 +++++++++------- ...nMutation.ts => SetAccessTokenMutation.ts} | 24 +++++++++-------- .../framework/mutations/SignOutMutation.ts | 4 +-- src/core/client/framework/mutations/index.ts | 8 +++--- ...reateAuthToken.ts => createAccessToken.ts} | 2 +- .../client/framework/testHelpers/index.ts | 2 +- .../containers/UserBoxContainer.spec.tsx | 10 +++---- .../stream/containers/UserBoxContainer.tsx | 4 +-- src/core/client/stream/index.tsx | 4 +-- ...x => OnPostMessageSetAccessToken.spec.tsx} | 16 ++++++------ ...oken.ts => OnPostMessageSetAccessToken.ts} | 16 ++++++------ .../stream/listeners/OnPymLogin.spec.tsx | 18 +++++++------ .../client/stream/listeners/OnPymLogin.ts | 12 ++++----- .../stream/listeners/OnPymLogout.spec.tsx | 6 ++--- .../client/stream/listeners/OnPymLogout.ts | 2 +- src/core/client/stream/listeners/index.ts | 4 +-- .../__snapshots__/initLocalState.spec.ts.snap | 6 ++--- .../stream/local/initLocalState.spec.ts | 10 +++---- .../client/stream/local/initLocalState.ts | 2 +- src/core/client/stream/local/local.graphql | 6 ++--- .../client/stream/test/comments/create.ts | 2 +- src/core/client/stream/test/profile/create.ts | 2 +- 47 files changed, 172 insertions(+), 160 deletions(-) rename src/core/client/framework/mutations/{SetAuthTokenMutation.spec.ts => SetAccessTokenMutation.spec.ts} (66%) rename src/core/client/framework/mutations/{SetAuthTokenMutation.ts => SetAccessTokenMutation.ts} (50%) rename src/core/client/framework/testHelpers/{createAuthToken.ts => createAccessToken.ts} (80%) rename src/core/client/stream/listeners/{OnPostMessageSetAuthToken.spec.tsx => OnPostMessageSetAccessToken.spec.tsx} (54%) rename src/core/client/stream/listeners/{OnPostMessageSetAuthToken.ts => OnPostMessageSetAccessToken.ts} (52%) diff --git a/src/core/client/admin/local/local.graphql b/src/core/client/admin/local/local.graphql index 5cdb5dacd..8a3193323 100644 --- a/src/core/client/admin/local/local.graphql +++ b/src/core/client/admin/local/local.graphql @@ -12,9 +12,9 @@ enum View { type Local { network: Network! - authToken: String - authExp: Int - authJTI: String + accessToken: String + accessTokenExp: Int + accessTokenJTI: String loggedIn: Boolean! redirectPath: String authView: View diff --git a/src/core/client/admin/mutations/CompleteAccountMutation.ts b/src/core/client/admin/mutations/CompleteAccountMutation.ts index 1856794a9..f878137b4 100644 --- a/src/core/client/admin/mutations/CompleteAccountMutation.ts +++ b/src/core/client/admin/mutations/CompleteAccountMutation.ts @@ -2,10 +2,10 @@ import { Environment } from "relay-runtime"; import { TalkContext } from "talk-framework/lib/bootstrap"; import { createMutationContainer } from "talk-framework/lib/relay"; -import { commit as setAuthToken } from "talk-framework/mutations/SetAuthTokenMutation"; +import { commit as setAccessToken } from "talk-framework/mutations/SetAccessTokenMutation"; interface CompleteAccountInput { - authToken: string; + accessToken: string; } export type CompleteAccountMutation = ( input: CompleteAccountInput @@ -16,7 +16,11 @@ export async function commit( input: CompleteAccountInput, context: TalkContext ) { - await setAuthToken(environment, { authToken: input.authToken }, context); + await setAccessToken( + environment, + { accessToken: input.accessToken }, + context + ); } export const withCompleteAccountMutation = createMutationContainer( diff --git a/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx b/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx index 1b46dd810..f15a87055 100644 --- a/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx +++ b/src/core/client/admin/routes/login/containers/AccountCompletionContainer.tsx @@ -54,9 +54,11 @@ function handleAccountCompletion(props: Props) { setAuthView({ view: "CREATE_PASSWORD" }); } } else { - props.completeAccount({ authToken: props.local.authToken! }).then(() => { - props.router.replace(props.local.redirectPath || "/admin"); - }); + props + .completeAccount({ accessToken: props.local.accessToken! }) + .then(() => { + props.router.replace(props.local.redirectPath || "/admin"); + }); return true; } } @@ -100,7 +102,7 @@ class AccountCompletionContainer extends Component { const enhanced = withLocalStateContainer( graphql` fragment AccountCompletionContainerLocal on Local { - authToken + accessToken authView redirectPath } diff --git a/src/core/client/admin/test/auth/accountCompletion.spec.tsx b/src/core/client/admin/test/auth/accountCompletion.spec.tsx index 84201a959..e74e741ff 100644 --- a/src/core/client/admin/test/auth/accountCompletion.spec.tsx +++ b/src/core/client/admin/test/auth/accountCompletion.spec.tsx @@ -2,7 +2,7 @@ import { get, merge } from "lodash"; import sinon from "sinon"; import { - createAuthToken, + createAccessToken, replaceHistoryLocation, wait, waitForElement, @@ -44,7 +44,7 @@ async function createTestRenderer( initLocalState: localRecord => { localRecord.setValue("SIGN_IN", "authView"); localRecord.setValue(true, "loggedIn"); - localRecord.setValue(createAuthToken(), "authToken"); + localRecord.setValue(createAccessToken(), "accessToken"); }, }); diff --git a/src/core/client/admin/test/auth/addEmailAddress.spec.tsx b/src/core/client/admin/test/auth/addEmailAddress.spec.tsx index f40216a61..af793be4d 100644 --- a/src/core/client/admin/test/auth/addEmailAddress.spec.tsx +++ b/src/core/client/admin/test/auth/addEmailAddress.spec.tsx @@ -2,7 +2,7 @@ import { get, merge } from "lodash"; import sinon from "sinon"; import { - createAuthToken, + createAccessToken, replaceHistoryLocation, toJSON, wait, @@ -37,7 +37,7 @@ async function createTestRenderer( initLocalState: localRecord => { localRecord.setValue("ADD_EMAIL_ADDRESS", "authView"); localRecord.setValue(true, "loggedIn"); - localRecord.setValue(createAuthToken(), "authToken"); + localRecord.setValue(createAccessToken(), "accessToken"); }, }); const container = await waitForElement(() => diff --git a/src/core/client/admin/test/auth/createPassword.spec.tsx b/src/core/client/admin/test/auth/createPassword.spec.tsx index 26cf46035..2fc625245 100644 --- a/src/core/client/admin/test/auth/createPassword.spec.tsx +++ b/src/core/client/admin/test/auth/createPassword.spec.tsx @@ -2,7 +2,7 @@ import { get, merge } from "lodash"; import sinon from "sinon"; import { - createAuthToken, + createAccessToken, replaceHistoryLocation, toJSON, wait, @@ -37,7 +37,7 @@ async function createTestRenderer( initLocalState: localRecord => { localRecord.setValue("CREATE_PASSWORD", "authView"); localRecord.setValue(true, "loggedIn"); - localRecord.setValue(createAuthToken(), "authToken"); + localRecord.setValue(createAccessToken(), "accessToken"); }, }); const container = await waitForElement(() => diff --git a/src/core/client/admin/test/auth/createUsername.spec.tsx b/src/core/client/admin/test/auth/createUsername.spec.tsx index 5466c497d..5926bebbb 100644 --- a/src/core/client/admin/test/auth/createUsername.spec.tsx +++ b/src/core/client/admin/test/auth/createUsername.spec.tsx @@ -2,7 +2,7 @@ import { get, merge } from "lodash"; import sinon from "sinon"; import { - createAuthToken, + createAccessToken, replaceHistoryLocation, toJSON, wait, @@ -36,7 +36,7 @@ async function createTestRenderer( initLocalState: localRecord => { localRecord.setValue("CREATE_USERNAME", "authView"); localRecord.setValue(true, "loggedIn"); - localRecord.setValue(createAuthToken(), "authToken"); + localRecord.setValue(createAccessToken(), "accessToken"); }, }); const container = await waitForElement(() => diff --git a/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx b/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx index 55e1d5d39..152d9260a 100644 --- a/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx +++ b/src/core/client/admin/test/auth/redirectLoggedIn.spec.tsx @@ -1,6 +1,6 @@ import sinon from "sinon"; import { - createAuthToken, + createAccessToken, replaceHistoryLocation, wait, } from "talk-framework/testHelpers"; @@ -30,7 +30,7 @@ it("redirect when already logged in", async () => { logNetwork: false, initLocalState: localRecord => { localRecord.setValue(true, "loggedIn"); - localRecord.setValue(createAuthToken(), "authToken"); + localRecord.setValue(createAccessToken(), "accessToken"); }, }); await wait(() => @@ -48,7 +48,7 @@ it("redirect to redirectPath when already logged in", async () => { logNetwork: false, initLocalState: localRecord => { localRecord.setValue(true, "loggedIn"); - localRecord.setValue(createAuthToken(), "authToken"); + localRecord.setValue(createAccessToken(), "accessToken"); localRecord.setValue("/admin/community", "redirectPath"); }, }); diff --git a/src/core/client/admin/test/auth/restricted.spec.tsx b/src/core/client/admin/test/auth/restricted.spec.tsx index 3cef1ba13..fa7c1b069 100644 --- a/src/core/client/admin/test/auth/restricted.spec.tsx +++ b/src/core/client/admin/test/auth/restricted.spec.tsx @@ -4,7 +4,7 @@ import sinon from "sinon"; import { TalkContext } from "talk-framework/lib/bootstrap"; import { LOCAL_ID } from "talk-framework/lib/relay"; import { - createAuthToken, + createAccessToken, replaceHistoryLocation, wait, waitForElement, @@ -40,7 +40,7 @@ function createTestRenderer( logNetwork: false, initLocalState: localRecord => { localRecord.setValue(true, "loggedIn"); - localRecord.setValue(createAuthToken(), "authToken"); + localRecord.setValue(createAccessToken(), "accessToken"); localRecord.setValue("SIGN_IN", "authView"); }, }); diff --git a/src/core/client/admin/test/auth/signInWithEmail.spec.tsx b/src/core/client/admin/test/auth/signInWithEmail.spec.tsx index 325bffd46..de48c2091 100644 --- a/src/core/client/admin/test/auth/signInWithEmail.spec.tsx +++ b/src/core/client/admin/test/auth/signInWithEmail.spec.tsx @@ -2,7 +2,7 @@ import { ReactTestInstance } from "react-test-renderer"; import sinon from "sinon"; import { - createAuthToken, + createAccessToken, replaceHistoryLocation, wait, waitForElement, @@ -128,7 +128,7 @@ it("submits form successfully", async () => { .find(inputPredicate("password")) .props.onChange({ target: { value: "testtest" } }); - const authToken = createAuthToken(); + const accessToken = createAccessToken(); const restMock = sinon.mock(context.rest); restMock @@ -141,7 +141,7 @@ it("submits form successfully", async () => { }, }) .once() - .returns({ token: authToken }); + .returns({ token: accessToken }); const historyMock = sinon.mock(window.history); diff --git a/src/core/client/auth/containers/AccountCompletionContainer.tsx b/src/core/client/auth/containers/AccountCompletionContainer.tsx index d067a7ec9..0e861518a 100644 --- a/src/core/client/auth/containers/AccountCompletionContainer.tsx +++ b/src/core/client/auth/containers/AccountCompletionContainer.tsx @@ -26,7 +26,7 @@ interface Props { function handleAccountCompletion(props: Props) { const { - local: { view, authToken }, + local: { view, accessToken }, me, auth, setView, @@ -55,7 +55,7 @@ function handleAccountCompletion(props: Props) { } return false; } - completeAccount({ authToken: authToken! }); + completeAccount({ accessToken: accessToken! }); return true; } return false; @@ -91,7 +91,7 @@ class AccountCompletionContainer extends Component { const enhanced = withLocalStateContainer( graphql` fragment AccountCompletionContainerLocal on Local { - authToken + accessToken view } ` diff --git a/src/core/client/auth/local/__snapshots__/initLocalState.spec.ts.snap b/src/core/client/auth/local/__snapshots__/initLocalState.spec.ts.snap index a7dae5ec7..16bcf04f7 100644 --- a/src/core/client/auth/local/__snapshots__/initLocalState.spec.ts.snap +++ b/src/core/client/auth/local/__snapshots__/initLocalState.spec.ts.snap @@ -4,8 +4,8 @@ exports[`get auth token from url 1`] = ` "{ \\"__id\\": \\"client:root.local\\", \\"__typename\\": \\"Local\\", - \\"authToken\\": \\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzMWIyNjU5MS00ZTlhLTQzODgtYTdmZi1lMWJkYzVkOTdjY2UifQ==\\", - \\"authJTI\\": \\"31b26591-4e9a-4388-a7ff-e1bdc5d97cce\\", + \\"accessToken\\": \\"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzMWIyNjU5MS00ZTlhLTQzODgtYTdmZi1lMWJkYzVkOTdjY2UifQ==\\", + \\"accessTokenJTI\\": \\"31b26591-4e9a-4388-a7ff-e1bdc5d97cce\\", \\"loggedIn\\": true, \\"network\\": { \\"__ref\\": \\"client:root.local.network\\" @@ -27,9 +27,9 @@ exports[`init local state 1`] = ` \\"client:root.local\\": { \\"__id\\": \\"client:root.local\\", \\"__typename\\": \\"Local\\", - \\"authToken\\": \\"\\", - \\"authExp\\": null, - \\"authJTI\\": null, + \\"accessToken\\": \\"\\", + \\"accessTokenExp\\": null, + \\"accessTokenJTI\\": null, \\"loggedIn\\": false, \\"network\\": { \\"__ref\\": \\"client:root.local.network\\" diff --git a/src/core/client/auth/local/initLocalState.spec.ts b/src/core/client/auth/local/initLocalState.spec.ts index 5c88e4685..cd3dab579 100644 --- a/src/core/client/auth/local/initLocalState.spec.ts +++ b/src/core/client/auth/local/initLocalState.spec.ts @@ -2,7 +2,7 @@ import { Environment, RecordSource } from "relay-runtime"; import { LOCAL_ID } from "talk-framework/lib/relay"; import { - createAuthToken, + createAccessToken, createRelayEnvironment, replaceHistoryLocation, } from "talk-framework/testHelpers"; @@ -41,7 +41,7 @@ it("set view from query", async () => { it("get auth token from url", async () => { const restoreHistoryLocation = replaceHistoryLocation( - `http://localhost/#accessToken=${createAuthToken()}` + `http://localhost/#accessToken=${createAccessToken()}` ); await initLocalState(environment, context as any); expect(JSON.stringify(source.get(LOCAL_ID), null, 2)).toMatchSnapshot(); diff --git a/src/core/client/auth/local/local.graphql b/src/core/client/auth/local/local.graphql index e60409238..6aa7e69a4 100644 --- a/src/core/client/auth/local/local.graphql +++ b/src/core/client/auth/local/local.graphql @@ -9,9 +9,9 @@ enum View { } type Local { - authToken: String - authExp: Int - authJTI: String + accessToken: String + accessTokenExp: Int + accessTokenJTI: String loggedIn: Boolean! view: View! error: String diff --git a/src/core/client/auth/mutations/CompleteAccountMutation.ts b/src/core/client/auth/mutations/CompleteAccountMutation.ts index 6db372fd7..fe68f0764 100644 --- a/src/core/client/auth/mutations/CompleteAccountMutation.ts +++ b/src/core/client/auth/mutations/CompleteAccountMutation.ts @@ -4,7 +4,7 @@ import { TalkContext } from "talk-framework/lib/bootstrap"; import { createMutationContainer } from "talk-framework/lib/relay"; export interface CompleteAccountInput { - authToken: string; + accessToken: string; } export type CompleteAccountMutation = ( input: CompleteAccountInput @@ -15,7 +15,7 @@ export async function commit( input: CompleteAccountInput, { postMessage }: TalkContext ) { - postMessage.send("setAuthToken", input.authToken, window.opener); + postMessage.send("setAccessToken", input.accessToken, window.opener); window.close(); } diff --git a/src/core/client/auth/test/accountCompletion.spec.tsx b/src/core/client/auth/test/accountCompletion.spec.tsx index 39bee43e7..892211c3a 100644 --- a/src/core/client/auth/test/accountCompletion.spec.tsx +++ b/src/core/client/auth/test/accountCompletion.spec.tsx @@ -2,7 +2,7 @@ import { get, merge } from "lodash"; import sinon from "sinon"; import { - createAuthToken, + createAccessToken, wait, waitForElement, within, @@ -14,7 +14,7 @@ import mockWindow from "./mockWindow"; let windowMock: ReturnType; -const authToken = createAuthToken(); +const accessToken = createAccessToken(); async function createTestRenderer( customResolver: any = {}, @@ -42,7 +42,7 @@ async function createTestRenderer( resolvers, initLocalState: localRecord => { localRecord.setValue("CREATE_PASSWORD", "view"); - localRecord.setValue(authToken, "authToken"); + localRecord.setValue(accessToken, "accessToken"); }, }); @@ -132,7 +132,7 @@ it("send back auth token", async () => { const postMessageMock = sinon.mock(context.postMessage); postMessageMock .expects("send") - .withArgs("setAuthToken", authToken, window.opener) + .withArgs("setAccessToken", accessToken, window.opener) .atLeast(1); // Wait till window is closed. diff --git a/src/core/client/auth/test/signIn.spec.tsx b/src/core/client/auth/test/signIn.spec.tsx index 43fb25cc9..25e013c36 100644 --- a/src/core/client/auth/test/signIn.spec.tsx +++ b/src/core/client/auth/test/signIn.spec.tsx @@ -164,7 +164,7 @@ it("shows server error", async () => { it("submits form successfully", async () => { const { form, context } = await createTestRenderer(); const { getByLabelText } = within(form!); - const authToken = "auth-token"; + const accessToken = "access-token"; const emailAddressField = getByLabelText("Email Address"); const passwordField = getByLabelText("Password"); const submitButton = form!.find( @@ -185,7 +185,7 @@ it("submits form successfully", async () => { }, }) .once() - .returns({ token: authToken }); + .returns({ token: accessToken }); form!.props.onSubmit(); @@ -198,7 +198,7 @@ it("submits form successfully", async () => { expect(toJSON(form!)).toMatchSnapshot(); // Wait for window hash to contain a token. - await wait(() => expect(location.hash).toBe(`#accessToken=${authToken}`)); + await wait(() => expect(location.hash).toBe(`#accessToken=${accessToken}`)); restMock.verify(); }); diff --git a/src/core/client/auth/test/signUp.spec.tsx b/src/core/client/auth/test/signUp.spec.tsx index 52d4bded6..fd03763e9 100644 --- a/src/core/client/auth/test/signUp.spec.tsx +++ b/src/core/client/auth/test/signUp.spec.tsx @@ -186,7 +186,7 @@ it("shows server error", async () => { it("submits form successfully", async () => { const { context, main, form } = await createTestRenderer(); const { getByLabelText } = within(form!); - const authToken = "auth-token"; + const accessToken = "access-token"; const emailAddressField = getByLabelText("Email Address"); const usernameField = getByLabelText("Username"); const passwordField = getByLabelText("Password"); @@ -210,7 +210,7 @@ it("submits form successfully", async () => { }, }) .once() - .returns({ token: authToken }); + .returns({ token: accessToken }); form!.props.onSubmit(); @@ -224,7 +224,7 @@ it("submits form successfully", async () => { expect(toJSON(main)).toMatchSnapshot(); // Wait for window hash to contain a token. - await wait(() => expect(location.hash).toBe(`#accessToken=${authToken}`)); + await wait(() => expect(location.hash).toBe(`#accessToken=${accessToken}`)); restMock.verify(); }); diff --git a/src/core/client/embed/StreamEmbed.ts b/src/core/client/embed/StreamEmbed.ts index e18f8c3f1..a8f2363f1 100644 --- a/src/core/client/embed/StreamEmbed.ts +++ b/src/core/client/embed/StreamEmbed.ts @@ -30,7 +30,7 @@ export interface StreamEmbedConfig { eventEmitter: EventEmitter2; id: string; rootURL: string; - authToken?: string; + accessToken?: string; } export class StreamEmbed { @@ -123,7 +123,7 @@ export class StreamEmbed { } const externalConfig: ExternalConfig = { - authToken: this.config.authToken, + accessToken: this.config.accessToken, }; const streamDecorators: ReadonlyArray = [ diff --git a/src/core/client/embed/Talk.ts b/src/core/client/embed/Talk.ts index de57baa6f..f21e4b757 100644 --- a/src/core/client/embed/Talk.ts +++ b/src/core/client/embed/Talk.ts @@ -12,7 +12,7 @@ export interface Config { id?: string; autoRender?: boolean; events?: (eventEmitter: EventEmitter2) => void; - authToken?: string; + accessToken?: string; } function getLocationOrigin() { @@ -58,6 +58,6 @@ export function createStreamEmbed(config: Config): StreamEmbed { rootURL: config.rootURL || getLocationOrigin(), autoRender: config.autoRender, eventEmitter, - authToken: config.authToken, + accessToken: config.accessToken, }); } diff --git a/src/core/client/embed/decorators/withConfig.spec.ts b/src/core/client/embed/decorators/withConfig.spec.ts index 964fbb55d..b43dcf2f0 100644 --- a/src/core/client/embed/decorators/withConfig.spec.ts +++ b/src/core/client/embed/decorators/withConfig.spec.ts @@ -3,7 +3,7 @@ import sinon from "sinon"; import withConfig from "./withConfig"; it("should emit events from pym to Config", () => { - const config = { authToken: "token" }; + const config = { accessToken: "token" }; const fakePym = { onMessage: (type: string, callback: () => void) => { expect(type).toBe("getConfig"); diff --git a/src/core/client/framework/lib/bootstrap/createManaged.tsx b/src/core/client/framework/lib/bootstrap/createManaged.tsx index 5245e0e3b..850986b43 100644 --- a/src/core/client/framework/lib/bootstrap/createManaged.tsx +++ b/src/core/client/framework/lib/bootstrap/createManaged.tsx @@ -93,7 +93,7 @@ function createRelayEnvironment() { const tokenGetter: TokenGetter = () => { const localState = source.get(LOCAL_ID); if (localState) { - return (localState.loggedIn && localState.authToken) || ""; + return (localState.loggedIn && localState.accessToken) || ""; } return ""; }; diff --git a/src/core/client/framework/lib/externalConfig.ts b/src/core/client/framework/lib/externalConfig.ts index 8f7518939..0af0c76fb 100644 --- a/src/core/client/framework/lib/externalConfig.ts +++ b/src/core/client/framework/lib/externalConfig.ts @@ -2,7 +2,7 @@ import { Child as PymChild } from "pym.js"; import { areWeInIframe } from "talk-framework/utils"; export interface ExternalConfig { - authToken?: string; + accessToken?: string; } export function getExternalConfig( diff --git a/src/core/client/framework/lib/relay/index.ts b/src/core/client/framework/lib/relay/index.ts index b97cd6381..d82563737 100644 --- a/src/core/client/framework/lib/relay/index.ts +++ b/src/core/client/framework/lib/relay/index.ts @@ -17,5 +17,5 @@ export { graphql } from "react-relay"; export { default as commitLocalUpdatePromisified, } from "./commitLocalUpdatePromisified"; -export { initLocalBaseState, setAuthTokenInLocalState } from "./localState"; +export { initLocalBaseState, setAccessTokenInLocalState } from "./localState"; export { default as fetchQuery } from "./fetchQuery"; diff --git a/src/core/client/framework/lib/relay/localState.ts b/src/core/client/framework/lib/relay/localState.ts index 80d78c42e..1e2817c5c 100644 --- a/src/core/client/framework/lib/relay/localState.ts +++ b/src/core/client/framework/lib/relay/localState.ts @@ -21,20 +21,20 @@ export const LOCAL_ID = "client:root.local"; export const NETWORK_TYPE = "Network"; export const NETWORK_ID = "client:root.local.network"; -export function setAuthTokenInLocalState( - authToken: string | null, +export function setAccessTokenInLocalState( + accessToken: string | null, source: RecordSourceProxy ) { const localRecord = source.get(LOCAL_ID)!; - localRecord.setValue(authToken || "", "authToken"); - if (authToken) { - const { payload, expired } = parseJWT(authToken); - localRecord.setValue(payload.exp, "authExp"); - localRecord.setValue(payload.jti, "authJTI"); + localRecord.setValue(accessToken || "", "accessToken"); + if (accessToken) { + const { payload, expired } = parseJWT(accessToken); + localRecord.setValue(payload.exp, "accessTokenExp"); + localRecord.setValue(payload.jti, "accessTokenJTI"); localRecord.setValue(!expired, "loggedIn"); } else { - localRecord.setValue(null, "authExp"); - localRecord.setValue(null, "authJTI"); + localRecord.setValue(null, "accessTokenExp"); + localRecord.setValue(null, "accessTokenJTI"); localRecord.setValue(false, "loggedIn"); } } @@ -42,10 +42,10 @@ export function setAuthTokenInLocalState( export async function initLocalBaseState( environment: Environment, { localStorage }: TalkContext, - authToken?: string | null + accessToken?: string | null ) { - if (authToken === undefined) { - authToken = await localStorage!.getItem("authToken"); + if (accessToken === undefined) { + accessToken = await localStorage!.getItem("accessToken"); } commitLocalUpdate(environment, s => { @@ -56,7 +56,7 @@ export async function initLocalBaseState( root.setLinkedRecord(localRecord, "local"); // Set auth token - setAuthTokenInLocalState(authToken || null, s); + setAccessTokenInLocalState(accessToken || null, s); // Create network Record const networkRecord = createAndRetain( diff --git a/src/core/client/framework/mutations/SetAuthTokenMutation.spec.ts b/src/core/client/framework/mutations/SetAccessTokenMutation.spec.ts similarity index 66% rename from src/core/client/framework/mutations/SetAuthTokenMutation.spec.ts rename to src/core/client/framework/mutations/SetAccessTokenMutation.spec.ts index bc0c5c2c1..dcbe1aa6b 100644 --- a/src/core/client/framework/mutations/SetAuthTokenMutation.spec.ts +++ b/src/core/client/framework/mutations/SetAccessTokenMutation.spec.ts @@ -5,11 +5,11 @@ import { TalkContext } from "talk-framework/lib/bootstrap"; import { LOCAL_ID } from "talk-framework/lib/relay"; import { createPromisifiedStorage } from "talk-framework/lib/storage"; import { - createAuthToken, + createAccessToken, createRelayEnvironment, } from "talk-framework/testHelpers"; -import { commit } from "./SetAuthTokenMutation"; +import { commit } from "./SetAccessTokenMutation"; let environment: Environment; const source: RecordSource = new RecordSource(); @@ -20,7 +20,7 @@ beforeAll(() => { }); }); -const authToken = createAuthToken(); +const accessToken = createAccessToken(); it("Sets auth token to localStorage", async () => { const clearSessionStub = sinon.stub(); @@ -28,10 +28,10 @@ it("Sets auth token to localStorage", async () => { localStorage: createPromisifiedStorage(), clearSession: clearSessionStub, }; - await commit(environment, { authToken }, context as any); - expect(source.get(LOCAL_ID)!.authToken).toEqual(authToken); - await expect(context.localStorage!.getItem("authToken")).resolves.toEqual( - authToken + await commit(environment, { accessToken }, context as any); + expect(source.get(LOCAL_ID)!.accessToken).toEqual(accessToken); + await expect(context.localStorage!.getItem("accessToken")).resolves.toEqual( + accessToken ); expect(clearSessionStub.calledOnce).toBe(true); }); @@ -42,8 +42,10 @@ it("Removes auth token from localStorage", async () => { localStorage: createPromisifiedStorage(), clearSession: clearSessionStub, }; - localStorage.setItem("authToken", authToken); - await commit(environment, { authToken: null }, context as any); - await expect(context.localStorage!.getItem("authToken")).resolves.toBeNull(); + localStorage.setItem("accessToken", accessToken); + await commit(environment, { accessToken: null }, context as any); + await expect( + context.localStorage!.getItem("accessToken") + ).resolves.toBeNull(); expect(clearSessionStub.calledOnce).toBe(true); }); diff --git a/src/core/client/framework/mutations/SetAuthTokenMutation.ts b/src/core/client/framework/mutations/SetAccessTokenMutation.ts similarity index 50% rename from src/core/client/framework/mutations/SetAuthTokenMutation.ts rename to src/core/client/framework/mutations/SetAccessTokenMutation.ts index 5efc50e39..f44fba3bb 100644 --- a/src/core/client/framework/mutations/SetAuthTokenMutation.ts +++ b/src/core/client/framework/mutations/SetAccessTokenMutation.ts @@ -4,33 +4,35 @@ import { TalkContext } from "talk-framework/lib/bootstrap"; import { commitLocalUpdatePromisified, createMutationContainer, - setAuthTokenInLocalState, + setAccessTokenInLocalState, } from "talk-framework/lib/relay"; -export interface SetAuthTokenInput { - authToken: string | null; +export interface SetAccessTokenInput { + accessToken: string | null; } -export type SetAuthTokenMutation = (input: SetAuthTokenInput) => Promise; +export type SetAccessTokenMutation = ( + input: SetAccessTokenInput +) => Promise; export async function commit( environment: Environment, - input: SetAuthTokenInput, + input: SetAccessTokenInput, { localStorage, clearSession }: TalkContext ) { await commitLocalUpdatePromisified(environment, async store => { - setAuthTokenInLocalState(input.authToken, store); - if (input.authToken) { - await localStorage.setItem("authToken", input.authToken); + setAccessTokenInLocalState(input.accessToken, store); + if (input.accessToken) { + await localStorage.setItem("accessToken", input.accessToken); } else { - await localStorage.removeItem("authToken"); + await localStorage.removeItem("accessToken"); } // Clear current session, as we are starting a new one. await clearSession(); }); } -export const withSetAuthTokenMutation = createMutationContainer( - "setAuthToken", +export const withSetAccessTokenMutation = createMutationContainer( + "setAccessToken", commit ); diff --git a/src/core/client/framework/mutations/SignOutMutation.ts b/src/core/client/framework/mutations/SignOutMutation.ts index 2f170e32e..79b5b0fad 100644 --- a/src/core/client/framework/mutations/SignOutMutation.ts +++ b/src/core/client/framework/mutations/SignOutMutation.ts @@ -2,7 +2,7 @@ import { Environment } from "relay-runtime"; import { TalkContext } from "talk-framework/lib/bootstrap"; import { createMutationContainer } from "talk-framework/lib/relay"; import signOut from "../rest/signOut"; -import { commit as setAuthToken } from "./SetAuthTokenMutation"; +import { commit as setAccessToken } from "./SetAccessTokenMutation"; export type SignOutMutation = () => Promise; @@ -12,7 +12,7 @@ export async function commit( ctx: TalkContext ) { await signOut(ctx.rest); - await setAuthToken(environment, { authToken: "" }, ctx); + await setAccessToken(environment, { accessToken: "" }, ctx); } export const withSignOutMutation = createMutationContainer("signOut", commit); diff --git a/src/core/client/framework/mutations/index.ts b/src/core/client/framework/mutations/index.ts index 5536b91b6..f6904d4e8 100644 --- a/src/core/client/framework/mutations/index.ts +++ b/src/core/client/framework/mutations/index.ts @@ -1,8 +1,8 @@ export { - withSetAuthTokenMutation, - SetAuthTokenMutation, - SetAuthTokenInput, -} from "./SetAuthTokenMutation"; + withSetAccessTokenMutation, + SetAccessTokenMutation, + SetAccessTokenInput, +} from "./SetAccessTokenMutation"; export { withSignOutMutation, SignOutMutation } from "./SignOutMutation"; export { withSetNetworkStatusMutation, diff --git a/src/core/client/framework/testHelpers/createAuthToken.ts b/src/core/client/framework/testHelpers/createAccessToken.ts similarity index 80% rename from src/core/client/framework/testHelpers/createAuthToken.ts rename to src/core/client/framework/testHelpers/createAccessToken.ts index 34823df87..13ff89756 100644 --- a/src/core/client/framework/testHelpers/createAuthToken.ts +++ b/src/core/client/framework/testHelpers/createAccessToken.ts @@ -1,4 +1,4 @@ -export default function createAuthToken() { +export default function createAccessToken() { return `${btoa( JSON.stringify({ alg: "HS256", diff --git a/src/core/client/framework/testHelpers/index.ts b/src/core/client/framework/testHelpers/index.ts index bbf6a5107..c97586bdc 100644 --- a/src/core/client/framework/testHelpers/index.ts +++ b/src/core/client/framework/testHelpers/index.ts @@ -19,6 +19,6 @@ export { default as waitUntilThrow } from "./waitUntilThrow"; export { default as matchText } from "./matchText"; export { default as toJSON } from "./toJSON"; export { default as replaceHistoryLocation } from "./replaceHistoryLocation"; -export { default as createAuthToken } from "./createAuthToken"; +export { default as createAccessToken } from "./createAccessToken"; export { default as findParentsWithType } from "./findParentsWithType"; export { default as findParentWithType } from "./findParentWithType"; diff --git a/src/core/client/stream/containers/UserBoxContainer.spec.tsx b/src/core/client/stream/containers/UserBoxContainer.spec.tsx index 4876247d8..b942078dd 100644 --- a/src/core/client/stream/containers/UserBoxContainer.spec.tsx +++ b/src/core/client/stream/containers/UserBoxContainer.spec.tsx @@ -17,7 +17,7 @@ it("renders fully", () => { focus: false, view: "SIGN_IN", }, - authJTI: "JTI", + accessTokenJTI: "JTI", }, me: null, settings: { @@ -74,7 +74,7 @@ it("renders without logout button", () => { focus: false, view: "SIGN_IN", }, - authJTI: null, + accessTokenJTI: null, }, me: null, settings: { @@ -131,7 +131,7 @@ it("renders sso only", () => { focus: false, view: "SIGN_IN", }, - authJTI: "JTI", + accessTokenJTI: "JTI", }, me: null, settings: { @@ -188,7 +188,7 @@ it("renders sso only without logout button", () => { focus: false, view: "SIGN_IN", }, - authJTI: "JTI", + accessTokenJTI: "JTI", }, me: null, settings: { @@ -245,7 +245,7 @@ it("renders without register button", () => { focus: false, view: "SIGN_IN", }, - authJTI: "JTI", + accessTokenJTI: "JTI", }, me: null, settings: { diff --git a/src/core/client/stream/containers/UserBoxContainer.tsx b/src/core/client/stream/containers/UserBoxContainer.tsx index 5d9c60f35..e4abdd114 100644 --- a/src/core/client/stream/containers/UserBoxContainer.tsx +++ b/src/core/client/stream/containers/UserBoxContainer.tsx @@ -40,7 +40,7 @@ export class UserBoxContainer extends Component { private handleSignOut = () => this.props.signOut(); private get supportsLogout() { - return !!this.props.local.authJTI; + return !!this.props.local.accessTokenJTI; } private get supportsRegister() { @@ -120,7 +120,7 @@ const enhanced = withSignOutMutation( focus view } - authJTI + accessTokenJTI } ` )( diff --git a/src/core/client/stream/index.tsx b/src/core/client/stream/index.tsx index dcc35c77b..707329420 100644 --- a/src/core/client/stream/index.tsx +++ b/src/core/client/stream/index.tsx @@ -8,7 +8,7 @@ import AppContainer from "talk-stream/containers/AppContainer"; import { OnEvents, - OnPostMessageSetAuthToken, + OnPostMessageSetAccessToken, OnPymLogin, OnPymLogout, OnPymSetCommentID, @@ -21,7 +21,7 @@ const listeners = ( - + ); diff --git a/src/core/client/stream/listeners/OnPostMessageSetAuthToken.spec.tsx b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.spec.tsx similarity index 54% rename from src/core/client/stream/listeners/OnPostMessageSetAuthToken.spec.tsx rename to src/core/client/stream/listeners/OnPostMessageSetAccessToken.spec.tsx index 53f28e26f..c51b4ff28 100644 --- a/src/core/client/stream/listeners/OnPostMessageSetAuthToken.spec.tsx +++ b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.spec.tsx @@ -3,27 +3,27 @@ import { createRenderer } from "react-test-renderer/shallow"; import { createSinonStub } from "talk-framework/testHelpers"; -import { OnPostMessageSetAuthToken } from "./OnPostMessageSetAuthToken"; +import { OnPostMessageSetAccessToken } from "./OnPostMessageSetAccessToken"; it("Listens to event and sets auth token", () => { - const token = "auth-token"; + const token = "access-token"; const postMessage: any = { on: (name: string, cb: (token: string) => void) => { - expect(name).toBe("setAuthToken"); + expect(name).toBe("setAccessToken"); cb(token); }, }; - const setAuthToken = createSinonStub( + const setAccessToken = createSinonStub( s => s.throws(), - s => s.withArgs({ authToken: token }).returns(null) + s => s.withArgs({ accessToken: token }).returns(null) ); createRenderer().render( - ); - expect(setAuthToken.calledOnce); + expect(setAccessToken.calledOnce); }); diff --git a/src/core/client/stream/listeners/OnPostMessageSetAuthToken.ts b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.ts similarity index 52% rename from src/core/client/stream/listeners/OnPostMessageSetAuthToken.ts rename to src/core/client/stream/listeners/OnPostMessageSetAccessToken.ts index 9086f6214..28d58fda8 100644 --- a/src/core/client/stream/listeners/OnPostMessageSetAuthToken.ts +++ b/src/core/client/stream/listeners/OnPostMessageSetAccessToken.ts @@ -2,21 +2,21 @@ import { Component } from "react"; import { TalkContext, withContext } from "talk-framework/lib/bootstrap"; import { - SetAuthTokenMutation, - withSetAuthTokenMutation, -} from "talk-framework/mutations/SetAuthTokenMutation"; + SetAccessTokenMutation, + withSetAccessTokenMutation, +} from "talk-framework/mutations/SetAccessTokenMutation"; interface Props { postMessage: TalkContext["postMessage"]; - setAuthToken: SetAuthTokenMutation; + setAccessToken: SetAccessTokenMutation; } -export class OnPostMessageSetAuthToken extends Component { +export class OnPostMessageSetAccessToken extends Component { constructor(props: Props) { super(props); // Auth popup will use this to handle a successful login. - props.postMessage!.on("setAuthToken", (authToken: string) => { - props.setAuthToken({ authToken }); + props.postMessage!.on("setAccessToken", (accessToken: string) => { + props.setAccessToken({ accessToken }); }); } @@ -26,6 +26,6 @@ export class OnPostMessageSetAuthToken extends Component { } const enhanced = withContext(({ postMessage }) => ({ postMessage }))( - withSetAuthTokenMutation(OnPostMessageSetAuthToken) + withSetAccessTokenMutation(OnPostMessageSetAccessToken) ); export default enhanced; diff --git a/src/core/client/stream/listeners/OnPymLogin.spec.tsx b/src/core/client/stream/listeners/OnPymLogin.spec.tsx index 9e8ffdff6..a61b4a035 100644 --- a/src/core/client/stream/listeners/OnPymLogin.spec.tsx +++ b/src/core/client/stream/listeners/OnPymLogin.spec.tsx @@ -5,20 +5,22 @@ import { createSinonStub } from "talk-framework/testHelpers"; import { OnPymLogin } from "./OnPymLogin"; -it("Listens to event and calls setAuthToken", () => { - const authToken = "auth-token"; +it("Listens to event and calls setAccessToken", () => { + const accessToken = "access-token"; const pym: any = { - onMessage: (eventName: string, cb: (authToken: string) => void) => { + onMessage: (eventName: string, cb: (accessToken: string) => void) => { expect(eventName).toBe("login"); - cb(authToken); + cb(accessToken); }, }; - const setAuthToken = createSinonStub( + const setAccessToken = createSinonStub( s => s.throws(), - s => s.withArgs({ authToken }).returns(null) + s => s.withArgs({ accessToken }).returns(null) ); - createRenderer().render(); - expect(setAuthToken.calledOnce); + createRenderer().render( + + ); + expect(setAccessToken.calledOnce); }); diff --git a/src/core/client/stream/listeners/OnPymLogin.ts b/src/core/client/stream/listeners/OnPymLogin.ts index 0d40376e0..4b5661b01 100644 --- a/src/core/client/stream/listeners/OnPymLogin.ts +++ b/src/core/client/stream/listeners/OnPymLogin.ts @@ -1,15 +1,15 @@ import { Child } from "pym.js"; import { Component } from "react"; import { - SetAuthTokenMutation, - withSetAuthTokenMutation, + SetAccessTokenMutation, + withSetAccessTokenMutation, } from "talk-framework/mutations"; import { withContext } from "talk-framework/lib/bootstrap"; interface Props { pym: Child; - setAuthToken: SetAuthTokenMutation; + setAccessToken: SetAccessTokenMutation; } export class OnPymLogin extends Component { @@ -17,8 +17,8 @@ export class OnPymLogin extends Component { super(props); // Sets comment id through pym. - props.pym!.onMessage("login", authToken => { - this.props.setAuthToken({ authToken }); + props.pym!.onMessage("login", accessToken => { + this.props.setAccessToken({ accessToken }); }); } @@ -29,6 +29,6 @@ export class OnPymLogin extends Component { const enhanced = withContext(({ pym }) => ({ pym, -}))(withSetAuthTokenMutation(OnPymLogin)); +}))(withSetAccessTokenMutation(OnPymLogin)); export default enhanced; diff --git a/src/core/client/stream/listeners/OnPymLogout.spec.tsx b/src/core/client/stream/listeners/OnPymLogout.spec.tsx index 2deee8c29..291534a39 100644 --- a/src/core/client/stream/listeners/OnPymLogout.spec.tsx +++ b/src/core/client/stream/listeners/OnPymLogout.spec.tsx @@ -5,11 +5,11 @@ import sinon from "sinon"; import { OnPymLogout } from "./OnPymLogout"; it("Listens to event and calls signOut", () => { - const authToken = "auth-token"; + const accessToken = "access-token"; const pym: any = { - onMessage: (eventName: string, cb: (authToken: string) => void) => { + onMessage: (eventName: string, cb: (accessToken: string) => void) => { expect(eventName).toBe("logout"); - cb(authToken); + cb(accessToken); }, }; diff --git a/src/core/client/stream/listeners/OnPymLogout.ts b/src/core/client/stream/listeners/OnPymLogout.ts index fd6411aa9..8775603d1 100644 --- a/src/core/client/stream/listeners/OnPymLogout.ts +++ b/src/core/client/stream/listeners/OnPymLogout.ts @@ -14,7 +14,7 @@ export class OnPymLogout extends Component { super(props); // Sets comment id through pym. - props.pym!.onMessage("logout", authToken => { + props.pym!.onMessage("logout", accessToken => { this.props.signOut(); }); } diff --git a/src/core/client/stream/listeners/index.ts b/src/core/client/stream/listeners/index.ts index a66e271b2..46de5021e 100644 --- a/src/core/client/stream/listeners/index.ts +++ b/src/core/client/stream/listeners/index.ts @@ -1,7 +1,7 @@ export { default as OnPymSetCommentID } from "./OnPymSetCommentID"; export { - default as OnPostMessageSetAuthToken, -} from "./OnPostMessageSetAuthToken"; + default as OnPostMessageSetAccessToken, +} from "./OnPostMessageSetAccessToken"; export { default as OnEvents } from "./OnEvents"; export { default as OnPymLogin } from "./OnPymLogin"; export { default as OnPymLogout } from "./OnPymLogout"; diff --git a/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap b/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap index 073f8648a..fb8973225 100644 --- a/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap +++ b/src/core/client/stream/local/__snapshots__/initLocalState.spec.ts.snap @@ -12,9 +12,9 @@ exports[`init local state 1`] = ` \\"client:root.local\\": { \\"__id\\": \\"client:root.local\\", \\"__typename\\": \\"Local\\", - \\"authToken\\": \\"\\", - \\"authExp\\": null, - \\"authJTI\\": null, + \\"accessToken\\": \\"\\", + \\"accessTokenExp\\": null, + \\"accessTokenJTI\\": null, \\"loggedIn\\": false, \\"network\\": { \\"__ref\\": \\"client:root.local.network\\" diff --git a/src/core/client/stream/local/initLocalState.spec.ts b/src/core/client/stream/local/initLocalState.spec.ts index 088b2beef..0dee67816 100644 --- a/src/core/client/stream/local/initLocalState.spec.ts +++ b/src/core/client/stream/local/initLocalState.spec.ts @@ -5,7 +5,7 @@ import { TalkContext } from "talk-framework/lib/bootstrap"; import { LOCAL_ID } from "talk-framework/lib/relay"; import { createPromisifiedStorage } from "talk-framework/lib/storage"; import { - createAuthToken, + createAccessToken, createRelayEnvironment, replaceHistoryLocation, } from "talk-framework/testHelpers"; @@ -58,12 +58,12 @@ it("set commentID from query", async () => { restoreHistoryLocation(); }); -it("set authToken from localStorage", async () => { +it("set accessToken from localStorage", async () => { const context: Partial = { localStorage: createPromisifiedStorage(), }; - const authToken = createAuthToken(); - context.localStorage!.setItem("authToken", authToken); + const accessToken = createAccessToken(); + context.localStorage!.setItem("accessToken", accessToken); await initLocalState(environment, context as any); - expect(source.get(LOCAL_ID)!.authToken).toBe(authToken); + expect(source.get(LOCAL_ID)!.accessToken).toBe(accessToken); }); diff --git a/src/core/client/stream/local/initLocalState.ts b/src/core/client/stream/local/initLocalState.ts index b978429f8..3236ecc3c 100644 --- a/src/core/client/stream/local/initLocalState.ts +++ b/src/core/client/stream/local/initLocalState.ts @@ -18,7 +18,7 @@ export default async function initLocalState( await initLocalBaseState( environment, context, - config ? config.authToken : undefined + config ? config.accessToken : undefined ); commitLocalUpdate(environment, s => { diff --git a/src/core/client/stream/local/local.graphql b/src/core/client/stream/local/local.graphql index 4b254b40a..9f9b82c6b 100644 --- a/src/core/client/stream/local/local.graphql +++ b/src/core/client/stream/local/local.graphql @@ -29,9 +29,9 @@ extend type Comment { type Local { network: Network! - authToken: String - authExp: Int - authJTI: String + accessToken: String + accessTokenExp: Int + accessTokenJTI: String loggedIn: Boolean! activeTab: Tab! authPopup: AuthPopup! diff --git a/src/core/client/stream/test/comments/create.ts b/src/core/client/stream/test/comments/create.ts index 9f4de0c26..6796c8c13 100644 --- a/src/core/client/stream/test/comments/create.ts +++ b/src/core/client/stream/test/comments/create.ts @@ -7,7 +7,7 @@ export default function create(params: CreateParams) { if (params.initLocalState) { localRecord.setValue("COMMENTS", "activeTab"); localRecord.setValue(false, "loggedIn"); - localRecord.setValue("jti", "authJTI"); + localRecord.setValue("jti", "accessTokenJTI"); params.initLocalState(localRecord, source, environment); } }, diff --git a/src/core/client/stream/test/profile/create.ts b/src/core/client/stream/test/profile/create.ts index a10c66f2d..3ee6df892 100644 --- a/src/core/client/stream/test/profile/create.ts +++ b/src/core/client/stream/test/profile/create.ts @@ -6,7 +6,7 @@ export default function create(params: CreateParams) { initLocalState: (localRecord, source, environment) => { if (params.initLocalState) { localRecord.setValue("PROFILE", "activeTab"); - localRecord.setValue("jti", "authJTI"); + localRecord.setValue("jti", "accessTokenJTI"); params.initLocalState(localRecord, source, environment); } },