fix: fixed API issue with free plan, bumped deps

Author: niftylettuce

app/controllers/web/my-account/create-domain.js

@@ -81,23 +81,38 @@ async function createDomain(ctx, next) {
 
   // if the user was not on a valid plan then redirect them to billing post creation
   if (isSANB(ctx.request.body.plan)) {
-    if (ctx.request.body.plan === 'enhanced_protection') {
-      if (['enhanced_protection', 'team'].includes(ctx.state.user.plan))
-        plan = 'enhanced_protection';
-      else
-        redirectTo = ctx.state.l(
-          `/my-account/domains/${name}/billing?plan=enhanced_protection`
-        );
-    } else if (ctx.request.body.plan === 'team') {
-      if (ctx.state.user.plan === 'team') {
-        plan = 'team';
-      } else {
-        if (ctx.state.user.plan === 'enhanced_protection')
+    switch (ctx.request.body.plan) {
+      case 'enhanced_protection': {
+        if (['enhanced_protection', 'team'].includes(ctx.state.user.plan))
           plan = 'enhanced_protection';
-        redirectTo = ctx.state.l(
-          `/my-account/domains/${name}/billing?plan=team`
-        );
+        else
+          redirectTo = ctx.state.l(
+            `/my-account/domains/${name}/billing?plan=enhanced_protection`
+          );
+
+        break;
+      }
+
+      case 'team': {
+        if (ctx.state.user.plan === 'team') {
+          plan = 'team';
+        } else {
+          if (ctx.state.user.plan === 'enhanced_protection')
+            plan = 'enhanced_protection';
+          redirectTo = ctx.state.l(
+            `/my-account/domains/${name}/billing?plan=team`
+          );
+        }
+
+        break;
+      }
+
+      case 'free': {
+        plan = 'free';
+
+        break;
       }
+      // No default
     }
   }
 

app/views/_footer.pug

@@ -52,7 +52,7 @@ footer.mt-auto
                 height=50,
                 alt="Go to top"
               )
-            small.d-block.text-muted.mt-3!= '© Niftylettuce, LLC.'
+            small.d-block.text-muted.mt-3!= "© Niftylettuce, LLC."
         .flex-wrap.flex-fill
           h1.h5.mb-2= t("Resources")
           ul.list-unstyled.mb-0

app/views/_nav.pug

@@ -212,8 +212,8 @@ nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.fixed-top.border-light.border-bo
 if ctx.pathWithoutLocale === '/'
   h1.h6.py-3.px-3.mb-0.text-center.alert.alert-success.border-top-0.border-left-0.border-right-0.rounded-0
     if !isBot(ctx.get('User-Agent'))
-      = emoji('trophy')
-      = ' '
+      = emoji("trophy")
+      = " "
     .d-none.d-md-inline
       != t("#1 Ranked Forwarding Service – Since 2017")
     small.d-md-none

app/views/_pagination.pug

@@ -9,9 +9,9 @@ mixin paginate(tableSelector)
               data-table=tableSelector,
               data-page=1,
               aria-label=t("First Page"),
-              data-toggle='tooltip',
-              data-placement='bottom',
-              title=t("First Page"),
+              data-toggle="tooltip",
+              data-placement="bottom",
+              title=t("First Page")
             )
               span(aria-hidden="true")
                 i.fa.fa-step-backward
@@ -43,18 +43,26 @@ mixin paginate(tableSelector)
               data-table=tableSelector,
               data-page=pageCount,
               aria-label=t("Last Page"),
-              data-toggle='tooltip',
-              data-placement='bottom',
+              data-toggle="tooltip",
+              data-placement="bottom",
               title=t("Last Page")
             )
               span(aria-hidden="true")
                 i.fa.fa-step-forward
               span.sr-only= t("Last Page")
     .dropdown.text-center
-      button#pagination-menu-link.btn.btn-outline-secondary.btn-sm.dropdown-toggle(type='button', data-toggle='dropdown', aria-haspopup='true', aria-expanded='false')
-        strong= t('Results per page:')
-        = ' '
+      button#pagination-menu-link.btn.btn-outline-secondary.btn-sm.dropdown-toggle(
+        type="button",
+        data-toggle="dropdown",
+        aria-haspopup="true",
+        aria-expanded="false"
+      )
+        strong= t("Results per page:")
+        = " "
         = t(ctx.query.limit.toString())
-      .dropdown-menu(aria-labelledby='pagination-menu-link')
+      .dropdown-menu(aria-labelledby="pagination-menu-link")
         each limit in [10, 25, 50]
-          a.dropdown-item(class=ctx.query.limit === limit ? 'active' : '', href=paginate.href({ page: 1, limit }))= t(limit.toString())
+          a.dropdown-item(
+            class=ctx.query.limit === limit ? "active" : "",
+            href=paginate.href({ page: 1, limit })
+          )= t(limit.toString())

app/views/home.pug

@@ -69,17 +69,20 @@ block body
               != t("Unlimited Email Forwarding")
           p.lead.mb-3.d-block
             != t("We're <span class='font-weight-bold'>the only</span> service that <mark>respects your privacy</mark> and <mark>never stores</mark> your emails.")
-          form.ajax-form.d-md-flex.align-items-md-center.justify-content-md-center(action=ctx.path, method='POST')
+          form.ajax-form.d-md-flex.align-items-md-center.justify-content-md-center(
+            action=ctx.path,
+            method="POST"
+          )
             input(type="hidden", name="_csrf", value=ctx.csrf)
-            input(type='hidden', name='enhanced_protection', value='true')
-            input(type='hidden', name="create_domain", value='true')
-            input(type='hidden', name="create_account", value='true')
+            input(type="hidden", name="enhanced_protection", value="true")
+            input(type="hidden", name="create_domain", value="true")
+            input(type="hidden", name="create_account", value="true")
             .form-group.floating-label.mb-md-0
               input.form-control.form-control-lg(
-                type='text',
-                name='domain',
+                type="text",
+                name="domain",
                 required,
-                placeholder='your-domain.com'
+                placeholder="your-domain.com"
               )
               label(for="input-onboard-domain")= t("Enter your domain")
             i.fa.fa-forward.d-none.d-md-inline.mx-2
@@ -97,9 +100,9 @@ block body
               = t("Get Started")
             button.btn.btn-success.btn-lg.btn-block.d-md-none(type="submit")
               = t("Get Started")
-              = ' '
+              = " "
               i.fa.fa-angle-double-right
-          small.d-block.mt-3.text-muted.font-weight-bold!= t('Forward anything @your-domain.com to your email &ndash; and create individual aliases too!')
+          small.d-block.mt-3.text-muted.font-weight-bold!= t("Forward anything @your-domain.com to your email &ndash; and create individual aliases too!")
           a.text-decoration-none.mt-5.d-block.d-md-none.text-monospace.text-uppercase.text-dark(
             href="#learn-more"
           )
@@ -183,7 +186,7 @@ block body
               width=50,
               height=50,
               src=manifest("img/testimonials/dhh.jpg"),
-              alt='dhh'
+              alt="dhh"
             )
             .d-flex.flex-column.ml-2.font-weight-bold.text-dark
               div
@@ -193,7 +196,7 @@ block body
                     src=manifest("img/testimonials/twitter-verified.svg"),
                     width=20,
                     height=20,
-                    alt='Verified'
+                    alt="Verified"
                   )
                 .small.text-muted @dhh
             .ml-auto
@@ -220,7 +223,7 @@ block body
               width=50,
               height=50,
               src=manifest("img/testimonials/abhinemani.jpg"),
-              alt='abhinemani'
+              alt="abhinemani"
             )
             .d-flex.flex-column.ml-2.font-weight-bold.text-dark
               div
@@ -230,7 +233,7 @@ block body
                     src=manifest("img/testimonials/twitter-verified.svg"),
                     width=20,
                     height=20,
-                    alt='Verified'
+                    alt="Verified"
                   )
                 .small.text-muted @abhinemani
             .ml-auto
@@ -254,7 +257,7 @@ block body
               width=50,
               height=50,
               src=manifest("img/testimonials/andrewe.jpg"),
-              alt='andrewe'
+              alt="andrewe"
             )
             .d-flex.flex-column.ml-2.font-weight-bold.text-dark
               div
@@ -264,7 +267,7 @@ block body
                     src=manifest("img/testimonials/twitter-verified.svg"),
                     width=20,
                     height=20,
-                    alt='Verified'
+                    alt="Verified"
                   )
                 .small.text-muted @andrewe
             .ml-auto
@@ -286,7 +289,7 @@ block body
               width=50,
               height=50,
               src=manifest("img/testimonials/stigi.jpg"),
-              alt='stigi'
+              alt="stigi"
             )
             .d-flex.flex-column.ml-2.font-weight-bold.text-dark
               div
@@ -313,7 +316,7 @@ block body
               width=50,
               height=50,
               src=manifest("img/testimonials/andregce.jpg"),
-              alt='andregce'
+              alt="andregce"
             )
             .d-flex.flex-column.ml-2.font-weight-bold.text-dark
               div
@@ -338,7 +341,7 @@ block body
               width=50,
               height=50,
               src=manifest("img/testimonials/philcockfield.jpg"),
-              alt='philcockfield'
+              alt="philcockfield"
             )
             .d-flex.flex-column.ml-2.font-weight-bold.text-dark
               div
@@ -483,7 +486,7 @@ block body
           = " "
           != t('We\'re the <strong class="text-uppercase font-weight-bold border-bottom">only</strong> service that <strong class="font-weight-bold">never stores nor writes to disk</strong> any emails &ndash; it\'s all done in-memory.')
           = " "
-          != t('Made by an open-source and privacy advocate.')
+          != t("Made by an open-source and privacy advocate.")
         a.btn.btn-outline-light.btn-lg.mb-md-5(
           href="https://github.com/forwardemail",
           target="_blank",

emails/_footer.pug

@@ -14,4 +14,4 @@ footer.py-3.mt-3
           li.px-1.d-inline: small: a.text-muted(href=`${config.urls.web}/about`)= t("About")
           li.px-1.d-inline: small: a.text-muted(href=`${config.urls.web}/privacy`)= t("Privacy")
           li.px-1.d-inline: small: a.text-muted(href=`${config.urls.web}/terms`)= t("Terms")
-        p: small.text-muted!= '© Niftylettuce, LLC.'
+        p: small.text-muted!= "© Niftylettuce, LLC."

package.json

@@ -46,18 +46,18 @@
     "@ladjs/shared-config": "6.0.0",
     "@ladjs/web": "11.1.1",
     "@paypal/checkout-server-sdk": "1.0.3",
-    "@primer/css": "19.5.1",
+    "@primer/css": "19.6.0",
     "@sidoshi/random-string": "1.0.0",
     "@tkrotoff/bootstrap-floating-label": "0.8",
     "accounting": "0.4.1",
     "apexcharts": "3.33.2",
     "array-join-conjunction": "1.0.0",
-    "aws-sdk": "2.1092.0",
+    "aws-sdk": "2.1096.0",
     "axe": "8.1.2",
     "basic-auth": "2.0.1",
     "boolean": "3.2.0",
     "bootstrap": "4.6.0",
-    "bree": "8.0.1",
+    "bree": "8.0.2",
     "bson-objectid": "2.0.3",
     "cabin": "9.1.2",
     "capitalize": "2.0.4",
@@ -68,12 +68,12 @@
     "crypto-random-string": "3",
     "custom-fonts-in-emails": "4.0.2",
     "dashify": "2.0.0",
-    "dayjs": "1.10.8",
+    "dayjs": "1.11.0",
     "dayjs-with-plugins": "0.0.4",
     "dedent": "0.7.0",
     "delay": "5.0.0",
     "email-addresses": "5.0.0",
-    "email-templates": "8.0.10",
+    "email-templates": "9.0.0",
     "fast-safe-stringify": "2.1.1",
     "forward-email": "8.3.0",
     "gemoji": "6",
@@ -102,8 +102,8 @@
     "markdown-it-highlightjs": "3.6.0",
     "markdown-it-task-checkbox": "1.0.6",
     "memoizee": "0.4.15",
-    "mongodb-memory-server": "8.4.0",
-    "mongoose": "6.2.6",
+    "mongodb-memory-server": "8.4.1",
+    "mongoose": "6.2.7",
     "mongoose-common-plugin": "2.0.3",
     "mongoose-omit-common-fields": "0.0.6",
     "mongoose-unique-validator": "2.0.3",
@@ -119,7 +119,7 @@
     "passport-local-mongoose": "6.2.2",
     "paypal-rest-sdk": "1.8.1",
     "pify": "5.0.0",
-    "pino": "7.8.1",
+    "pino": "7.9.1",
     "pluralize": "8.0.0",
     "popper.js": "1.16.1",
     "prepare-stack-trace": "0.0.4",
@@ -135,7 +135,7 @@
     "speakingurl": "14.0.1",
     "split-lines": "2",
     "stacktrace-js": "2.0.2",
-    "stripe": "8.209.0",
+    "stripe": "8.210.0",
     "striptags": "3.2.0",
     "superagent": "7.1.1",
     "sweetalert2": "8",
@@ -149,21 +149,21 @@
   },
   "devDependencies": {
     "@babel/cli": "7.17.6",
-    "@babel/core": "7.17.5",
+    "@babel/core": "7.17.8",
     "@babel/polyfill": "7.12.1",
     "@babel/preset-env": "7.16.11",
-    "@commitlint/cli": "16.2.1",
+    "@commitlint/cli": "16.2.3",
     "@commitlint/config-conventional": "16.2.1",
     "@ladjs/browserslist-config": "0.0.1",
     "@ladjs/gulp-envify": "2.0.1",
     "@ladjs/pug-lint-config-lad": "0.1.1",
-    "@prettier/plugin-pug": "1.19.2",
+    "@prettier/plugin-pug": "1.19.3",
     "ava": "4.1.0",
     "babel-eslint": "10.1.0",
     "browserify": "17.0.0",
     "bundle-collapser": "1.4.0",
     "codecov": "3.8.3",
-    "cssnano": "5.1.3",
+    "cssnano": "5.1.4",
     "del": "6.0.0",
     "eslint": "8.11.0",
     "eslint-config-xo-lass": "1.0.6",
@@ -196,7 +196,7 @@
     "gulp-xo": "0.25.0",
     "husky": "7.0.4",
     "imagemin-pngquant": "9.0.2",
-    "lint-staged": "12.3.5",
+    "lint-staged": "12.3.7",
     "make-dir": "3.1.0",
     "ms": "2.1.3",
     "node-sass": "7.0.1",
@@ -206,21 +206,21 @@
     "nps-utils": "1.7.0",
     "nyc": "15.1.0",
     "parse-git-config": "3.0.0",
-    "postcss": "8.4.8",
+    "postcss": "8.4.12",
     "postcss-font-magician": "3.0.0",
-    "postcss-preset-env": "7.4.2",
+    "postcss-preset-env": "7.4.3",
     "postcss-reporter": "7.0.5",
     "postcss-scss": "4.0.3",
-    "prettier": "2.5.1",
+    "prettier": "2.6.0",
     "pug-lint": "2.6.0",
     "rc": "1.2.8",
     "remark-cli": "10.0.1",
     "remark-preset-github": "4.0.1",
     "sass": "1.49.9",
     "sinon": "13.0.1",
-    "stylelint": "14.5.3",
-    "stylelint-config-recommended-scss": "5.0.2",
-    "stylelint-scss": "4.1.0",
+    "stylelint": "14.6.0",
+    "stylelint-config-recommended-scss": "6.0.0",
+    "stylelint-scss": "4.2.0",
     "supertest": "6.2.2",
     "through2": "4.0.2",
     "xo": "0.48.0"