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

#5706 Update text for keys expiration date popup #5712

Merged
merged 4 commits into from
May 14, 2024
Merged

#5706 Update text for keys expiration date popup #5712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dddce9b
fix: update text for keys expiration date popup
ioanmo226 May 14, 2024
fae478f
Merge branch 'master' into 5706-update-text-for-keys-expiration-date-…
ioanmo226 May 14, 2024
6a1813a
fix: test
ioanmo226 May 14, 2024
12345c3
fix: pr reviews
ioanmo226 May 14, 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
2 changes: 1 addition & 1 deletion extension/js/content_scripts/webmail/setup-webmail-content-script.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ export const contentScriptSetupIfVacant = async (webmailSpecific: WebmailSpecifi
}
warningMsg =
expirationText +
`To receive the latest keys, please ensure that you can connect to your corporate network either through VPN or in person and reload Gmail.<br/>` +
`To receive the latest keys, please ensure that you are connected to your corporate network (or through VPN) and have entered your FlowCrypt passphrase. Then reload Gmail.<br/>` +
`If this notification still shows after that, please contact your Help Desk.`;
} else {
let expirationText: string;
Expand Down
4 changes: 2 additions & 2 deletions test/source/tests/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ AN8G3r5Htj8olot+jm9mIa5XLXWzMNUZgg==
const gmailPage = await openMockGmailPage(t, browser, acctEmail);
// Check if notification presents
let warningMsg =
'Your local keys are expired.\nTo receive the latest keys, please ensure that you can connect to your corporate network either through VPN or in person and reload Gmail.\nIf this notification still shows after that, please contact your Help Desk.';
'Your local keys are expired.\nTo receive the latest keys, please ensure that you are connected to your corporate network (or through VPN) and have entered your FlowCrypt passphrase. Then reload Gmail.\nIf this notification still shows after that, please contact your Help Desk.';
await gmailPage.waitForContent('@webmail-notification-notify_expiring_keys', warningMsg);
// Generate expired key(positive expiration) and check if it shows correct note
const key = await opgp.generateKey({
Expand All @@ -875,7 +875,7 @@ AN8G3r5Htj8olot+jm9mIa5XLXWzMNUZgg==
await Util.sleep(1);
// Check if notification presents
warningMsg =
'Your local keys expire in 18 days.\nTo receive the latest keys, please ensure that you can connect to your corporate network either through VPN or in person and reload Gmail.\nIf this notification still shows after that, please contact your Help Desk.';
'Your local keys expire in 18 days.\nTo receive the latest keys, please ensure that you are connected to your corporate network (or through VPN) and have entered your FlowCrypt passphrase. Then reload Gmail.\nIf this notification still shows after that, please contact your Help Desk.';
await gmailPage.waitForContent('@webmail-notification-notify_expiring_keys', warningMsg);
// Check if warning message still presents when EKM returns error
t.context.mockApi!.configProvider.config.ekm!.returnError = new HttpClientErr('RequestTimeout', Status.BAD_REQUEST);
Expand Down
Loading