GithubBackup/cloudflare_temp_email
1
0
Fork 0
mirror of https://github.com/dreamhunter2333/cloudflare_temp_email.git synced 2026-08-30 04:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: address user mail review feedback

Browse Source
This commit is contained in:
dreamhunter2333
2026-08-23 19:41:04 +08:00
parent 54afb10345
commit 46efabd184
11 changed files with 39 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/tests/api/user-send-mail.spec.ts
+4 -25
View File
@@ -64,7 +64,7 @@ test.describe('User send mail API', () => {
userId = user.userId;
const bound = await createTestAddress(request, 'user-send-bound-');
const accessRequest = await createTestAddress(request, 'user-send-access-');
const outsider = await createTestAddress(request, 'user-send-outsider-');
const outsider = await createTestAddress(request, 'usr-outsider-');
addresses.push(bound, accessRequest, outsider);
await bindAddress(request, user.jwt, bound.jwt);
await bindAddress(request, user.jwt, accessRequest.jwt);
@@ -166,12 +166,6 @@ test.describe('User send mail API', () => {
));
expect(outsiderMail).toBeTruthy();
const unauthorizedAddressDeleteRes = await request.delete(
`${WORKER_URL}/user_api/address/${outsider.address_id}/sendbox/${outsiderMail.id}`,
{ headers: { 'x-user-token': user.jwt } },
);
expect(unauthorizedAddressDeleteRes.status()).toBe(400);
const unauthorizedDeleteRes = await request.delete(
`${WORKER_URL}/user_api/sendbox/${outsiderMail.id}`,
{ headers: { 'x-user-token': user.jwt } },
@@ -189,16 +183,6 @@ test.describe('User send mail API', () => {
);
expect((await updatedSettingsRes.json()).send_balance).toBe(9);
const sendboxRes = await request.get(
`${WORKER_URL}/user_api/address/${bound.address_id}/sendbox?limit=20&offset=0`,
{ headers: { 'x-user-token': user.jwt } },
);
expect(sendboxRes.ok()).toBe(true);
const sendbox = await sendboxRes.json();
expect(sendbox.count).toBe(1);
expect(sendbox.results).toHaveLength(1);
expect(JSON.parse(sendbox.results[0].raw).subject).toBe(subject);
const userSendboxRes = await request.get(
`${WORKER_URL}/user_api/sendbox?limit=20&offset=0`,
{ headers: { 'x-user-token': user.jwt } },
@@ -207,6 +191,7 @@ test.describe('User send mail API', () => {
const userSendbox = await userSendboxRes.json();
expect(userSendbox.count).toBe(1);
expect(userSendbox.results).toHaveLength(1);
expect(JSON.parse(userSendbox.results[0].raw).subject).toBe(subject);
const filteredSendboxRes = await request.get(
`${WORKER_URL}/user_api/sendbox?limit=20&offset=0&address=${encodeURIComponent(bound.address)}`,
@@ -222,20 +207,14 @@ test.describe('User send mail API', () => {
expect(outsiderFilterRes.ok()).toBe(true);
expect((await outsiderFilterRes.json()).count).toBe(0);
const outsiderSendboxRes = await request.get(
`${WORKER_URL}/user_api/address/${outsider.address_id}/sendbox?limit=20&offset=0`,
{ headers: { 'x-user-token': user.jwt } },
);
expect(outsiderSendboxRes.status()).toBe(400);
const deleteRes = await request.delete(
`${WORKER_URL}/user_api/sendbox/${sendbox.results[0].id}`,
`${WORKER_URL}/user_api/sendbox/${userSendbox.results[0].id}`,
{ headers: { 'x-user-token': user.jwt } },
);
expect(deleteRes.ok()).toBe(true);
const emptySendboxRes = await request.get(
`${WORKER_URL}/user_api/address/${bound.address_id}/sendbox?limit=20&offset=0`,
`${WORKER_URL}/user_api/sendbox?limit=20&offset=0`,
{ headers: { 'x-user-token': user.jwt } },
);
const emptySendbox = await emptySendboxRes.json();
e2e/tests/browser/user-send-mail.spec.ts
+22 -17
View File
@@ -28,7 +28,7 @@ async function createUser(request: APIRequestContext) {
test.describe('User send mail page', () => {
test('selects a bound address, sends mail, and opens its sent items', async ({ page }) => {
const request = await apiRequest.newContext();
let address: Awaited<ReturnType<typeof createTestAddress>> | undefined;
const addresses: Awaited<ReturnType<typeof createTestAddress>>[] = [];
let userId: number | undefined;
let originalUserSettings: Record<string, unknown> | undefined;
@@ -48,14 +48,18 @@ test.describe('User send mail page', () => {
const user = await createUser(request);
userId = user.userId;
address = await createTestAddress(request, 'user-send-browser-address-');
const bindRes = await request.post(`${WORKER_URL}/user_api/bind_address`, {
headers: {
Authorization: `Bearer ${address.jwt}`,
'x-user-token': user.jwt,
},
});
expect(bindRes.ok()).toBe(true);
const address = await createTestAddress(request, 'usr-browser-');
const secondAddress = await createTestAddress(request, 'usr-second-');
addresses.push(address, secondAddress);
for (const boundAddress of addresses) {
const bindRes = await request.post(`${WORKER_URL}/user_api/bind_address`, {
headers: {
Authorization: `Bearer ${boundAddress.jwt}`,
'x-user-token': user.jwt,
},
});
expect(bindRes.ok()).toBe(true);
}
await page.goto(`${FRONTEND_URL}/en/`);
await page.evaluate((userJwt) => {
@@ -67,7 +71,7 @@ test.describe('User send mail page', () => {
const credentialResponse = page.waitForResponse((response) => (
response.request().method() === 'GET'
&& new URL(response.url()).pathname
=== `/user_api/bind_address_jwt/${address!.address_id}`
=== `/user_api/bind_address_jwt/${address.address_id}`
));
const addressRow = page.getByRole('row').filter({ hasText: address.address });
await addressRow.getByRole('button', { name: 'Address Credential' }).click();
@@ -75,15 +79,16 @@ test.describe('User send mail page', () => {
await expect(page.getByRole('dialog')).toContainText(address.address);
await page.getByRole('button', { name: 'close' }).click();
await page.getByText('Send Mail', { exact: true }).click();
await expect(page.getByRole('heading', { name: 'Compose email', exact: true })).toBeVisible();
const settingsResponse = page.waitForResponse((response) => (
new URL(response.url()).pathname
=== `/user_api/address/${address!.address_id}/settings`
=== `/user_api/address/${address.address_id}/settings`
));
await page.getByText('Send Mail', { exact: true }).click();
await page.locator('.address-picker-select').click();
await page.locator('.n-base-select-option').filter({ hasText: address.address }).click();
expect((await settingsResponse).ok()).toBe(true);
await expect(page.getByRole('heading', { name: 'Compose email', exact: true })).toBeVisible();
await expect(page.locator('.composer-title')).toContainText(address.address);
await expect(page.locator('.address-picker-select')).toContainText(address.address);
const subject = `Browser user send ${Date.now()}`;
@@ -95,7 +100,7 @@ test.describe('User send mail page', () => {
const sendResponse = page.waitForResponse((response) => (
response.request().method() === 'POST'
&& new URL(response.url()).pathname
=== `/user_api/address/${address!.address_id}/send_mail`
=== `/user_api/address/${address.address_id}/send_mail`
));
const sendboxResponse = page.waitForResponse((response) => (
response.request().method() === 'GET'
@@ -109,7 +114,7 @@ test.describe('User send mail page', () => {
await expect(page.getByText(subject, { exact: true })).toBeVisible({ timeout: 15_000 });
} finally {
try {
if (address) await deleteAddress(request, address.jwt);
await Promise.allSettled(addresses.map((address) => deleteAddress(request, address.jwt)));
if (userId !== undefined) {
await request.delete(`${WORKER_URL}/admin/users/${userId}`);
}