Skip to content

Issue 2546 auth settings #2573

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

Merged
tomholub merged 2 commits into from
Feb 23, 2020
Merged

Issue 2546 auth settings #2573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03486f5
prompt user to reconnect google
Feb 23, 2020
c3fd9c8
populate menu before network calls
Feb 23, 2020
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
38 changes: 0 additions & 38 deletions extension/chrome/settings/inbox/inbox-modules/inbox-menu-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@

'use strict';

import { Bm, BrowserMsg } from '../../../../js/common/browser/browser-msg.js';

import { Catch } from '../../../../js/common/platform/catch.js';
import { Dict } from '../../../../js/common/core/common.js';
import { GmailRes } from '../../../../js/common/api/email-provider/gmail/gmail-parser.js';
import { Google } from '../../../../js/common/api/google.js';
import { InboxView } from '../inbox.js';
import { Settings } from '../../../../js/common/settings.js';
import { ViewModule } from '../../../../js/common/view-module.js';
import { Xss } from '../../../../js/common/platform/xss.js';

Expand Down Expand Up @@ -47,13 +44,6 @@ export class InboxMenuModule extends ViewModule<InboxView> {
private setHandlers = () => {
$('.action_open_secure_compose_window').click(this.view.setHandler(() => this.view.injector.openComposeWin()));
$('.menu > .label').click(this.view.setHandler(this.renderFolder));
this.addBrowserMsgListeners();
$('.action_open_settings').click(this.view.setHandler(self => BrowserMsg.send.bg.settings({ acctEmail: this.view.acctEmail })));
$(".action-toggle-accounts-menu").click(this.view.setHandler((target, event) => {
event.stopPropagation();
$("#alt-accounts").toggleClass("active");
}));
$('.action_add_account').click(this.view.setHandlerPrevent('double', async () => await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.view.tabId)));
}

private renderMenuAndLabelStyles = () => {
Expand Down Expand Up @@ -132,32 +122,4 @@ export class InboxMenuModule extends ViewModule<InboxView> {
this.view.redirectToUrl({ acctEmail: this.view.acctEmail });
}

private addBrowserMsgListeners = () => {
BrowserMsg.addListener('add_end_session_btn', () => this.view.injector.insertEndSessionBtn(this.view.acctEmail));
BrowserMsg.addListener('close_new_message', async () => {
$('div.new_message').remove();
});
BrowserMsg.addListener('passphrase_dialog', async ({ longids, type }: Bm.PassphraseDialog) => {
if (!$('#cryptup_dialog').length) {
$('body').append(this.view.factory.dialogPassphrase(longids, type)) // xss-safe-factory;
.click(this.view.setHandler(e => { // click on the area outside the iframe
$('#cryptup_dialog').remove();
}));
}
});
BrowserMsg.addListener('subscribe_dialog', async ({ isAuthErr }: Bm.SubscribeDialog) => {
if (!$('#cryptup_dialog').length) {
$('body').append(this.view.factory.dialogSubscribe(isAuthErr)); // xss-safe-factory
}
});
BrowserMsg.addListener('add_pubkey_dialog', async ({ emails }: Bm.AddPubkeyDialog) => {
if (!$('#cryptup_dialog').length) {
$('body').append(this.view.factory.dialogAddPubkey(emails)); // xss-safe-factory
}
});
BrowserMsg.addListener('close_dialog', async () => {
$('#cryptup_dialog').remove();
});
}

}
46 changes: 43 additions & 3 deletions extension/chrome/settings/inbox/inbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Url, UrlParams } from '../../../js/common/core/common.js';

import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { Assert } from '../../../js/common/assert.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { BrowserMsg, Bm } from '../../../js/common/browser/browser-msg.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { Gmail } from '../../../js/common/api/email-provider/gmail/gmail.js';
import { InboxActiveThreadModule } from './inbox-modules/inbox-active-thread-module.js';
Expand Down Expand Up @@ -66,6 +66,7 @@ export class InboxView extends View {
this.inboxNotificationModule.render();
const emailProvider = this.storage.email_provider || 'gmail';
try {
await Settings.populateAccountsMenu('inbox.htm');
if (emailProvider !== 'gmail') {
$('body').text('Not supported for ' + emailProvider);
} else {
Expand All @@ -76,17 +77,28 @@ export class InboxView extends View {
await this.inboxListThreadsModule.render(this.labelId);
}
}
await Settings.populateAccountsMenu('inbox.htm');
} catch (e) {
ApiErr.reportIfSignificant(e);
await Ui.modal.error(`${ApiErr.eli5(e)}\n\n${String(e)}`);
if (ApiErr.isAuthErr(e) || ApiErr.isAuthPopupNeeded(e)) {
await Ui.modal.warning(`FlowCrypt must be re-connected to your Google account.`);
await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId, this.acctEmail);
} else {
await Ui.modal.error(`${ApiErr.eli5(e)}\n\n${String(e)}`);
}
}
}

public setHandlers = () => {
// BrowserMsg.addPgpListeners(); // todo - re-allow when https://github.com/FlowCrypt/flowcrypt-browser/issues/2560 fixed
BrowserMsg.listen(this.tabId);
Catch.setHandledInterval(this.webmailCommon.addOrRemoveEndSessionBtnIfNeeded, 30000);
$('.action_open_settings').click(this.setHandler(self => BrowserMsg.send.bg.settings({ acctEmail: this.acctEmail })));
$(".action-toggle-accounts-menu").click(this.setHandler((target, event) => {
event.stopPropagation();
$("#alt-accounts").toggleClass("active");
}));
$('.action_add_account').click(this.setHandlerPrevent('double', async () => await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId)));
this.addBrowserMsgListeners();
}

public redirectToUrl = (params: UrlParams) => {
Expand All @@ -104,6 +116,34 @@ export class InboxView extends View {
Xss.sanitizeRender('h1', `${title}`);
}

private addBrowserMsgListeners = () => {
BrowserMsg.addListener('add_end_session_btn', () => this.injector.insertEndSessionBtn(this.acctEmail));
BrowserMsg.addListener('close_new_message', async () => {
$('div.new_message').remove();
});
BrowserMsg.addListener('passphrase_dialog', async ({ longids, type }: Bm.PassphraseDialog) => {
if (!$('#cryptup_dialog').length) {
$('body').append(this.factory.dialogPassphrase(longids, type)) // xss-safe-factory;
.click(this.setHandler(e => { // click on the area outside the iframe
$('#cryptup_dialog').remove();
}));
}
});
BrowserMsg.addListener('subscribe_dialog', async ({ isAuthErr }: Bm.SubscribeDialog) => {
if (!$('#cryptup_dialog').length) {
$('body').append(this.factory.dialogSubscribe(isAuthErr)); // xss-safe-factory
}
});
BrowserMsg.addListener('add_pubkey_dialog', async ({ emails }: Bm.AddPubkeyDialog) => {
if (!$('#cryptup_dialog').length) {
$('body').append(this.factory.dialogAddPubkey(emails)); // xss-safe-factory
}
});
BrowserMsg.addListener('close_dialog', async () => {
$('#cryptup_dialog').remove();
});
}

}

View.run(InboxView);
45 changes: 22 additions & 23 deletions extension/chrome/settings/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ View.run(class SettingsView extends View {
}
$.get('/changelog.txt', data => ($('#status-row #status_v') as any as JQS).featherlight(String(data).replace(/\n/g, '<br>')), 'html');
await this.initialize();
await Assert.abortAndRenderErrOnUnprotectedKey(this.acctEmail, this.tabId!);
await Assert.abortAndRenderErrOnUnprotectedKey(this.acctEmail, this.tabId);
if (this.page) {
Settings.renderSubPage(this.acctEmail, this.tabId!, this.page, this.pageUrlParams);
Settings.renderSubPage(this.acctEmail, this.tabId, this.page, this.pageUrlParams);
}
await Settings.populateAccountsMenu('index.htm');
Ui.setTestState('ready');
}

public setHandlers = () => {
BrowserMsg.addListener('open_page', async ({ page, addUrlText }: Bm.OpenPage) => {
Settings.renderSubPage(this.acctEmail, this.tabId!, page, addUrlText);
Settings.renderSubPage(this.acctEmail, this.tabId, page, addUrlText);
});
BrowserMsg.addListener('redirect', async ({ location }: Bm.Redirect) => {
window.location.href = location;
Expand All @@ -90,12 +90,12 @@ View.run(class SettingsView extends View {
});
BrowserMsg.addListener('add_pubkey_dialog', async ({ emails }: Bm.AddPubkeyDialog) => {
// todo: use #cryptup_dialog just like passphrase_dialog does
const factory = new XssSafeFactory(this.acctEmail!, this.tabId!);
const factory = new XssSafeFactory(this.acctEmail!, this.tabId);
window.open(factory.srcAddPubkeyDialog(emails, 'settings'), '_blank', 'height=680,left=100,menubar=no,status=no,toolbar=no,top=30,width=660');
});
BrowserMsg.addListener('subscribe_dialog', async ({ }: Bm.SubscribeDialog) => {
// todo: use #cryptup_dialog just like passphrase_dialog does
const factory = new XssSafeFactory(this.acctEmail!, this.tabId!);
const factory = new XssSafeFactory(this.acctEmail!, this.tabId);
const subscribeDialogSrc = factory.srcSubscribeDialog('settings_compose', undefined);
window.open(subscribeDialogSrc, '_blank', 'height=650,left=100,menubar=no,status=no,toolbar=no,top=30,width=640,scrollbars=no');
});
Expand All @@ -113,11 +113,11 @@ View.run(class SettingsView extends View {
});
BrowserMsg.addListener('open_google_auth_dialog', async ({ acctEmail, scopes }: Bm.OpenGoogleAuthDialog) => {
$('.featherlight-close').click();
await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId!, acctEmail, scopes);
await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId, acctEmail, scopes);
});
BrowserMsg.addListener('passphrase_dialog', async ({ longids, type }: Bm.PassphraseDialog) => {
if (!$('#cryptup_dialog').length) {
const factory = new XssSafeFactory(this.acctEmail!, this.tabId!);
const factory = new XssSafeFactory(this.acctEmail!, this.tabId);
$('body').append(factory.dialogPassphrase(longids, type)); // xss-safe-factory
}
});
Expand All @@ -127,21 +127,21 @@ View.run(class SettingsView extends View {
BrowserMsg.addListener('close_dialog', async () => {
$('#cryptup_dialog').remove();
});
BrowserMsg.listen(this.tabId!);
BrowserMsg.listen(this.tabId);
$('.show_settings_page').click(this.setHandler(async target => {
const page = $(target).attr('page');
if (page) {
Settings.renderSubPage(this.acctEmail!, this.tabId!, page, $(target).attr('addurltext') || '');
Settings.renderSubPage(this.acctEmail!, this.tabId, page, $(target).attr('addurltext') || '');
} else {
Catch.report(`Unknown target page in element: ${target.outerHTML}`);
}
}));
$('.action_show_encrypted_inbox').click(this.setHandler(target => {
window.location.href = Url.create('/chrome/settings/inbox/inbox.htm', { acctEmail: this.acctEmail! });
}));
$('.action_go_auth_denied').click(this.setHandler(() => Settings.renderSubPage(this.acctEmail!, this.tabId!, '/chrome/settings/modules/auth_denied.htm')));
$('.action_add_account').click(this.setHandlerPrevent('double', async () => await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId!)));
$('.action_google_auth').click(this.setHandlerPrevent('double', async () => await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId!, this.acctEmail)));
$('.action_go_auth_denied').click(this.setHandler(() => Settings.renderSubPage(this.acctEmail!, this.tabId, '/chrome/settings/modules/auth_denied.htm')));
$('.action_add_account').click(this.setHandlerPrevent('double', async () => await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId)));
$('.action_google_auth').click(this.setHandlerPrevent('double', async () => await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId, this.acctEmail)));
// $('.action_microsoft_auth').click(this.setHandlerPrevent('double', function() {
// new_microsoft_account_authentication_prompt(account_email);
// }));
Expand All @@ -159,8 +159,8 @@ View.run(class SettingsView extends View {
$(".ion-ios-arrow-down").toggleClass("up");
$(".add-account").toggleClass("hidden");
}));
$('#status-row #status_google').click(this.setHandler(() => Settings.renderSubPage(this.acctEmail!, this.tabId!, 'modules/debug_api.htm', { which: 'google_account' })));
$('#status-row #status_local_store').click(this.setHandler(() => Settings.renderSubPage(this.acctEmail!, this.tabId!, 'modules/debug_api.htm', { which: 'local_store' })));
$('#status-row #status_google').click(this.setHandler(() => Settings.renderSubPage(this.acctEmail!, this.tabId, 'modules/debug_api.htm', { which: 'google_account' })));
$('#status-row #status_local_store').click(this.setHandler(() => Settings.renderSubPage(this.acctEmail!, this.tabId, 'modules/debug_api.htm', { which: 'local_store' })));
}

private displayOrig = (selector: string) => {
Expand All @@ -176,7 +176,7 @@ View.run(class SettingsView extends View {
if (this.addNewAcct) {
$('.show_if_setup_not_done').css('display', 'initial');
$('.hide_if_setup_not_done').css('display', 'none');
await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId!);
await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId);
} else if (this.acctEmail) {
$('.email-address').text(this.acctEmail);
const storage = await Store.getAcct(this.acctEmail, ['setup_done', 'email_provider', 'picture']);
Expand Down Expand Up @@ -326,12 +326,11 @@ View.run(class SettingsView extends View {
}
}
} catch (e) {
if (ApiErr.isAuthPopupNeeded(e)) {
$('#status-row #status_google').text(`g:?:disconnected`).addClass('bad').attr('title', 'Not connected to Google Account, click to resolve.')
.off().click(this.setHandler(() => Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId!, this.acctEmail)));
} else if (ApiErr.isAuthErr(e)) {
$('#status-row #status_google').text(`g:?:auth`).addClass('bad').attr('title', 'Auth error when checking Google Account, click to resolve.')
.off().click(this.setHandler(() => Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId!, this.acctEmail)));
if (ApiErr.isAuthPopupNeeded(e) || ApiErr.isAuthErr(e)) {
$('#status-row #status_google').text(`g:?:auth`).addClass('bad');
if (await Ui.modal.confirm(`FlowCrypt must be re-connected to your Google account.`)) {
await Settings.newGoogleAcctAuthPromptThenAlertOrForward(this.tabId, this.acctEmail);
}
} else if (ApiErr.isMailOrAcctDisabledOrPolicy(e)) {
await Ui.modal.error(Lang.account.googleAcctDisabledOrPolicy);
} else if (ApiErr.isNetErr(e)) {
Expand Down Expand Up @@ -359,7 +358,7 @@ View.run(class SettingsView extends View {
const subscription = await Store.subscription(acctEmail);
$('#status-row #status_subscription').text(`s:${liveness}:${subscription.active ? 'active' : 'inactive'}-${subscription.method}:${subscription.expire}`);
if (subscription.active) {
const showAcct = () => Settings.renderSubPage(acctEmail, this.tabId!, '/chrome/settings/modules/account.htm');
const showAcct = () => Settings.renderSubPage(acctEmail, this.tabId, '/chrome/settings/modules/account.htm');
$('.logo-row .subscription .level').text('advanced').css('display', 'inline-block').click(this.setHandler(showAcct)).css('cursor', 'pointer');
if (subscription.method === 'trial') {
$('.logo-row .subscription .expire').text(subscription.expire ? ('trial ' + subscription.expire.split(' ')[0]) : 'lifetime').css('display', 'inline-block');
Expand Down Expand Up @@ -400,7 +399,7 @@ View.run(class SettingsView extends View {
Xss.sanitizeAppend('.key_list', html);
$('.action_show_key').click(this.setHandler(target => {
// the UI below only gets rendered when account_email is available
Settings.renderSubPage(this.acctEmail!, this.tabId!, $(target).attr('page')!, $(target).attr('addurltext') || ''); // all such elements do have page attr
Settings.renderSubPage(this.acctEmail!, this.tabId, $(target).attr('page')!, $(target).attr('addurltext') || ''); // all such elements do have page attr
}));
$('.action_remove_key').click(this.setHandler(async target => {
// the UI below only gets rendered when account_email is available
Expand Down