Skip to content

Issue 2689 refactor backend api classes#3012

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 13 commits into from
Oct 12, 2020
Merged

Issue 2689 refactor backend api classes #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
07b6a3c
issue 2689 reorganize api classes
Oct 12, 2020
772f4f2
moved google apis into email-provider
Oct 12, 2020
a1ad3f1
moved api and api-error to shared/
Oct 12, 2020
0471d82
created account-server folder
Oct 12, 2020
ca13521
removed unused method
Oct 12, 2020
d24883f
rename Backend -> FlowCryptComApi
Oct 12, 2020
e1bf2a7
account-server -> account-servers
Oct 12, 2020
2ebb512
renamed file
Oct 12, 2020
9b7ad09
make calls through AccountServer class
Oct 12, 2020
8cbcd22
added EnterpriseServer class - unused
Oct 12, 2020
77e5062
add WellKnownHostMeta test call into oidc login
Oct 12, 2020
9168da3
fix rewrap
Oct 12, 2020
daa9f26
ignore expected errs
Oct 12, 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
4 changes: 2 additions & 2 deletions extension/chrome/dev/ci_unit_test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,8 +2,8 @@

'use strict';

import { ApiErr } from '../../js/common/api/error/api-error.js';
import { WellKnownHostMeta } from '../../js/common/api/well-known-host-meta.js';
import { ApiErr } from '../../js/common/api/shared/api-error.js';
import { WellKnownHostMeta } from '../../js/common/api/account-servers/well-known-host-meta.js';

/**
* importing all libs that are tested in ci tests
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/dev/export.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

import { GmailParser, GmailRes } from '../../js/common/api/email-provider/gmail/gmail-parser.js';

import { ApiErr } from '../../js/common/api/error/api-error.js';
import { ApiErr } from '../../js/common/api/shared/api-error.js';
import { Assert } from '../../js/common/assert.js';
import { Att } from '../../js/common/core/att.js';
import { Browser } from '../../js/common/browser/browser.js';
Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/attachment.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,8 +5,8 @@
import { Bm, BrowserMsg } from '../../js/common/browser/browser-msg.js';
import { DecryptErrTypes, MsgUtil } from '../../js/common/core/crypto/pgp/msg-util.js';
import { PromiseCancellation, Url } from '../../js/common/core/common.js';
import { Api } from '../../js/common/api/api.js';
import { ApiErr } from '../../js/common/api/error/api-error.js';
import { Api } from '../../js/common/api/shared/api.js';
import { ApiErr } from '../../js/common/api/shared/api-error.js';
import { Assert } from '../../js/common/assert.js';
import { Att } from '../../js/common/core/att.js';
import { Browser } from '../../js/common/browser/browser.js';
Expand Down
6 changes: 3 additions & 3 deletions extension/chrome/elements/compose-modules/compose-draft-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,8 +4,8 @@

import { Mime, MimeContent, MimeProccesedMsg } from '../../../js/common/core/mime.js';
import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
import { AjaxErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { AjaxErr } from '../../../js/common/api/shared/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Buf } from '../../../js/common/core/buf.js';
import { Catch } from '../../../js/common/platform/catch.js';
Expand All@@ -15,7 +15,7 @@ import { GmailRes } from '../../../js/common/api/email-provider/gmail/gmail-pars
import { MsgBlockParser } from '../../../js/common/core/msg-block-parser.js';
import { NewMsgData } from './compose-types.js';
import { MsgUtil } from '../../../js/common/core/crypto/pgp/msg-util.js';
import { storageLocalGet, storageLocalSet, storageLocalRemove } from '../../../js/common/api/chrome.js';
import { storageLocalGet, storageLocalSet, storageLocalRemove } from '../../../js/common/browser/chrome.js';
import { Ui } from '../../../js/common/browser/ui.js';
import { Url } from '../../../js/common/core/common.js';
import { Xss } from '../../../js/common/platform/xss.js';
Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/compose-modules/compose-err-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,7 @@ import { Browser } from '../../../js/common/browser/browser.js';
import { BrowserEventErrHandler, Ui } from '../../../js/common/browser/ui.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { NewMsgData, SendBtnTexts } from './compose-types.js';
import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { BrowserExtension } from '../../../js/common/browser/browser-extension.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { KeyInfo } from '../../../js/common/core/crypto/key.js';
Expand All@@ -15,7 +15,7 @@ import { Str } from '../../../js/common/core/common.js';
import { Xss } from '../../../js/common/platform/xss.js';
import { ViewModule } from '../../../js/common/view-module.js';
import { ComposeView } from '../compose.js';
import { AjaxErrMsgs } from '../../../js/common/api/error/api-error.js';
import { AjaxErrMsgs } from '../../../js/common/api/shared/api-error.js';

export class ComposerUserError extends Error { }
export class ComposerNotReadyError extends ComposerUserError { }
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose-modules/compose-my-pubkey-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { KeyInfo, KeyUtil } from '../../../js/common/core/crypto/key.js';
import { Lang } from '../../../js/common/lang.js';
Expand Down
7 changes: 4 additions & 3 deletions extension/chrome/elements/compose-modules/compose-pwd-or-pubkey-container-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,15 +2,16 @@

'use strict';

import { Backend } from '../../../js/common/api/backend.js';

import { RecipientStatuses, SendBtnTexts } from './compose-types.js';
import { KeyImportUi } from '../../../js/common/ui/key-import-ui.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { Str } from '../../../js/common/core/common.js';
import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { ViewModule } from '../../../js/common/view-module.js';
import { ComposeView } from '../compose.js';
import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
import { AccountServer } from '../../../js/common/api/account-server.js';

export class ComposePwdOrPubkeyContainerModule extends ViewModule<ComposeView> {

Expand DownExpand Up@@ -90,7 +91,7 @@ export class ComposePwdOrPubkeyContainerModule extends ViewModule<ComposeView> {
expirationTextEl.text(Str.pluralize(this.MSG_EXPIRE_DAYS_DEFAULT, 'day'));
} else {
try {
const response = await Backend.accountGetAndUpdateLocalStore(authInfo);
const response = await AccountServer.accountGetAndUpdateLocalStore(authInfo);
expirationTextEl.text(Str.pluralize(response.account.default_message_expire, 'day'));
} catch (e) {
ApiErr.reportIfSignificant(e);
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose-modules/compose-quote-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

import { Bm, BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { FormatError, MsgUtil, DecryptErrTypes } from '../../../js/common/core/crypto/pgp/msg-util.js';
import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { Buf } from '../../../js/common/core/buf.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { Mime } from '../../../js/common/core/mime.js';
Expand Down
8 changes: 4 additions & 4 deletions extension/chrome/elements/compose-modules/compose-recipients-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,17 @@

'use strict';

import { ChunkedCb, RecipientType } from '../../../js/common/api/api.js';
import { ChunkedCb, RecipientType } from '../../../js/common/api/shared/api.js';
import { Contact } from '../../../js/common/core/crypto/key.js';
import { PUBKEY_LOOKUP_RESULT_FAIL, PUBKEY_LOOKUP_RESULT_WRONG } from './compose-err-module.js';
import { ProviderContactsQuery, Recipients } from '../../../js/common/api/email-provider/email-provider-api.js';
import { RecipientElement, RecipientStatus, RecipientStatuses } from './compose-types.js';
import { Str, Value } from '../../../js/common/core/common.js';
import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { Bm, BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { Google } from '../../../js/common/api/google.js';
import { GoogleAuth } from '../../../js/common/api/google-auth.js';
import { Google } from '../../../js/common/api/email-provider/gmail/google.js';
import { GoogleAuth } from '../../../js/common/api/email-provider/gmail/google-auth.js';
import { Lang } from '../../../js/common/lang.js';
import { Ui } from '../../../js/common/browser/ui.js';
import { Xss } from '../../../js/common/platform/xss.js';
Expand Down
4 changes: 2 additions & 2 deletions extension/chrome/elements/compose-modules/compose-render-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,15 +8,15 @@ import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { KeyImportUi } from '../../../js/common/ui/key-import-ui.js';
import { Lang } from '../../../js/common/lang.js';
import { RecipientType } from '../../../js/common/api/api.js';
import { RecipientType } from '../../../js/common/api/shared/api.js';
import { Recipients } from '../../../js/common/api/email-provider/email-provider-api.js';
import { SendableMsg } from '../../../js/common/api/email-provider/sendable-msg.js';
import { Str } from '../../../js/common/core/common.js';
import { Ui } from '../../../js/common/browser/ui.js';
import { Xss } from '../../../js/common/platform/xss.js';
import { ViewModule } from '../../../js/common/view-module.js';
import { ComposeView } from '../compose.js';
import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { GmailParser } from '../../../js/common/api/email-provider/gmail/gmail-parser.js';
import { KeyStore } from '../../../js/common/platform/store/key-store.js';
import { ContactStore } from '../../../js/common/platform/store/contact-store.js';
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose-modules/compose-send-btn-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { Att } from '../../../js/common/core/att.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Catch } from '../../../js/common/platform/catch.js';
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose-modules/compose-sender-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Settings } from '../../../js/common/settings.js';
import { Xss } from '../../../js/common/platform/xss.js';
Expand Down
7 changes: 4 additions & 3 deletions extension/chrome/elements/compose-modules/compose-storage-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@

import { Bm, BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Contact, KeyInfo, KeyUtil, Key } from '../../../js/common/core/crypto/key.js';
import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { Assert } from '../../../js/common/assert.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { CollectPubkeysResult } from './compose-types.js';
Expand All@@ -16,8 +16,9 @@ import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
import { GlobalStore } from '../../../js/common/platform/store/global-store.js';
import { ContactStore } from '../../../js/common/platform/store/contact-store.js';
import { PassphraseStore } from '../../../js/common/platform/store/passphrase-store.js';
import { Backend } from '../../../js/common/api/backend.js';

import { Settings } from '../../../js/common/settings.js';
import { AccountServer } from '../../../js/common/api/account-server.js';

export class ComposeStorageModule extends ViewModule<ComposeView> {

Expand DownExpand Up@@ -211,7 +212,7 @@ export class ComposeStorageModule extends ViewModule<ComposeView> {
const auth = await AcctStore.authInfo(this.view.acctEmail);
if (auth.uuid) {
try {
await Backend.accountGetAndUpdateLocalStore(auth); // updates storage
await AccountServer.accountGetAndUpdateLocalStore(auth); // updates storage
} catch (e) {
if (ApiErr.isAuthErr(e)) {
Settings.offerToLoginWithPopupShowModalOnErr(
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose-modules/compose-types.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { RecipientType } from '../../../js/common/api/api.js';
import { RecipientType } from '../../../js/common/api/shared/api.js';
import { Recipients } from '../../../js/common/api/email-provider/email-provider-api.js';
import { PubkeyResult } from '../../../js/common/core/crypto/key.js';

Expand Down
13 changes: 8 additions & 5 deletions extension/chrome/elements/compose-modules/formatters/encrypted-mail-msg-formatter.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,13 @@

'use strict';

import { Backend, FcUuidAuth } from '../../../../js/common/api/backend.js';

import { BaseMailFormatter } from './base-mail-formatter.js';
import { ComposerResetBtnTrigger } from '../compose-err-module.js';
import { Mime, SendableMsgBody } from '../../../../js/common/core/mime.js';
import { NewMsgData } from '../compose-types.js';
import { Str, Value } from '../../../../js/common/core/common.js';
import { ApiErr } from '../../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../../js/common/api/shared/api-error.js';
import { Att } from '../../../../js/common/core/att.js';
import { Buf } from '../../../../js/common/core/buf.js';
import { Catch } from '../../../../js/common/platform/catch.js';
Expand All@@ -21,6 +21,9 @@ import { Ui } from '../../../../js/common/browser/ui.js';
import { Xss } from '../../../../js/common/platform/xss.js';
import { ContactStore } from '../../../../js/common/platform/store/contact-store.js';
import { AcctStore } from '../../../../js/common/platform/store/acct-store.js';
import { FlowCryptWebsite } from '../../../../js/common/api/flowcrypt-website.js';
import { AccountServer } from '../../../../js/common/api/account-server.js';
import { FcUuidAuth } from '../../../../js/common/api/account-servers/flowcrypt-com-api.js';

export class EncryptedMsgMailFormatter extends BaseMailFormatter {

Expand All@@ -43,7 +46,7 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
const msgBodyWithReplyToken = await this.getPwdMsgSendableBodyWithOnlineReplyMsgToken(authInfo, newMsg);
const pgpMimeWithAtts = await Mime.encode(msgBodyWithReplyToken, { Subject: newMsg.subject }, await this.view.attsModule.attach.collectAtts());
const { data: pwdEncryptedWithAtts } = await this.encryptDataArmor(Buf.fromUtfStr(pgpMimeWithAtts), newMsg.pwd, []); // encrypted only for pwd, not signed
const { short, admin_code } = await Backend.messageUpload(
const { short, admin_code } = await AccountServer.messageUpload(
authInfo.uuid ? authInfo : undefined,
pwdEncryptedWithAtts,
(p) => this.view.sendBtnModule.renderUploadProgress(p, 'FIRST-HALF'), // still need to upload to Gmail later, this request represents first half of progress
Expand DownExpand Up@@ -97,7 +100,7 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
}
const recipients = Array.prototype.concat.apply([], Object.values(newMsgData.recipients));
try {
const response = await Backend.messageToken(authInfo);
const response = await AccountServer.messageToken(authInfo);
const infoDiv = Ui.e('div', {
'style': 'display: none;',
'class': 'cryptup_reply',
Expand DownExpand Up@@ -165,7 +168,7 @@ export class EncryptedMsgMailFormatter extends BaseMailFormatter {
private formatPwdEncryptedMsgBodyLink = async (short: string): Promise<SendableMsgBody> => {
const storage = await AcctStore.get(this.acctEmail, ['outgoing_language']);
const lang = storage.outgoing_language || 'EN';
const msgUrl = Backend.url('decrypt', short);
const msgUrl = FlowCryptWebsite.url('decrypt', short);
const aStyle = `padding: 2px 6px; background: #2199e8; color: #fff; display: inline-block; text-decoration: none;`;
const a = `<a href="${Xss.escape(msgUrl)}" style="${aStyle}">${Lang.compose.openMsg[lang]}</a>`;
const intro = this.view.S.cached('input_intro').length ? this.view.inputModule.extract('text', 'input_intro') : undefined;
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/compose.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@
'use strict';

import { EmailProviderInterface, ReplyParams } from '../../js/common/api/email-provider/email-provider-api.js';
import { ApiErr } from '../../js/common/api/error/api-error.js';
import { ApiErr } from '../../js/common/api/shared/api-error.js';
import { Assert } from '../../js/common/assert.js';
import { BrowserMsg } from '../../js/common/browser/browser-msg.js';
import { Gmail } from '../../js/common/api/email-provider/gmail/gmail.js';
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/pgp_block_modules/pgp-block-attachmens-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { Api } from '../../../js/common/api/api.js';
import { Api } from '../../../js/common/api/shared/api.js';
import { Att } from '../../../js/common/core/att.js';
import { Browser } from '../../../js/common/browser/browser.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/pgp_block_modules/pgp-block-error-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { Browser } from '../../../js/common/browser/browser.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Catch } from '../../../js/common/platform/catch.js';
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/elements/pgp_block_modules/pgp-block-signature-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { ApiErr } from '../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../js/common/api/shared/api-error.js';
import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
import { Catch } from '../../../js/common/platform/catch.js';
import { PgpBlockView } from '../pgp_block';
Expand Down
9 changes: 5 additions & 4 deletions extension/chrome/elements/subscribe.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,9 @@

'use strict';

import { Backend, FcUuidAuth, PaymentMethod, SubscriptionLevel } from '../../js/common/api/backend.js';
import { Bm, BrowserMsg } from '../../js/common/browser/browser-msg.js';
import { Str, Url } from '../../js/common/core/common.js';
import { ApiErr } from '../../js/common/api/error/api-error.js';
import { ApiErr } from '../../js/common/api/shared/api-error.js';
import { Assert } from '../../js/common/assert.js';
import { Catch } from '../../js/common/platform/catch.js';
import { Lang } from '../../js/common/lang.js';
Expand All@@ -15,6 +14,8 @@ import { View } from '../../js/common/view.js';
import { Xss } from '../../js/common/platform/xss.js';
import { XssSafeFactory } from '../../js/common/xss-safe-factory.js';
import { AcctStore } from '../../js/common/platform/store/acct-store.js';
import { FcUuidAuth, FlowCryptComApi, PaymentMethod, SubscriptionLevel } from '../../js/common/api/account-servers/flowcrypt-com-api.js';
import { AccountServer } from '../../js/common/api/account-server.js';

// todo - this page should be removed, link from settings should point to flowcrypt.com/account once available

Expand DownExpand Up@@ -73,7 +74,7 @@ View.run(class SubscribeView extends View {
private renderSubscriptionDetails = async () => {
this.authInfo = await AcctStore.authInfo(this.acctEmail);
try {
await Backend.accountGetAndUpdateLocalStore(this.authInfo);
await AccountServer.accountGetAndUpdateLocalStore(this.authInfo);
} catch (e) {
if (ApiErr.isAuthErr(e)) {
Xss.sanitizeRender('#content', `Not logged in. ${Ui.retryLink()}`);
Expand DownExpand Up@@ -124,7 +125,7 @@ View.run(class SubscribeView extends View {

private subscribeAndHandleResult = async (chosenProduct: Product, source: string | undefined) => {
try {
const response = await Backend.accountSubscribe(this.authInfo!, chosenProduct.id!, chosenProduct.method!, source);
const response = await FlowCryptComApi.accountSubscribe(this.authInfo!, chosenProduct.id!, chosenProduct.method!, source);
if (response.subscription.level === chosenProduct.level && response.subscription.method === chosenProduct.method) {
await Ui.modal.info('Successfully upgraded to FlowCrypt Advanced.');
this.closeDialog();
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/settings/inbox/inbox-modules/inbox-active-thread-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { FactoryReplyParams, XssSafeFactory } from '../../../../js/common/xss-sa
import { GmailParser, GmailRes } from '../../../../js/common/api/email-provider/gmail/gmail-parser.js';
import { Url, UrlParams } from '../../../../js/common/core/common.js';

import { ApiErr } from '../../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../../js/common/api/shared/api-error.js';
import { BrowserMsgCommonHandlers } from '../../../../js/common/browser/browser-msg-common-handlers.js';
import { Buf } from '../../../../js/common/core/buf.js';
import { Catch } from '../../../../js/common/platform/catch.js';
Expand Down
2 changes: 1 addition & 1 deletion extension/chrome/settings/inbox/inbox-modules/inbox-list-threads-module.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

'use strict';

import { ApiErr } from '../../../../js/common/api/error/api-error.js';
import { ApiErr } from '../../../../js/common/api/shared/api-error.js';
import { Catch } from '../../../../js/common/platform/catch.js';
import { GmailParser } from '../../../../js/common/api/email-provider/gmail/gmail-parser.js';
import { InboxView } from '../inbox.js';
Expand Down
Loading