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

[SDK-2330] New tokens should be applied to existing session #307

Merged
merged 3 commits into from
Feb 19, 2021
Merged

[SDK-2330] New tokens should be applied to existing session #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30a7f4f
New tokens should be applied to existing session
adamjmcgrath Feb 18, 2021
ca1948e
Merge branch 'main' into profile-preserve-session
Widcket Feb 18, 2021
48e9a7e
Update tests/handlers/profile.test.ts
adamjmcgrath Feb 19, 2021
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
17 changes: 6 additions & 11 deletions src/session/get-access-token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { NextApiRequest, NextApiResponse } from 'next';
import { ClientFactory } from '../auth0-session';
import { AccessTokenError } from '../utils/errors';
import { intersect, match } from '../utils/array';
import { SessionCache, fromTokenSet, fromJson } from '../session';
import { SessionCache, fromTokenSet } from '../session';
import { NextConfig } from '../config';

/**
Expand Down Expand Up @@ -114,16 +114,11 @@ export default function accessTokenFactory(

// Update the session.
const newSession = fromTokenSet(tokenSet, config);
sessionCache.set(
req,
res,
fromJson({
...session,
...newSession,
refreshToken: newSession.refreshToken || session.refreshToken,
user: { ...session.user, ...newSession.user }
})
);
Object.assign(session, {
...newSession,
refreshToken: newSession.refreshToken || session.refreshToken,
user: { ...session.user, ...newSession.user }
});
Comment on lines +117 to +121
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this get saved in the session cache?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep - the session is mutable and whatever is in it at the end of the request chain will get persisted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The second request to /api/session in the test should also verify this https://github.com/auth0/nextjs-auth0/pull/307/files#diff-43549841cd306e45cf537adad769f7fc683abaf46a9eab1146d958238493af2aR112-R113


// Return the new access token.
return {
Expand Down
6 changes: 4 additions & 2 deletions tests/fixtures/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export type SetupOptions = {
getAccessTokenOptions?: AccessTokenRequest;
discoveryOptions?: object;
userInfoPayload?: object;
userInfoToken?: string;
};

export const setup = async (
Expand All @@ -42,13 +43,14 @@ export const setup = async (
withPageAuthRequiredOptions,
getAccessTokenOptions,
discoveryOptions,
userInfoPayload = {}
userInfoPayload = {},
userInfoToken = 'eyJz93a...k4laUWw'
}: SetupOptions = {}
): Promise<string> => {
discovery(config, discoveryOptions);
jwksEndpoint(config, jwks);
codeExchange(config, makeIdToken({ iss: 'https://acme.auth0.local/', ...idTokenClaims }));
userInfo(config, 'eyJz93a...k4laUWw', userInfoPayload);
userInfo(config, userInfoToken, userInfoPayload);
const {
handleAuth,
handleCallback,
Expand Down
26 changes: 24 additions & 2 deletions tests/handlers/profile.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import nock from 'nock';
import { withoutApi } from '../fixtures/default-settings';
import { userInfo } from '../fixtures/oidc-nocks';
import { withApi, withoutApi } from '../fixtures/default-settings';
import { refreshTokenRotationExchange, userInfo } from '../fixtures/oidc-nocks';
import { get } from '../auth0-session/fixtures/helpers';
import { setup, teardown, login } from '../fixtures/setup';
import { Session, AfterCallback } from '../../src';
Expand Down Expand Up @@ -91,6 +91,28 @@ describe('profile handler', () => {
);
});

test('should refetch the user and preserve new tokens', async () => {
const afterCallback: AfterCallback = (_req, _res, session: Session): Session => {
session.accessTokenExpiresAt = -60;
return session;
};
const baseUrl = await setup(withApi, {
profileOptions: { refetch: true },
userInfoPayload: { foo: 'bar' },
callbackOptions: {
afterCallback
},
userInfoToken: 'new-access-token'
});
refreshTokenRotationExchange(withApi, 'GEbRxBN...edjnXbL', {}, 'new-access-token', 'new-refresh-token');
const cookieJar = await login(baseUrl);
const profile = await get(baseUrl, '/api/auth/me', { cookieJar });
expect(profile).toMatchObject({ foo: 'bar' });
const session = await get(baseUrl, '/api/session', { cookieJar });
expect(session.accessToken).toEqual('new-access-token');
expect(session.refreshToken).toEqual('new-refresh-token');
});

test('should update the session in the afterRefetch hook', async () => {
const baseUrl = await setup(withoutApi, {
profileOptions: {
Expand Down