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

Jump to bottom

release: Amplify JS release #13414

Merged
merged 9 commits into from
May 22, 2024
Merged

release: Amplify JS release #13414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24a7647
chore: Merge release into main (#13368)
israx May 13, 2024
09b14ed
chore: update macos version to latest (#13350)
Samaritan1011001 May 14, 2024
47f0f8b
fix(adapter-nextjs): Set-Cookie headers incorrectly set with getServe…
HuiSF May 16, 2024
e2e065f
Merge branch 'main' into temp/release-merge-1715825095
jimblanc May 16, 2024
0532bef
chore: Merge release into main (#13390)
jimblanc May 16, 2024
d7d33da
fix(storage): credentials expires after 1 hour (#13329)
AllanZhengYP May 16, 2024
0b72b32
feat(core): validate if access and id tokens are valid cognito tokens…
ashwinkumar6 May 21, 2024
6a2b992
chore: Update Amplify doc-string comment (#13411)
jimblanc May 22, 2024
82d53fa
Revert "feat(core): validate if access and id tokens are valid cognit…
jimblanc May 22, 2024
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-unused-imports": "^3.0.0",
"expect": "^29.7.0",
"glob": "^10.3.10",
"husky": "^9.0.11",
"jest": "^29.7.0",
Expand Down
35 changes: 27 additions & 8 deletions ...es/adapter-nextjs/__tests__/utils/createCookieStorageAdapterFromNextServerContext.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {

const request = new IncomingMessage(new Socket());
const response = new ServerResponse(request);
const setHeaderSpy = jest.spyOn(response, 'setHeader');
const appendHeaderSpy = jest.spyOn(response, 'appendHeader');

Object.defineProperty(request, 'cookies', {
get() {
Expand All @@ -314,21 +314,30 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
]);

result.set('key3', 'value3');
expect(setHeaderSpy).toHaveBeenCalledWith('Set-Cookie', 'key3=value3;');
expect(appendHeaderSpy).toHaveBeenCalledWith(
'Set-Cookie',
'key3=value3;',
);

result.set('key4', 'value4', {
httpOnly: true,
});
expect(setHeaderSpy).toHaveBeenCalledWith(
expect(appendHeaderSpy).toHaveBeenCalledWith(
'Set-Cookie',
'key4=value4;HttpOnly',
);

result.delete('key3');
expect(setHeaderSpy).toHaveBeenCalledWith(
expect(appendHeaderSpy).toHaveBeenCalledWith(
'Set-Cookie',
`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
);

expect(response.getHeader('Set-Cookie')).toEqual([
'key3=value3;',
'key4=value4;HttpOnly',
'key3=;Expires=Thu, 01 Jan 1970 00:00:00 GMT',
]);
});

it('operates with the underlying cookie store with encoded cookie names', () => {
Expand All @@ -346,7 +355,7 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {

const request = new IncomingMessage(new Socket());
const response = new ServerResponse(request);
const setHeaderSpy = jest.spyOn(response, 'setHeader');
const appendHeaderSpy = jest.spyOn(response, 'appendHeader');

Object.defineProperty(request, 'cookies', {
get() {
Expand All @@ -371,7 +380,10 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
]);

result.set('key3', 'value3');
expect(setHeaderSpy).toHaveBeenCalledWith('Set-Cookie', 'key3=value3;');
expect(appendHeaderSpy).toHaveBeenCalledWith(
'Set-Cookie',
'key3=value3;',
);

result.set('key4', 'value4', {
httpOnly: true,
Expand All @@ -381,16 +393,23 @@ describe('createCookieStorageAdapterFromNextServerContext', () => {
'test@email.com.somethingElse',
);
result.set(encodeURIComponent('test@email.com.somethingElse'), 'value5');
expect(setHeaderSpy).toHaveBeenCalledWith(
expect(appendHeaderSpy).toHaveBeenCalledWith(
'Set-Cookie',
`${encodeURIComponent(encodedCookieName)}=value5;`,
);

result.delete('key3');
expect(setHeaderSpy).toHaveBeenCalledWith(
expect(appendHeaderSpy).toHaveBeenCalledWith(
'Set-Cookie',
`key3=;Expires=${DATE_IN_THE_PAST.toUTCString()}`,
);

expect(response.getHeader('Set-Cookie')).toEqual([
'key3=value3;',
'key4=value4;HttpOnly',
'test%2540email.com.somethingElse=value5;',
'key3=;Expires=Thu, 01 Jan 1970 00:00:00 GMT',
]);
});
});

Expand Down
4 changes: 2 additions & 2 deletions packages/adapter-nextjs/src/utils/createCookieStorageAdapterFromNextServerContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,15 @@ const createCookieStorageAdapterFromGetServerSidePropsContext = (
return allCookies;
},
set(name, value, options) {
response.setHeader(
response.appendHeader(
'Set-Cookie',
`${ensureEncodedForJSCookie(name)}=${value};${
options ? serializeSetCookieOptions(options) : ''
}`,
);
},
delete(name) {
response.setHeader(
response.appendHeader(
'Set-Cookie',
`${ensureEncodedForJSCookie(
name,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/singleton/Amplify.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,6 @@ export class AmplifyClass {
* The `Amplify` utility is used to configure the library.
*
* @remarks
* `Amplify` is responsible for orchestrating cross-category communication within the library.
* `Amplify` orchestrates cross-category communication within the library.
*/
export const Amplify = new AmplifyClass();
40 changes: 25 additions & 15 deletions packages/storage/__tests__/providers/s3/apis/copy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
CopyWithPathInput,
CopyWithPathOutput,
} from '../../../../src/providers/s3/types';
import './testUtils';

jest.mock('../../../../src/providers/s3/utils/client');
jest.mock('@aws-amplify/core', () => ({
Expand Down Expand Up @@ -186,11 +187,14 @@ describe('copy API', () => {
});
expect(key).toEqual(destinationKey);
expect(copyObject).toHaveBeenCalledTimes(1);
expect(copyObject).toHaveBeenCalledWith(copyObjectClientConfig, {
...copyObjectClientBaseParams,
CopySource: expectedSourceKey,
Key: expectedDestinationKey,
});
await expect(copyObject).toBeLastCalledWithConfigAndInput(
copyObjectClientConfig,
{
...copyObjectClientBaseParams,
CopySource: expectedSourceKey,
Key: expectedDestinationKey,
},
);
});
},
);
Expand Down Expand Up @@ -239,11 +243,14 @@ describe('copy API', () => {
});
expect(path).toEqual(expectedDestinationPath);
expect(copyObject).toHaveBeenCalledTimes(1);
expect(copyObject).toHaveBeenCalledWith(copyObjectClientConfig, {
...copyObjectClientBaseParams,
CopySource: `${bucket}/${expectedSourcePath}`,
Key: expectedDestinationPath,
});
await expect(copyObject).toBeLastCalledWithConfigAndInput(
copyObjectClientConfig,
{
...copyObjectClientBaseParams,
CopySource: `${bucket}/${expectedSourcePath}`,
Key: expectedDestinationPath,
},
);
},
);
});
Expand All @@ -269,11 +276,14 @@ describe('copy API', () => {
});
} catch (error: any) {
expect(copyObject).toHaveBeenCalledTimes(1);
expect(copyObject).toHaveBeenCalledWith(copyObjectClientConfig, {
...copyObjectClientBaseParams,
CopySource: `${bucket}/public/${missingSourceKey}`,
Key: `public/${destinationKey}`,
});
await expect(copyObject).toBeLastCalledWithConfigAndInput(
copyObjectClientConfig,
{
...copyObjectClientBaseParams,
CopySource: `${bucket}/public/${missingSourceKey}`,
Key: `public/${destinationKey}`,
},
);
expect(error.$metadata.httpStatusCode).toBe(404);
}
});
Expand Down
5 changes: 3 additions & 2 deletions packages/storage/__tests__/providers/s3/apis/downloadData.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
ItemWithKey,
ItemWithPath,
} from '../../../../src/providers/s3/types/outputs';
import './testUtils';

jest.mock('../../../../src/providers/s3/utils/client');
jest.mock('../../../../src/providers/s3/utils');
Expand Down Expand Up @@ -142,7 +143,7 @@ describe('downloadData with key', () => {
body: 'body',
});
expect(getObject).toHaveBeenCalledTimes(1);
expect(getObject).toHaveBeenCalledWith(
await expect(getObject).toBeLastCalledWithConfigAndInput(
{
credentials,
region,
Expand Down Expand Up @@ -288,7 +289,7 @@ describe('downloadData with path', () => {
body: 'body',
});
expect(getObject).toHaveBeenCalledTimes(1);
expect(getObject).toHaveBeenCalledWith(
await expect(getObject).toBeLastCalledWithConfigAndInput(
{
credentials,
region,
Expand Down
15 changes: 11 additions & 4 deletions packages/storage/__tests__/providers/s3/apis/getProperties.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
GetPropertiesWithPathInput,
GetPropertiesWithPathOutput,
} from '../../../../src/providers/s3/types';
import './testUtils';

jest.mock('../../../../src/providers/s3/utils/client');
jest.mock('@aws-amplify/core', () => ({
Expand Down Expand Up @@ -145,7 +146,10 @@ describe('getProperties with key', () => {
...expectedResult,
});
expect(headObject).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
await expect(headObject).toBeLastCalledWithConfigAndInput(
config,
headObjectOptions,
);
},
);
});
Expand All @@ -166,7 +170,7 @@ describe('getProperties with key', () => {
await getPropertiesWrapper({ key: inputKey });
} catch (error: any) {
expect(headObject).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledWith(
await expect(headObject).toBeLastCalledWithConfigAndInput(
{
credentials,
region: 'region',
Expand Down Expand Up @@ -265,7 +269,10 @@ describe('Happy cases: With path', () => {
...expectedResult,
});
expect(headObject).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
await expect(headObject).toBeLastCalledWithConfigAndInput(
config,
headObjectOptions,
);
},
);
});
Expand All @@ -286,7 +293,7 @@ describe('Happy cases: With path', () => {
await getPropertiesWrapper({ path: inputPath });
} catch (error: any) {
expect(headObject).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledWith(
await expect(headObject).toBeLastCalledWithConfigAndInput(
{
credentials,
region: 'region',
Expand Down
31 changes: 15 additions & 16 deletions packages/storage/__tests__/providers/s3/apis/getUrl.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
GetUrlWithPathInput,
GetUrlWithPathOutput,
} from '../../../../src/providers/s3/types';
import './testUtils';

jest.mock('../../../../src/providers/s3/utils/client');
jest.mock('@aws-amplify/core', () => ({
Expand All @@ -31,8 +32,8 @@ jest.mock('@aws-amplify/core', () => ({

const bucket = 'bucket';
const region = 'region';
const mockFetchAuthSession = Amplify.Auth.fetchAuthSession as jest.Mock;
const mockGetConfig = Amplify.getConfig as jest.Mock;
const mockFetchAuthSession = jest.mocked(Amplify.Auth.fetchAuthSession);
const mockGetConfig = jest.mocked(Amplify.getConfig);
const credentials: AWSCredentials = {
accessKeyId: 'accessKeyId',
sessionToken: 'sessionToken',
Expand Down Expand Up @@ -68,19 +69,15 @@ describe('getUrl test with key', () => {
};
const key = 'key';
beforeEach(() => {
(headObject as jest.MockedFunction<typeof headObject>).mockResolvedValue({
jest.mocked(headObject).mockResolvedValue({
ContentLength: 100,
ContentType: 'text/plain',
ETag: 'etag',
LastModified: new Date('01-01-1980'),
Metadata: { meta: 'value' },
$metadata: {} as any,
});
(
getPresignedGetObjectUrl as jest.MockedFunction<
typeof getPresignedGetObjectUrl
>
).mockResolvedValue(mockURL);
jest.mocked(getPresignedGetObjectUrl).mockResolvedValue(mockURL);
});
afterEach(() => {
jest.clearAllMocks();
Expand Down Expand Up @@ -131,7 +128,10 @@ describe('getUrl test with key', () => {
};
expect(getPresignedGetObjectUrl).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
await expect(headObject).toBeLastCalledWithConfigAndInput(
config,
headObjectOptions,
);
expect({ url, expiresAt }).toEqual(expectedResult);
},
);
Expand Down Expand Up @@ -187,19 +187,15 @@ describe('getUrl test with path', () => {
userAgentValue: expect.any(String),
};
beforeEach(() => {
(headObject as jest.MockedFunction<typeof headObject>).mockResolvedValue({
jest.mocked(headObject).mockResolvedValue({
ContentLength: 100,
ContentType: 'text/plain',
ETag: 'etag',
LastModified: new Date('01-01-1980'),
Metadata: { meta: 'value' },
$metadata: {} as any,
});
(
getPresignedGetObjectUrl as jest.MockedFunction<
typeof getPresignedGetObjectUrl
>
).mockResolvedValue(mockURL);
jest.mocked(getPresignedGetObjectUrl).mockResolvedValue(mockURL);
});
afterEach(() => {
jest.clearAllMocks();
Expand Down Expand Up @@ -229,7 +225,10 @@ describe('getUrl test with path', () => {
});
expect(getPresignedGetObjectUrl).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledTimes(1);
expect(headObject).toHaveBeenCalledWith(config, headObjectOptions);
await expect(headObject).toBeLastCalledWithConfigAndInput(
config,
headObjectOptions,
);
expect({ url, expiresAt }).toEqual({
url: mockURL,
expiresAt: expect.any(Date),
Expand Down
Loading
Loading