diff --git a/.dockerignore b/.dockerignore index b2d771a6e8b..cc230a949b8 100644 --- a/.dockerignore +++ b/.dockerignore @@ -20,7 +20,6 @@ packages/fxa-dev-launcher packages/fxa-content-server/dist packages/fxa-settings/build/dev packages/123done -packages/fortress packages/functional-tests # Ignore generated credentials from google-github-actions/auth diff --git a/_scripts/ports.txt b/_scripts/ports.txt index 49fc2c83505..3e6f69445cd 100644 --- a/_scripts/ports.txt +++ b/_scripts/ports.txt @@ -8,7 +8,6 @@ 9000 # auth-server key server 3030 # content-server 1111 # profile-server -9292 # Fortress 8080 # 123done 10139 # 321done 3031 # payments server diff --git a/assets/product-icons/firefox-fortress-email-icon.png b/assets/product-icons/firefox-fortress-email-icon.png deleted file mode 100644 index 66829839a6f..00000000000 Binary files a/assets/product-icons/firefox-fortress-email-icon.png and /dev/null differ diff --git a/assets/product-icons/firefox-fortress-web-icon.svg b/assets/product-icons/firefox-fortress-web-icon.svg deleted file mode 100644 index 3a51044b509..00000000000 --- a/assets/product-icons/firefox-fortress-web-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/docs/adr/0045-testing-updates-and-recommendations.md b/docs/adr/0045-testing-updates-and-recommendations.md index 93de1957436..a69166c9793 100644 --- a/docs/adr/0045-testing-updates-and-recommendations.md +++ b/docs/adr/0045-testing-updates-and-recommendations.md @@ -163,7 +163,6 @@ A. Unify Testing Frameworks 4 db-migrations 3 fxa-geodb 2 fxa-profile-server - 2 fortress 2 123done 1 browserid-verifier diff --git a/libs/accounts/email-renderer/src/layouts/subscription/index.stories.ts b/libs/accounts/email-renderer/src/layouts/subscription/index.stories.ts index 37e95b63f42..3088a18943a 100644 --- a/libs/accounts/email-renderer/src/layouts/subscription/index.stories.ts +++ b/libs/accounts/email-renderer/src/layouts/subscription/index.stories.ts @@ -35,7 +35,7 @@ export const LayoutMultipleProducts = createStory( { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', @@ -49,7 +49,7 @@ export const LayoutMultipleProductsWithBrandMessaging = createStory( { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', diff --git a/libs/accounts/email-renderer/src/templates/downloadSubscription/index.stories.ts b/libs/accounts/email-renderer/src/templates/downloadSubscription/index.stories.ts index e2b03a7d389..2d412acfead 100644 --- a/libs/accounts/email-renderer/src/templates/downloadSubscription/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/downloadSubscription/index.stories.ts @@ -13,7 +13,7 @@ export default { const data = { icon: 'https://cdn.accounts.firefox.com/product-icons/mozilla-vpn-email.png', link: 'http://getfirefox.com/', - productName: 'Firefox Fortress', + productName: '123Done Pro', subscriptionSupportUrl: 'http://localhost:3030/support', playStoreLink: 'https://play.google.com/store/apps/details?id=org.mozilla.firefox', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionAccountDeletion/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionAccountDeletion/index.stories.ts index 5eea2d6154d..4891e20037c 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionAccountDeletion/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionAccountDeletion/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', isCancellationEmail: true, invoiceTotal: '$20', invoiceDateOnly: '11/13/2021', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionCancellation/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionCancellation/index.stories.ts index 7ac5057c3ef..b70785f5d12 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionCancellation/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionCancellation/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', isCancellationEmail: true, invoiceTotal: '$2,000.00', invoiceDateOnly: '11/13/2021', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionEndingReminder/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionEndingReminder/index.stories.ts index eecd8b880aa..4064e6fbe01 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionEndingReminder/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionEndingReminder/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', serviceLastActiveDateOnly: 'July 15, 2025', accountSettingsUrl: 'http://localhost:3030/settings', subscriptionSupportUrlWithUtm: 'http://localhost:3030/support', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionFailedPaymentsCancellation/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionFailedPaymentsCancellation/index.stories.ts index 4a6774ff1a4..403c26de08e 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionFailedPaymentsCancellation/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionFailedPaymentsCancellation/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', isCancellationEmail: true, cancellationSurveyUrl: 'https://survey.alchemer.com/s3/6534408/Privacy-Security-Product-Cancellation-of-Service-Q4-21', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionFirstInvoice/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionFirstInvoice/index.stories.ts index 4fe43411520..f729fc24772 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionFirstInvoice/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionFirstInvoice/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', invoiceAmountDue: '$10.00', invoiceAmountDueInCents: 1000, icon: 'https://cdn.accounts.firefox.com/product-icons/mozilla-vpn-email.png', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionPaymentExpired/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionPaymentExpired/index.stories.ts index 6a66f22871f..53b80fd03d8 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionPaymentExpired/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionPaymentExpired/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', updateBillingUrl: 'http://localhost:3030/subscriptions', subscriptionSupportUrl: 'http://localhost:3030/support', }; diff --git a/libs/accounts/email-renderer/src/templates/subscriptionPaymentFailed/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionPaymentFailed/index.stories.ts index 94281657fb4..4fcb44aea3d 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionPaymentFailed/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionPaymentFailed/index.stories.ts @@ -12,7 +12,7 @@ export default { const data = { icon: 'https://cdn.accounts.firefox.com/product-icons/mozilla-vpn-email.png', - productName: 'Firefox Fortress', + productName: '123Done Pro', subscriptionSupportUrl: 'http://localhost:3030/support', updateBillingUrl: 'http://localhost:3030/subscriptions', }; diff --git a/libs/accounts/email-renderer/src/templates/subscriptionPaymentProviderCancelled/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionPaymentProviderCancelled/index.stories.ts index 5e3d32a9bbc..f777e28b265 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionPaymentProviderCancelled/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionPaymentProviderCancelled/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', subscriptionSupportUrl: 'http://localhost:3030/support', updateBillingUrl: 'http://localhost:3030/subscriptions', }; diff --git a/libs/accounts/email-renderer/src/templates/subscriptionReactivation/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionReactivation/index.stories.ts index ef6c51397ea..401cc52d30b 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionReactivation/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionReactivation/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', invoiceTotal: '$20', nextInvoiceDateOnly: '11/13/2021', icon: 'https://placekitten.com/512/512', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts index 7a01761eb4a..b8c8f344926 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionRenewalReminder/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', showTax: true, invoiceTotalExcludingTax: '$18.71', invoiceTax: '$1.29', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionReplaced/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionReplaced/index.stories.ts index 3af632b74af..94f33430d43 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionReplaced/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionReplaced/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', }; const createStory = subplatStoryWithProps( diff --git a/libs/accounts/email-renderer/src/templates/subscriptionSubsequentInvoice/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionSubsequentInvoice/index.stories.ts index 11fd3a367a9..8a0a9cb43aa 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionSubsequentInvoice/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionSubsequentInvoice/index.stories.ts @@ -11,7 +11,7 @@ export default { } as Meta; const data = { - productName: 'Firefox Fortress', + productName: '123Done Pro', invoiceAmountDue: '$10.00', invoiceDateOnly: '12/14/2021', invoiceNumber: '8675309', diff --git a/libs/accounts/email-renderer/src/templates/subscriptionsPaymentExpired/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionsPaymentExpired/index.stories.ts index bcb806b8d00..91960e5d7cf 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionsPaymentExpired/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionsPaymentExpired/index.stories.ts @@ -13,7 +13,7 @@ export default { const data = { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', @@ -23,7 +23,7 @@ const data = { subscriptionSupportUrl: 'http://localhost:3030/support', // Had to add this in! Double check value. - productName: 'Firefox Fortress', + productName: '123Done Pro', }; const createStory = subplatStoryWithProps( diff --git a/libs/accounts/email-renderer/src/templates/subscriptionsPaymentProviderCancelled/index.stories.ts b/libs/accounts/email-renderer/src/templates/subscriptionsPaymentProviderCancelled/index.stories.ts index a036af9ba52..175879449d2 100644 --- a/libs/accounts/email-renderer/src/templates/subscriptionsPaymentProviderCancelled/index.stories.ts +++ b/libs/accounts/email-renderer/src/templates/subscriptionsPaymentProviderCancelled/index.stories.ts @@ -13,7 +13,7 @@ export default { const data = { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', @@ -23,7 +23,7 @@ const data = { updateBillingUrl: 'http://localhost:3030/subscriptions', // Had to add this in. Double check! - productName: 'Firefox Fortress', + productName: '123Done Pro', }; const createStory = subplatStoryWithProps( diff --git a/packages/fortress/.eslintrc.json b/packages/fortress/.eslintrc.json deleted file mode 100644 index 0e2d8009195..00000000000 --- a/packages/fortress/.eslintrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": ["plugin:fxa/server"], - "plugins": ["fxa"], - "ignorePatterns": [ - "static", - "node_modules" - ], - "root": true -} diff --git a/packages/fortress/.nsprc b/packages/fortress/.nsprc deleted file mode 100644 index d035a321c8b..00000000000 --- a/packages/fortress/.nsprc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "comment_1179": "1179 is prototype pollution in minimist, used by eslint. Doesn't affect us, as we don't pass untrusted external inputs to eslint.", - "comment_1500": "1500 is prototype pollution in yargs-parser, used by rarely-updated browser-sync. Adding an exception while we wait for the package to be updated. Doesn't affect us, as we don't pass untrusted external inputs to browser-sync.", - "exceptions": [ - "https://npmjs.com/advisories/1179", - "https://npmjs.com/advisories/1500" - ] -} diff --git a/packages/fortress/.prettierignore b/packages/fortress/.prettierignore deleted file mode 100644 index a1c846eba65..00000000000 --- a/packages/fortress/.prettierignore +++ /dev/null @@ -1,8 +0,0 @@ -LICENSE -.* -Dockerfile -*.sh -*.ico -*.txt -ansible/* -static/img/* diff --git a/packages/fortress/README.md b/packages/fortress/README.md deleted file mode 100755 index 09ab57ac263..00000000000 --- a/packages/fortress/README.md +++ /dev/null @@ -1,21 +0,0 @@ -## A demo of a subscription flow - -## Running locally - -1. install [git] and [node] -1. get a local copy of the repository: `git clone https://github.com/mozilla/fxa` -1. `cd fxa/packages/fortress` -1. install dependencies: `yarn install` -1. run the server: `yarn dev` -1. visit it in your browser: `http://localhost:9292/` -1. if you want to develop even faster, open a new terminal window and run `yarn ui` -1. now you can go to `http://localhost:5000` and develop without having to ever restart the server or refresh the browser - -[git]: http://git-scm.org -[node]: http://nodejs.org - -## Testing - -This package does not currently have a test suite. - -Run `npm test` to lint the code. diff --git a/packages/fortress/config-local.json b/packages/fortress/config-local.json deleted file mode 100755 index f5c3c9eba46..00000000000 --- a/packages/fortress/config-local.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "client_id": "dcdb5ae7add825d2", - "client_secret": "b93ef8a8f3e553a430d7e5b904c6132b2722633af9f03128029201d24a97f2a8", - "redirect_uri": "http://localhost:9292/download" -} diff --git a/packages/fortress/config.js b/packages/fortress/config.js deleted file mode 100755 index dd021c2645e..00000000000 --- a/packages/fortress/config.js +++ /dev/null @@ -1,12 +0,0 @@ -var path = require('path'); - -var configTarget = process.env.CONFIG_FORTRESS || './config.json'; -var configFile = path.resolve(__dirname, configTarget); - -var now = '[' + new Date().toISOString() + ']'; -console.log(now, 'loading configuration File', configFile); //eslint-disable-line no-console - -var config = require(configFile); -console.log(now, 'config:', JSON.stringify(config, null, 2)); //eslint-disable-line no-console - -module.exports = config; diff --git a/packages/fortress/config.json b/packages/fortress/config.json deleted file mode 100755 index f5c3c9eba46..00000000000 --- a/packages/fortress/config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "client_id": "dcdb5ae7add825d2", - "client_secret": "b93ef8a8f3e553a430d7e5b904c6132b2722633af9f03128029201d24a97f2a8", - "redirect_uri": "http://localhost:9292/download" -} diff --git a/packages/fortress/data/index.js b/packages/fortress/data/index.js deleted file mode 100644 index 7b357fb1254..00000000000 --- a/packages/fortress/data/index.js +++ /dev/null @@ -1,74 +0,0 @@ -const data = { - global: { - title: 'Firefox Fortress', - tagline: 'Achieve your fortress dreams', - planPicker: 'Select your plan', - congrats: 'You are a hero of time and space', - paymentsUrl: '//localhost:3030/subscriptions/products', - }, - products: [ - { - title: 'Pro', - slug: 'pro', - productId: 'prod_HCMYHnbyGyRNJf', - upgradeTo: 1, - sellingPoints: [ - 'Limited breadsticks', - 'Smug sense of superiority', - 'Impress your friends', - 'No electrolytes', - ], - plans: [ - { - title: 'One Month Plan', - cycle: 'monthly', - price: '$5.99', - monthPrice: '$5.99', - planId: 'plan_HCMZcjgOeiSMch', - }, - { - title: 'One Year Plan', - cycle: 'yearly', - price: '$49.99', - monthPrice: '$4.17', - planId: 'plan_HCMZQPj8pn1s8J', - savings: '30%', - base: '$71.88', - popular: true, - }, - ], - }, - { - title: 'Pro Plus', - slug: 'pro-plus', - productId: 'prod_HCQGV1E3N5llAX', - sellingPoints: [ - 'Unlimited breadsticks', - 'Smugger sense of superiority', - 'Impress your friends + enemies', - 'Has electrolytes', - ], - plans: [ - { - title: 'One Month Plan', - cycle: 'monthly', - price: '$10.99', - monthPrice: '$10.99', - planId: 'plan_HCQGYwmhOtIsyk', - }, - { - title: 'One Year Plan', - cycle: 'yearly', - price: '$99.99', - monthPrice: '$8.33', - savings: '35%', - base: '$131.88', - planId: 'plan_HCQHoVGIoB3Hfj', - popular: true, - }, - ], - }, - ], -}; - -exports.data = data; diff --git a/packages/fortress/package.json b/packages/fortress/package.json deleted file mode 100644 index 9ed5f5076b7..00000000000 --- a/packages/fortress/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "fortress", - "description": "A simple tasklist app that demonstrates FxA Sign-In", - "version": "0.0.0", - "author": { - "name": "Mozilla", - "url": "https://mozilla.org/" - }, - "licenses": [ - { - "type": "MPL 2.0", - "url": "https://mozilla.org/MPL/2.0/" - } - ], - "homepage": "http://fortress.firefox.org/", - "bugs": "https://github.com/mozilla/fxa/issues", - "repository": { - "type": "git", - "url": "https://github.com/mozilla/fxa.git" - }, - "private": true, - "dependencies": { - "client-sessions": "0.8.x", - "ejs": "^3.1.10", - "express": "^4.21.2", - "morgan": "^1.10.0" - }, - "devDependencies": { - "audit-filter": "0.5.0", - "eslint": "^7.32.0", - "fxa-shared": "workspace:*", - "pm2": "^6.0.14", - "prettier": "^3.5.3", - "stylelint": "^16.14.1", - "stylelint-config-prettier": "^9.0.3" - }, - "scripts": { - "lint": "yarn lint-eslint", - "audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-", - "lint-eslint": "eslint .", - "lint-style": "stylelint --config ../../_dev/.stylelintrc static/*.css", - "start": "pm2 start pm2.config.js", - "stop": "pm2 stop pm2.config.js", - "restart": "pm2 restart pm2.config.js", - "delete": "pm2 delete pm2.config.js", - "format": "prettier --write --config ../../_dev/.prettierrc '**'" - }, - "nx": { - "tags": [ - "scope:demo" - ] - } -} diff --git a/packages/fortress/pm2.config.js b/packages/fortress/pm2.config.js deleted file mode 100644 index e70956cb863..00000000000 --- a/packages/fortress/pm2.config.js +++ /dev/null @@ -1,28 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -const PATH = process.env.PATH.split(':') - .filter((p) => !p.includes(process.env.TMPDIR)) - .join(':'); - -module.exports = { - apps: [ - { - name: 'fortress', - script: 'node server.js', - cwd: __dirname, - max_restarts: '1', - env: { - CONFIG_FORTRESS: './config-local.json', - NODE_ENV: 'dev', - PORT: '9292', - PATH, - }, - filter_env: ['npm_'], - min_uptime: '2m', - time: true, - watch: ['*.js', 'views'], - }, - ], -}; diff --git a/packages/fortress/server.js b/packages/fortress/server.js deleted file mode 100755 index 84d8e6f04f2..00000000000 --- a/packages/fortress/server.js +++ /dev/null @@ -1,41 +0,0 @@ -const express = require('express'); -const morgan = require('morgan'); -const path = require('path'); - -const config = require('./config'); -const { data } = require('./data'); - -const logger = morgan('short'); - -const app = express(); - -app.use(logger, express.json()); - -app.set('views', path.join(__dirname, 'views')); -app.set('view engine', 'ejs'); - -app.get('/', (req, res, next) => { - res.render('index', { data }); -}); - -app.get('/download', (req, res, next) => { - res.render('default', { data }); -}); - -data.products.forEach((product, index) => { - const productData = { global: data.global, ...product }; - app.get(`/${product.slug}`, (req, res, next) => { - res.render('choice', { data: productData }); - }); - - app.get(`/download/${product.slug}`, (req, res, next) => { - res.render('download', { data, index }); - }); -}); - -app.use(express.static(path.join(__dirname, 'static'))); - -const port = process.env['PORT'] || config.port || 9292; -app.listen(port, () => { - console.log(`Firefox Fortress started on ${port}`); //eslint-disable-line no-console -}); diff --git a/packages/fortress/static/fonts/Metropolis/Metropolis-Bold.woff2 b/packages/fortress/static/fonts/Metropolis/Metropolis-Bold.woff2 deleted file mode 100644 index 54bb59f6576..00000000000 Binary files a/packages/fortress/static/fonts/Metropolis/Metropolis-Bold.woff2 and /dev/null differ diff --git a/packages/fortress/static/fonts/Metropolis/Metropolis-Medium.woff2 b/packages/fortress/static/fonts/Metropolis/Metropolis-Medium.woff2 deleted file mode 100644 index d5aabb6e99e..00000000000 Binary files a/packages/fortress/static/fonts/Metropolis/Metropolis-Medium.woff2 and /dev/null differ diff --git a/packages/fortress/static/fonts/Metropolis/Metropolis-SemiBold.woff2 b/packages/fortress/static/fonts/Metropolis/Metropolis-SemiBold.woff2 deleted file mode 100644 index 2ad1a7e0041..00000000000 Binary files a/packages/fortress/static/fonts/Metropolis/Metropolis-SemiBold.woff2 and /dev/null differ diff --git a/packages/fortress/static/img/favicon.png b/packages/fortress/static/img/favicon.png deleted file mode 100644 index f7401c7e572..00000000000 Binary files a/packages/fortress/static/img/favicon.png and /dev/null differ diff --git a/packages/fortress/static/img/icon.svg b/packages/fortress/static/img/icon.svg deleted file mode 100644 index 3a51044b509..00000000000 --- a/packages/fortress/static/img/icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/fortress/static/main.css b/packages/fortress/static/main.css deleted file mode 100644 index 7c208e6a7cf..00000000000 --- a/packages/fortress/static/main.css +++ /dev/null @@ -1,241 +0,0 @@ -@font-face { - font-family: 'Metropolis'; - font-style: normal; - font-weight: 700; - src: url('/fonts/Metropolis/Metropolis-Bold.woff2') format('woff2'); -} - -@font-face { - font-family: 'Metropolis'; - font-style: normal; - font-weight: 600; - src: url('/fonts/Metropolis/Metropolis-SemiBold.woff2') format('woff2'); -} - -@font-face { - font-family: 'Metropolis'; - font-style: normal; - font-weight: 500; - src: url('/fonts/Metropolis/Metropolis-Medium.woff2') format('woff2'); -} - -:root { - --key-color: #20123a; - --block-size: 16px; - --highlight: #9059ff; - --wild-gradient: repeating-linear-gradient( - -135deg, - #9059ff, - #d74cf0, - #ffd567, - #ffd567, - #d74cf0, - #9059ff - ); -} - -*, -*::before, -*::after { - box-sizing: border-box; -} - -body { - align-items: center; - color: var(--key-color); - display: flex; - flex-direction: column; - font-family: 'Metropolis', sans-serif; - height: 100vh; - justify-content: flex-start; - margin: 0; - padding: 64px 0; -} - -.icon-wrap { - background-color: var(--key-color); - margin: 0 0 calc(2 * var(--block-size)); -} - -.icon { - background: url(/img/icon.svg) center center space; - background-size: calc(3 * var(--block-size)); - height: calc(4 * var(--block-size)); - transition: transform 150ms ease-out; - width: calc(4 * var(--block-size)); -} - -.icon-wrap:hover { - animation: spin 1s linear infinite; - background-image: var(--wild-gradient); - background-size: 200%; -} - -h1 { - font-size: 54px; - margin: 0 0 20px; -} - -h2 { - font-size: 32px; - margin: 0; - opacity: 0.7; -} - -h3 { - font-size: 24px; - margin: 0 0 20px; -} - -h4 { - margin: 0 0 24px; -} - -.cards { - display: flex; - margin: 36px; -} - -.card { - border-radius: 4px; - border: 3px solid var(--key-color); - margin: 0 24px; - padding: 24px; - width: 320px; -} - -.popular { - box-shadow: 0 5px 18px rgba(0, 0, 0, 0.2); -} - -.price-card { - align-items: center; - display: flex; - flex-direction: column; -} - -.price-card h3, -.price-card h4, -.price-card p { - text-align: center; -} - -.price-card h3 { - font-size: 16px; -} - -.price-card h4 { - font-size: 48px; - margin-bottom: 8px; -} - -.price-card p { - margin-top: 0; - font-weight: 500; -} - -.price-card .billed { - margin: 16px 0 24px; -} - -.savings, -.no-savings { - border-radius: 16px; - border: 2px solid var(--key-color); - margin: 24px 0; - padding: 4px 0; -} - -.no-savings { - opacity: 0.5; -} - -.card ul { - margin: 0 0 24px; - padding: 0 0 0 12px; -} - -.card li { - font-size: 16px; - margin: 0 0 12px; -} - -.button { - align-items: center; - border: 3px solid var(--key-color); - color: var(--key-color); - display: flex; - font-weight: 700; - justify-content: center; - padding: 16px; - text-decoration: none; - transition: background-image 250ms; - user-select: none; - width: 100%; -} - -del { - position: relative; - text-decoration: none; -} - -del::after { - content: ''; - height: 2px; - left: 0; - right: 0; - position: absolute; - background: red; - top: calc(50% - 2px); - transform: rotate(20deg); -} - -del::before { - content: ''; - height: 2px; - left: 0; - right: 0; - position: absolute; - background: red; - top: calc(50% - 2px); - transform: rotate(-20deg); -} - -.discount { - position: relative; -} - -.discount::before { - content: ''; - height: 2px; - left: 0; - right: 0; - position: absolute; - background: var(--key-color); - bottom: -2px; -} - -.button:hover { - animation: spin 1s linear infinite; - background-image: var(--wild-gradient); - background-size: 200%; -} - -.highlight { - color: var(--highlight); -} - -.link { - color: (var(--key-color)); - display: block; - font-weight: 700; - margin: 24px 0 0; - text-align: center; - text-decoration: none; -} - -@keyframes spin { - 100% { - background-position: 200% 200%; - } -} diff --git a/packages/fortress/views/choice.ejs b/packages/fortress/views/choice.ejs deleted file mode 100644 index 9d45fd17cdb..00000000000 --- a/packages/fortress/views/choice.ejs +++ /dev/null @@ -1,36 +0,0 @@ - -<%- include('header'); -%> - -

<%= data.global.title %> - <%= data.title %> -

-

<%= data.global.planPicker %>

-
- <% data.plans.forEach(plan => { %> -
"> -

<%= plan.title %>

-
-

<%= plan.monthPrice %>/mo

- <% if (plan.cycle === 'yearly') { %> -

billed <%= plan.base %> <%= plan.price %> yearly

- <% } else { %> -

billed <%= plan.price %> monthly

- <% } %> - <% if (plan.savings) { %> -

- Save <%= plan.savings %> -

- <% } else { %> -

- Save 0% -

- <% } %> -

- - Subscribe - -
- <% }) %> -
- -<%- include('footer'); -%> \ No newline at end of file diff --git a/packages/fortress/views/default.ejs b/packages/fortress/views/default.ejs deleted file mode 100644 index c0db7aac02e..00000000000 --- a/packages/fortress/views/default.ejs +++ /dev/null @@ -1,9 +0,0 @@ -<%- include('header'); -%> - -

<%= data.global.title %>

-

<%= data.global.tagline %>

-
- Home -
- -<%- include('footer'); -%> \ No newline at end of file diff --git a/packages/fortress/views/download.ejs b/packages/fortress/views/download.ejs deleted file mode 100644 index 7a7d41a6f30..00000000000 --- a/packages/fortress/views/download.ejs +++ /dev/null @@ -1,21 +0,0 @@ -<%- include('header'); -%> - -

<%= data.global.title %> - <%= data.products[index].title %> -

-

<%= data.global.congrats %>

-
-
-

Download <%= data.products[index].title %>

- Download - <% if (data.products[index].upgradeTo) { %> - <% var i = data.products[index].upgradeTo %> - - Upgrade to - <%= data.products[i].title %> - - <% } %> -
-
- -<%- include('footer'); -%> \ No newline at end of file diff --git a/packages/fortress/views/footer.ejs b/packages/fortress/views/footer.ejs deleted file mode 100644 index fa43f0c0f9e..00000000000 --- a/packages/fortress/views/footer.ejs +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/fortress/views/header.ejs b/packages/fortress/views/header.ejs deleted file mode 100644 index 7c756c41724..00000000000 --- a/packages/fortress/views/header.ejs +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - <%= data.global.title %> - - - - - - - - - - -
- - diff --git a/packages/fortress/views/index.ejs b/packages/fortress/views/index.ejs deleted file mode 100644 index 05631675d24..00000000000 --- a/packages/fortress/views/index.ejs +++ /dev/null @@ -1,19 +0,0 @@ -<%- include('header'); -%> - -

<%= data.global.title %>

-

<%= data.global.tagline %>

-
- <% data.products.forEach(product => { %> -
-

<%= product.title %>

-
    - <% product.sellingPoints.forEach(sellingPoint => { %> -
  • <%= sellingPoint %>
    • - <% }) %> -
- Subscribe to <%= product.title %> -
- <% }) %> -
- -<%- include('footer'); -%> \ No newline at end of file diff --git a/packages/fxa-auth-server/config/dev.json b/packages/fxa-auth-server/config/dev.json index eaf4106ec77..f175e4bfe7e 100644 --- a/packages/fxa-auth-server/config/dev.json +++ b/packages/fxa-auth-server/config/dev.json @@ -125,20 +125,6 @@ "amount": 50, "currency": "usd" }, - { - "plan_id": "fortressProMonthly", - "product_id": "fortressProProduct", - "product_name": "Fortress Pro", - "product_metadata": { - "capabilities": "fortress", - "webIconURL": "http://placekitten.com/512/512?image=9", - "emailIconURL": "http://placekitten.com/512/512?image=3", - "successActionButtonURL": "http://localhost:9292/" - }, - "interval": "month", - "amount": 50, - "currency": "usd" - }, { "plan_id": "321doneProWeekly", "product_id": "321doneProProduct", diff --git a/packages/fxa-auth-server/lib/senders/emails/layouts/subscription/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/layouts/subscription/index.stories.ts index 8a51eb59ef7..5f097e432ad 100644 --- a/packages/fxa-auth-server/lib/senders/emails/layouts/subscription/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/layouts/subscription/index.stories.ts @@ -37,7 +37,7 @@ export const LayoutMultipleProducts = createStory( { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', @@ -51,7 +51,7 @@ export const LayoutMultipleProductsWithBrandMessaging = createStory( { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/downloadSubscription/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/downloadSubscription/index.stories.ts index 1cc40b3ecf9..6e078e3f796 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/downloadSubscription/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/downloadSubscription/index.stories.ts @@ -15,7 +15,7 @@ const createStory = subplatStoryWithProps( { icon: 'https://cdn.accounts.firefox.com/product-icons/mozilla-vpn-email.png', link: 'http://getfirefox.com/', - productName: 'Firefox Fortress', + productName: '123Done Pro', subscriptionSupportUrl: 'http://localhost:3030/support', playStoreLink: 'https://play.google.com/store/apps/details?id=org.mozilla.firefox', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionAccountDeletion/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionAccountDeletion/index.stories.ts index 121710d5f79..4002491b981 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionAccountDeletion/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionAccountDeletion/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionAccountDeletion', 'Sent when a user with an active subscription deletes their Mozilla account.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', isCancellationEmail: true, invoiceTotal: '$20', invoiceDateOnly: '11/13/2021', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionCancellation/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionCancellation/index.stories.ts index ae30990ccd7..a6524956779 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionCancellation/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionCancellation/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionCancellation', 'Sent when a user cancels their subscription.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', isCancellationEmail: true, invoiceTotal: '$2,000.00', invoiceDateOnly: '11/13/2021', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionEndingReminder/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionEndingReminder/index.stories.ts index 1590ffb0e30..3d196817d7d 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionEndingReminder/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionEndingReminder/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionEndingReminder', 'Sent to remind a user their subscriptions is expiring soon.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', serviceLastActiveDateOnly: 'July 15, 2025', accountSettingsUrl: 'http://localhost:3030/settings', subscriptionSupportUrlWithUtm: 'http://localhost:3030/support', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFailedPaymentsCancellation/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFailedPaymentsCancellation/index.stories.ts index e34e0172418..16dc0a82119 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFailedPaymentsCancellation/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFailedPaymentsCancellation/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionFailedPaymentsCancellation', 'Sent when failed payments result in cancellation of user subscription.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', isCancellationEmail: true, cancellationSurveryUrl: 'https://survey.alchemer.com/s3/6534408/Privacy-Security-Product-Cancellation-of-Service-Q4-21', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFirstInvoice/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFirstInvoice/index.stories.ts index 385466e3aad..d855b8edf4f 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFirstInvoice/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionFirstInvoice/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionFirstInvoice', 'Sent to inform a user that their first payment is currently being processed.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', invoiceAmountDue: '$10.00', icon: 'https://cdn.accounts.firefox.com/product-icons/mozilla-vpn-email.png', invoiceDateOnly: '10/13/2021', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentExpired/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentExpired/index.stories.ts index 34a047700e6..5126138617d 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentExpired/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentExpired/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionPaymentExpired', 'Sent whenever a user has a single subscription and their payment method has expired or will expire at the end of the month, triggered by a Stripe webhook.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', updateBillingUrl: 'http://localhost:3030/subscriptions', subscriptionSupportUrl: 'http://localhost:3030/support', } diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentFailed/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentFailed/index.stories.ts index d780bdb575b..78c1ffa082f 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentFailed/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentFailed/index.stories.ts @@ -14,7 +14,7 @@ const createStory = subplatStoryWithProps( 'Sent when there is a problem with the latest payment.', { icon: 'https://cdn.accounts.firefox.com/product-icons/mozilla-vpn-email.png', - productName: 'Firefox Fortress', + productName: '123Done Pro', subscriptionSupportUrl: 'http://localhost:3030/support', updateBillingUrl: 'http://localhost:3030/subscriptions', } diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentProviderCancelled/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentProviderCancelled/index.stories.ts index c75c9cd1b62..b20203222bd 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentProviderCancelled/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionPaymentProviderCancelled/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionPaymentProviderCancelled', 'Sent when a problem is detected with the payment method.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', subscriptionSupportUrl: 'http://localhost:3030/support', updateBillingUrl: 'http://localhost:3030/subscriptions', } diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReactivation/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReactivation/index.stories.ts index 755420e8214..202bbf235f6 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReactivation/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReactivation/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionReactivation', 'Sent when a user reactivates their subscription.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', invoiceTotal: '$20', nextInvoiceDateOnly: '11/13/2021', icon: 'https://placekitten.com/512/512', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts index f9c14e9d80a..b59de8ff34e 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionRenewalReminder/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionRenewalReminder', 'Sent to remind a user of an upcoming automatic subscription renewal X days out from charge', { - productName: 'Firefox Fortress', + productName: '123Done Pro', invoiceTotal: '$20.00', planInterval: 'month', reminderLength: '7', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReplaced/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReplaced/index.stories.ts index 0b75cfeddd9..0f3979c4d41 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReplaced/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionReplaced/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionReplaced', 'Sent when a user has overlapping subscriptions when upgrading to a bundle.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', } ); diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionSubsequentInvoice/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionSubsequentInvoice/index.stories.ts index c76a2a4bc70..0d5fe1c0b1a 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionSubsequentInvoice/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionSubsequentInvoice/index.stories.ts @@ -13,7 +13,7 @@ const createStory = subplatStoryWithProps( 'subscriptionSubsequentInvoice', 'Sent when the latest subscription payment is received.', { - productName: 'Firefox Fortress', + productName: '123Done Pro', invoiceAmountDue: '$10.00', invoiceDateOnly: '12/14/2021', invoiceNumber: '8675309', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentExpired/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentExpired/index.stories.ts index d0d51fd2e28..d28932717f5 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentExpired/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentExpired/index.stories.ts @@ -15,7 +15,7 @@ const createStory = subplatStoryWithProps( { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentProviderCancelled/index.stories.ts b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentProviderCancelled/index.stories.ts index 1656a7368fe..8415ac6285f 100644 --- a/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentProviderCancelled/index.stories.ts +++ b/packages/fxa-auth-server/lib/senders/emails/templates/subscriptionsPaymentProviderCancelled/index.stories.ts @@ -15,7 +15,7 @@ const createStory = subplatStoryWithProps( { subscriptions: [ { - productName: 'Firefox Fortress', + productName: '123Done Pro', }, { productName: 'Mozilla VPN', diff --git a/packages/fxa-auth-server/scripts/write-emails-to-disk.js b/packages/fxa-auth-server/scripts/write-emails-to-disk.js index c968ba9c096..07ece6b9631 100755 --- a/packages/fxa-auth-server/scripts/write-emails-to-disk.js +++ b/packages/fxa-auth-server/scripts/write-emails-to-disk.js @@ -119,7 +119,7 @@ function sendMail(mailer, messageToSend) { numberRemaining: 2, productId: '0123456789abcdef', planId: 'plan-example', - productName: 'Firefox Fortress', + productName: '123Done Pro', planEmailIconURL: planConfig.urls.emailIcon, planSuccessActionButtonURL: planConfig.urls.download, planInterval: 'week', @@ -175,7 +175,7 @@ function sendMail(mailer, messageToSend) { planId: 'plan-example', productId: '0123456789abcdef', productMetadata, - productName: 'Firefox Fortress', + productName: '123Done Pro', }, subscriptions: [ { @@ -184,7 +184,7 @@ function sendMail(mailer, messageToSend) { planId: 'plan-example', productId: '0123456789abcdef', productMetadata, - productName: 'Firefox Fortress', + productName: '123Done Pro', }, ], planConfig, diff --git a/packages/fxa-auth-server/test/local/payments/fixtures/stripe/paymentIntent_succeeded.json b/packages/fxa-auth-server/test/local/payments/fixtures/stripe/paymentIntent_succeeded.json index 4a7407d5060..4ed66ea36de 100644 --- a/packages/fxa-auth-server/test/local/payments/fixtures/stripe/paymentIntent_succeeded.json +++ b/packages/fxa-auth-server/test/local/payments/fixtures/stripe/paymentIntent_succeeded.json @@ -39,7 +39,7 @@ "name": "BMO", "phone": null }, - "calculated_statement_descriptor": "FIREFOX FORTRESS", + "calculated_statement_descriptor": "123DONE PRO", "captured": true, "created": 1591368350, "currency": "usd", @@ -123,7 +123,7 @@ "tokenization_method": null }, "source_transfer": null, - "statement_descriptor": "Firefox Fortress", + "statement_descriptor": "123Done Pro", "statement_descriptor_suffix": null, "status": "succeeded", "transfer_data": null, diff --git a/packages/fxa-auth-server/test/local/senders/emails.ts b/packages/fxa-auth-server/test/local/senders/emails.ts index 8c08d4d8439..bd7fd80e4ae 100644 --- a/packages/fxa-auth-server/test/local/senders/emails.ts +++ b/packages/fxa-auth-server/test/local/senders/emails.ts @@ -113,7 +113,7 @@ const MESSAGE = { 'https://cdn.accounts.firefox.com/product-icons/mozilla-vpn-email.png', productId: 'wibble', productMetadata, - productName: 'Firefox Fortress', + productName: '123Done Pro', productNameOld: 'Product A', productNameNew: 'Product B', productPaymentCycleNew: 'month', @@ -130,7 +130,7 @@ const MESSAGE = { productId: 'wibble', }, subscriptions: [ - { planId: 'plan-example', productName: 'Firefox Fortress' }, + { planId: 'plan-example', productName: '123Done Pro' }, { planId: 'other-plan', productName: 'Cooking with Foxkeh' }, ], showPaymentMethod: true, @@ -3491,7 +3491,7 @@ const TESTS: [string, any, Record?][] = [ test: 'include', expected: 'Sorry, we’re having trouble with your payment method', }, - { test: 'include', expected: 'Firefox Fortress' }, + { test: 'include', expected: '123Done Pro' }, { test: 'include', expected: 'Cooking with Foxkeh' }, { test: 'include', @@ -3540,7 +3540,7 @@ const TESTS: [string, any, Record?][] = [ test: 'include', expected: 'Sorry, we’re having trouble with your payment method', }, - { test: 'include', expected: 'Firefox Fortress' }, + { test: 'include', expected: '123Done Pro' }, { test: 'include', expected: 'Cooking with Foxkeh' }, { test: 'include', diff --git a/packages/fxa-content-server/app/tests/spec/lib/glean.js b/packages/fxa-content-server/app/tests/spec/lib/glean.js index 1fb85861b8d..fe76abe669e 100644 --- a/packages/fxa-content-server/app/tests/spec/lib/glean.js +++ b/packages/fxa-content-server/app/tests/spec/lib/glean.js @@ -217,7 +217,7 @@ describe('lib/glean', () => { it('sets the metrics values', async () => { mockFlowEventMetadata = { - entrypoint: 'firefox_fortress', + entrypoint: '123done', flowId: '0f0f', utmCampaign: 'quux', utmContent: 'fizz', @@ -228,7 +228,7 @@ describe('lib/glean', () => { entrypointVariation: 'earth', }; mockClientId = '133t'; - mockService = 'fortress'; + mockService = '123done'; mockDeviceType = 'banana_phone'; await GleanMetrics.registration.view(); diff --git a/packages/fxa-payments-server/server/config/index.js b/packages/fxa-payments-server/server/config/index.js index d96264fad9c..1ecbde17f68 100644 --- a/packages/fxa-payments-server/server/config/index.js +++ b/packages/fxa-payments-server/server/config/index.js @@ -248,8 +248,6 @@ const conf = convict({ productRedirectURLs: { default: { '123doneProProduct': 'http://localhost:8080/', - fortressProProduct: 'http://localhost:9292/download', - prod_FUUNYnlDso7FeB: 'https://fortress-latest.dev.lcip.org/', prod_GqM9ToKK62qjkK: 'https://123done-latest.dev.lcip.org/', // todo get new prod_id for 123done stage prod_FfiuDs9u11ESbD: 'https://123done-stage.dev.lcip.org', diff --git a/yarn.lock b/yarn.lock index 24c3a5d3ce8..64a37a7ac2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29005,15 +29005,6 @@ __metadata: languageName: node linkType: hard -"client-sessions@npm:0.8.x": - version: 0.8.0 - resolution: "client-sessions@npm:0.8.0" - dependencies: - cookies: "npm:^0.7.0" - checksum: 10c0/b53995540b212d9c5992d48432eb97aa9a2e8a91c4d487c6a495c3c5b39711789422096b4d24e00b1b3ac41d87a16a4411673fffc2d56f7fb840d15841413b1b - languageName: node - linkType: hard - "cliui@npm:^3.2.0": version: 3.2.0 resolution: "cliui@npm:3.2.0" @@ -29921,16 +29912,6 @@ __metadata: languageName: node linkType: hard -"cookies@npm:^0.7.0": - version: 0.7.3 - resolution: "cookies@npm:0.7.3" - dependencies: - depd: "npm:~1.1.2" - keygrip: "npm:~1.0.3" - checksum: 10c0/ecb29d0cb442e530bf3f5642e542346d747de0f9f94c092bba4eebd44d4d55dfde6d2cf20e58387ae8dc5d2e1f1562c6623a5b1df1e4539df2ca021ae27b802c - languageName: node - linkType: hard - "copy-anything@npm:^2.0.1": version: 2.0.6 resolution: "copy-anything@npm:2.0.6" @@ -35329,24 +35310,6 @@ __metadata: languageName: node linkType: hard -"fortress@workspace:packages/fortress": - version: 0.0.0-use.local - resolution: "fortress@workspace:packages/fortress" - dependencies: - audit-filter: "npm:0.5.0" - client-sessions: "npm:0.8.x" - ejs: "npm:^3.1.10" - eslint: "npm:^7.32.0" - express: "npm:^4.21.2" - fxa-shared: "workspace:*" - morgan: "npm:^1.10.0" - pm2: "npm:^6.0.14" - prettier: "npm:^3.5.3" - stylelint: "npm:^16.14.1" - stylelint-config-prettier: "npm:^9.0.3" - languageName: unknown - linkType: soft - "forwarded-parse@npm:2.1.2": version: 2.1.2 resolution: "forwarded-parse@npm:2.1.2" @@ -43097,13 +43060,6 @@ __metadata: languageName: node linkType: hard -"keygrip@npm:~1.0.3": - version: 1.0.3 - resolution: "keygrip@npm:1.0.3" - checksum: 10c0/2a94700bbdd6f53c3f77932aa2d211ff7f537472a21d257203aa48972c2fdc71c60f82e661415887ea068061ce3c7532c5fdd7e8efd4390ad154d51f1a5932a9 - languageName: node - linkType: hard - "keygrip@npm:~1.1.0": version: 1.1.0 resolution: "keygrip@npm:1.1.0"