Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Tweak email URL request encoding (#2413)

Leendert de Borsta0005895f449
diff --git a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
index 39b1f46bf..44d93cdcf 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/EmailPreview.tsx
@@ -306,7 +306,7 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) => {
isSpamOk ? (
<a
key={mail.id}
- href={`https://spamok.com/${email.split('@')[0]}/${mail.id}`}
+ href={`https://spamok.com/${encodeURIComponent(email.split('@')[0])}/${mail.id}`}
target="_blank"
rel="noopener noreferrer"
className={`flex justify-between items-center p-2 ps-3 pe-3 rounded cursor-pointer bg-white dark:bg-gray-800 shadow hover:shadow-md transition-all border border-gray-200 dark:border-gray-700 hover:bg-gray-50 dark:hover:bg-gray-700 ${
diff --git a/apps/mobile-app/components/items/details/EmailPreview.tsx b/apps/mobile-app/components/items/details/EmailPreview.tsx
index b1d90e209..196d08d82 100644
--- a/apps/mobile-app/components/items/details/EmailPreview.tsx
+++ b/apps/mobile-app/components/items/details/EmailPreview.tsx
@@ -418,7 +418,7 @@ export const EmailPreview: React.FC<EmailPreviewProps> = ({ email }) : React.Rea
onPress={() => {
if (isSpamOk) {
const emailPrefix = email.split('@')[0];
- Linking.openURL(`https://spamok.com/${emailPrefix}/${mail.id}`);
+ Linking.openURL(`https://spamok.com/${encodeURIComponent(emailPrefix)}/${mail.id}`);
} else {
router.push(`/(tabs)/items/email/${mail.id}`);
}
diff --git a/apps/web/src/components/email/EmailModal.tsx b/apps/web/src/components/email/EmailModal.tsx
index 97ae2c07d..27926d034 100644
--- a/apps/web/src/components/email/EmailModal.tsx
+++ b/apps/web/src/components/email/EmailModal.tsx
@@ -93,7 +93,7 @@ const EmailModal: React.FC<EmailModalProps> = ({ email, onClose, onEmailDeleted,
try {
if (email.isSpamOk) {
- const response = await spamOk.request('DELETE', `Email/${email.toLocal}/${email.id}`);
+ const response = await spamOk.request('DELETE', `Email/${encodeURIComponent(email.toLocal)}/${email.id}`);
if (!response.ok) {
notifications.addErrorMessage(`${t('components.main.email.emailModal.EmailDeleteFailed')}: ${await response.text()}`, true);
return;
diff --git a/apps/web/src/components/email/EmailPreview.tsx b/apps/web/src/components/email/EmailPreview.tsx
index 4adfcd4d7..3b26e51fe 100644
--- a/apps/web/src/components/email/EmailPreview.tsx
+++ b/apps/web/src/components/email/EmailPreview.tsx
@@ -43,7 +43,7 @@ const EmailPreview: React.FC<EmailPreviewProps> = ({ email, onEmailDeleted, item
try {
if (email.isSpamOk) {
- const response = await spamOk.request('DELETE', `Email/${email.toLocal}/${email.id}`);
+ const response = await spamOk.request('DELETE', `Email/${encodeURIComponent(email.toLocal)}/${email.id}`);
if (!response.ok) {
notifications.addErrorMessage(`${t('components.main.email.emailPreview.EmailDeleteFailed')}: ${await response.text()}`, true);
return;
diff --git a/core/client/src/email/SpamOkClient.ts b/core/client/src/email/SpamOkClient.ts
index 0eaa5ca2d..65947a0ba 100644
--- a/core/client/src/email/SpamOkClient.ts
+++ b/core/client/src/email/SpamOkClient.ts
@@ -43,7 +43,7 @@ export class SpamOkClient {
* @param emailPrefix - the local part of the address
*/
public async getMailbox(emailPrefix: string): Promise<MailboxEmail[] | null> {
- const response = await this.request('GET', `EmailBox/${emailPrefix}`);
+ const response = await this.request('GET', `EmailBox/${encodeURIComponent(emailPrefix)}`);
if (!response.ok) {
return null;
}
@@ -57,7 +57,7 @@ export class SpamOkClient {
* @param emailId - the email id
*/
public async getEmail(emailPrefix: string, emailId: number): Promise<SpamOkEmail | null> {
- const response = await this.request('GET', `Email/${emailPrefix}/${emailId}`);
+ const response = await this.request('GET', `Email/${encodeURIComponent(emailPrefix)}/${emailId}`);
return response.ok ? await response.json() as SpamOkEmail : null;
}