Issues #3509 #3374 deprecate subscribe (#3516)

* Remove 5mb limit from license

Due to my lack of legal expertise, it may not be okay to just edit the license in this way. I'll include other changes related to the 5mb limit in this PR.

* Update both free and pro versions to have 25mb limit

* Remove 5mb limit notice (leave only 25mb notice)

* remove unused imports

* issue 3509 remove subscription ui

* removed free trial

* remove trial from tests

* removed account tests

* clean up api calls

* clean up subscription and upgrade

* removed active, method, expire

Co-authored-by: Alex Vazquez <[email protected]>
Co-authored-by: Tom J <[email protected]>

Author: 3 people

LICENSE

@@ -6,7 +6,6 @@ Licensor: FlowCrypt a. s.
 Software: FlowCrypt PGP browser extension. The Software is © 2016-present FlowCrypt a. s.
 
 Use Limitation: This software is free to use with the following limitations:
- - Size of any sent email message including attachments cannot exceed 5MB.
  - Password encrypted messages and attachments have to expire in 7 days.
  - Messages, attachments or files can only be transferred through used email provider or through services provided by Licensor. Never through 3rd party or custom services.
  - Plain-text portion of password encrypted messages must only include a link to a page on flowcrypt.com domain. Recipient cannot be directed to any other place or means of decrypting password encrypted messages.

extension/chrome/elements/compose-modules/compose-attachments-module.ts

@@ -3,12 +3,9 @@
 'use strict';
 
 import { AttachmentLimits, AttachmentUI } from '../../../js/common/ui/attachment-ui.js';
-import { BrowserMsg } from '../../../js/common/browser/browser-msg.js';
-import { OrgRules } from '../../../js/common/org-rules.js';
 import { Ui } from '../../../js/common/browser/ui.js';
 import { ViewModule } from '../../../js/common/view-module.js';
 import { ComposeView } from '../compose.js';
-import { AcctStore } from '../../../js/common/platform/store/acct-store.js';
 
 export class ComposeAttachmentsModule extends ViewModule<ComposeView> {
 
@@ -30,46 +27,15 @@ export class ComposeAttachmentsModule extends ViewModule<ComposeView> {
   }
 
   private getMaxAttachmentSizeAndOversizeNotice = async (): Promise<AttachmentLimits> => {
-    const subscription = await AcctStore.getSubscription(this.view.acctEmail);
-    if (!subscription.active && !OrgRules.isPublicEmailProviderDomain(this.view.senderModule.getSender())) {
-      return {
-        sizeMb: 5,
-        size: 5 * 1024 * 1024,
-        count: 10,
-        oversize: async () => {
-          let getAdvanced = 'The files are over 5 MB. Advanced users can send files up to 25 MB.';
-          if (!subscription.method) {
-            getAdvanced += '\n\nTry it free for 30 days.';
-          } else if (subscription.method === 'trial') {
-            getAdvanced += '\n\nYour trial has expired, please consider supporting our efforts by upgrading.';
-          } else if (subscription.method === 'group') {
-            getAdvanced += '\n\nGroup billing is due for renewal. Please check with your leadership.';
-          } else if (subscription.method === 'stripe') {
-            getAdvanced += '\n\nPlease renew your subscription to continue sending large files.';
-          } else {
-            getAdvanced += '\n\nClick ok to see subscribe options.';
-          }
-          if (subscription.method === 'group') {
-            await Ui.modal.info(getAdvanced);
-          } else {
-            if (await Ui.modal.confirm(getAdvanced)) {
-              BrowserMsg.send.subscribeDialog(this.view.parentTabId, {});
-            }
-          }
-          return;
-        },
-      };
-    } else {
-      const sizeMb = 25;
-      return {
-        sizeMb,
-        size: sizeMb * 1024 * 1024,
-        count: 10,
-        oversize: async (combinedSize: number) => {
-          await Ui.modal.warning('Combined attachment size is limited to 25 MB. The last file brings it to ' + Math.ceil(combinedSize / (1024 * 1024)) + ' MB.');
-        },
-      };
-    }
+    const sizeMb = 25;
+    return {
+      sizeMb,
+      size: sizeMb * 1024 * 1024,
+      count: 10,
+      oversize: async (combinedSize: number) => {
+        await Ui.modal.warning('Combined attachment size is limited to 25 MB. The last file brings it to ' + Math.ceil(combinedSize / (1024 * 1024)) + ' MB.');
+      },
+    };
   }
 
 }

extension/chrome/elements/subscribe.htm

@@ -16,7 +16,7 @@ export class InboxNotificationModule extends ViewModule<InboxView> {
 
   constructor(view: InboxView) {
     super(view);
-    this.notifications = new Notifications(view.tabId);
+    this.notifications = new Notifications();
   }
 
   public render = () => {

extension/chrome/elements/subscribe.ts

@@ -131,11 +131,6 @@ export class InboxView extends View {
           }));
       }
     });
-    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

extension/chrome/settings/inbox/inbox-modules/inbox-notification-module.ts

@@ -27,7 +27,6 @@
           <span class="subscription">
             <a class="level green_label short" href="https://flowcrypt.com/account">free forever</a>
             <span class="expire"></span>
-            <button class="upgrade green_label short show_settings_page" page="/chrome/elements/subscribe.htm" addurltext="&placement=settings">upgrade</button>
           </span>
         </div>