df12516972
Revert "fix(tests): Increase playwright ci worker to 4"
2022-10-31 10:34:11 -04:00
2cfe516c0c
chore(deps): bump react-easy-crop from 4.5.0 to 4.6.1
...
Bumps [react-easy-crop](https://github.com/ValentinH/react-easy-crop ) from 4.5.0 to 4.6.1.
- [Release notes](https://github.com/ValentinH/react-easy-crop/releases )
- [Commits](https://github.com/ValentinH/react-easy-crop/compare/v4.5.0...v4.6.1 )
---
updated-dependencies:
- dependency-name: react-easy-crop
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 06:42:35 +00:00
254f6777fe
chore(deps): bump @opentelemetry/instrumentation-document-load
...
Bumps [@opentelemetry/instrumentation-document-load](https://github.com/open-telemetry/opentelemetry-js-contrib ) from 0.29.0 to 0.30.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-js-contrib/releases )
- [Changelog](https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/CHANGELOG.md )
- [Commits](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.29.0...host-metrics-v0.30.0 )
---
updated-dependencies:
- dependency-name: "@opentelemetry/instrumentation-document-load"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-31 06:26:09 +00:00
9a26e9ff9e
Merge pull request #14367 from mozilla/revert-14281-FXA-3647-dnt-amplitude
...
Revert "fix(dnt): apply dnt filtering to more metrics"
2022-10-28 18:28:15 -05:00
8064c1437a
Revert "fix(dnt): apply dnt filtering to more metrics"
2022-10-28 15:33:44 -07:00
546a0a2101
Merge pull request #14360 from mozilla/FXA-5480__fix
...
fix(subscriptions): fix copy in IAP roadblock for subscription upgrades
2022-10-28 17:35:58 -04:00
ec383f4c27
Merge pull request #14358 from mozilla/fxa-6170-upgrade-amount-interval-fix
...
fix(subscriptions): fix amounts for same interval
2022-10-28 17:30:22 -04:00
58ab72aef4
Merge pull request #14357 from mozilla/fxa-4051/proper-error-not-displayed
...
fix(payments): detailed Error Message Not Displayed
2022-10-28 14:19:49 -07:00
822006c06c
Merge pull request #14355 from mozilla/FXA-6109
...
chore(auth): add purchaseDate to AppStoreSubscriptionPurchase
2022-10-28 17:18:59 -04:00
0977ae5ab4
fix(subscriptions): fix amounts for same interval
...
Because:
- The wrong amount is displayed on a subscription change between two
prices with the same interval, since an invoice isn't immediately
generated by Stripe.
- Cancellation emails do not inform the customer when they still have
an oustanding amount at the end of their subscription.
This commit:
- Checks if there are any pending invoice items, and if there are,
retrieves the upcoming invoice.
- For upgrade emails, the upcoming invoice is used to get the proration
amounts only.
- For cancellation emails the upcoming invoice is used in favor of the
currently latest invoice.
Closes #FXA-6170
2022-10-28 16:48:28 -04:00
8136a3e352
Merge pull request #14347 from mozilla/dependabot/npm_and_yarn/typescript-eslint/parser-5.41.0
...
chore(deps-dev): bump @typescript-eslint/parser from 5.40.0 to 5.41.0
2022-10-28 13:12:16 -05:00
72cbb56d12
Merge pull request #14349 from mozilla/dependabot/npm_and_yarn/replace-in-file-6.3.5
...
chore(deps): bump replace-in-file from 6.1.0 to 6.3.5
2022-10-28 12:52:43 -05:00
f7cfc5cb39
Merge pull request #14350 from mozilla/dependabot/npm_and_yarn/stripe/react-stripe-js-1.14.0
...
chore(deps): bump @stripe/react-stripe-js from 1.13.0 to 1.14.0
2022-10-28 12:52:15 -05:00
3fbdb51777
Merge pull request #14363 from mozilla/dependabot/npm_and_yarn/bl-6.0.0
...
chore(deps): bump bl from 5.0.0 to 6.0.0
2022-10-28 12:47:30 -05:00
4294aef0d1
Merge pull request #14361 from mozilla/dependabot/npm_and_yarn/eslint-plugin-jest-27.1.3
...
chore(deps): bump eslint-plugin-jest from 24.5.2 to 27.1.3
2022-10-28 12:39:58 -05:00
f58cbba4a5
chore(deps-dev): bump @typescript-eslint/parser from 5.40.0 to 5.41.0
...
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser ) from 5.40.0 to 5.41.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases )
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md )
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.41.0/packages/parser )
---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-28 17:33:41 +00:00
b377b05fcc
chore(deps): bump bl from 5.0.0 to 6.0.0
...
Bumps [bl](https://github.com/rvagg/bl ) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/rvagg/bl/releases )
- [Changelog](https://github.com/rvagg/bl/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rvagg/bl/compare/v5.0.0...v6.0.0 )
---
updated-dependencies:
- dependency-name: bl
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-28 17:33:27 +00:00
90b27f252c
Merge pull request #14362 from mozilla/dependabot/npm_and_yarn/aws-sdk-2.1242.0
...
chore(deps): bump aws-sdk from 2.1239.0 to 2.1242.0
2022-10-28 12:23:28 -05:00
ec460c91b3
chore(deps): bump aws-sdk from 2.1239.0 to 2.1242.0
...
Bumps [aws-sdk](https://github.com/aws/aws-sdk-js ) from 2.1239.0 to 2.1242.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases )
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1239.0...v2.1242.0 )
---
updated-dependencies:
- dependency-name: aws-sdk
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-28 06:39:52 +00:00
608a3edd35
chore(deps): bump eslint-plugin-jest from 24.5.2 to 27.1.3
...
Bumps [eslint-plugin-jest](https://github.com/jest-community/eslint-plugin-jest ) from 24.5.2 to 27.1.3.
- [Release notes](https://github.com/jest-community/eslint-plugin-jest/releases )
- [Changelog](https://github.com/jest-community/eslint-plugin-jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/jest-community/eslint-plugin-jest/compare/v24.5.2...v27.1.3 )
---
updated-dependencies:
- dependency-name: eslint-plugin-jest
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-28 06:37:48 +00:00
2cb4e855d3
Merge pull request #14279 from vpomerleau/FXA-5994-create-global-FTL-branding-file
...
refactor(l10n): Create new global branding.ftl file for terms
2022-10-27 16:54:09 -07:00
a9c28476dd
fix(payments): detailed Error Message Not Displayed
...
Because:
* we want to show more specific error information
This commit:
* checks the properties of the error object to pass in the right object, error vs error.error
Closes #FXA-4051
2022-10-27 14:58:37 -07:00
75c1f4fc99
fix(subscriptions): fix copy in IAP roadblock for subscription upgrades
...
Because:
* Previous copy said you were already subscribed to the new plan (different from current but on same product set)
This commit:
* Updates the copy to show the current plan name and not the new one
* Updates tests
* Updates stories
* Fixes some other nits/DRY/cleanups that were found while reviewing PR#14118
Closes FXA-5480
2022-10-27 17:56:04 -04:00
eb457d6373
refactor(l10n): Create new global branding.ftl file to hold shared branding terms and use it in fxa-auth-server
...
Because:
- Branding terms should be standardized across all fxa products/services
- Duplication of license and brand terms across multiple ftl files should be avoided
This commit:
- Create a new branding.ftl file stored in fxa-shared
- Move license and terms from fxa-auth-server to branding.ftl, update comments
- Remove license and terms from auth.ftl
- Rename auth.ftl to server.ftl to only store non-brand, non-email messages
- Update grunttask to concatenate branding.ftl, then server.ftl then email ftl files
- Update fxa-auth-server readme
Issue #5994
2022-10-27 14:30:06 -07:00
23dcd8aa53
refactor(context): Remove new Context for flow query params
...
Because:
* We should only need flowQueryParams in a few components and since using Context isn't free, we can just pass it directly
This commit:
* Refactors out the new Context provider and mocks in favor of passing these values directly into the components that need them
* Moves AppErrorBoundary up the tree
* Moves a couple types out of react-app-env.d.ts
Closes FXA-6163
2022-10-27 16:23:50 -05:00
3d77dbc005
chore(auth): add purchaseDate to AppStoreSubscriptionPurchase
...
Because:
* The Data Science/Engineering team has requested the [purchaseDate](https://developer.apple.com/documentation/appstoreservernotifications/purchasedate ) field for analysis purposes, and it wasn't included in the original implementation.
This commit:
* Includes the purchaseDate field.
Closes #FXA-6109
2022-10-27 16:36:47 -04:00
fb48aae264
Update jest.config.js
2022-10-27 13:07:32 -07:00
efb9fda5c3
Merge pull request #14336 from mozilla/FXA-5892-sync-v3-force-auth-functional-tests
...
test(force auth): add functional tests for Sync V3 force auth
2022-10-27 14:16:32 -05:00
e53e9fad85
fix(payments-server): Revise className for NewsletterErrorAlertBar
2022-10-27 11:08:29 -07:00
4aeafaecb5
Merge pull request #14354 from mozilla/fix_AlertBar
...
fix(payments-server): Revise className for NewsletterErrorAlertBar
2022-10-27 13:57:09 -04:00
bed52151ce
test(force auth): add functional tests for Sync V3 force auth
...
Because:
- we want convert the desktop Sync V3 force auth tests from the Intern
to Playwright
This commit:
- add Playwright tests for desktop Sync V3 force auth flows
2022-10-27 10:48:21 -07:00
83b242b7f4
fix(payments-server): Revise className for NewsletterErrorAlertBar
2022-10-27 13:26:24 -04:00
48905176b1
chore(tests): Remove coveragePathIgnorePatterns from fxa-payments-server
...
### Before:
```sh
----------|---------|----------|---------|---------|-------------------
File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
----------|---------|----------|---------|---------|-------------------
All files | 0 | 0 | 0 | 0 |
----------|---------|----------|---------|---------|-------------------
Test Suites: 7 passed, 7 total
Tests: 44 passed, 44 total
Snapshots: 0 total
Time: 3.62 s, estimated 10 s
Ran all test suites.
Force exiting Jest: Have you considered using `--detectOpenHandles` to detect async operations that kept running after all tests finished?
```
### With `collectCoverageFrom: ['**/*.js', '!**/jest*js']`
```sh
-------------------------|---------|----------|---------|---------|------------------------------------------------------------
File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
-------------------------|---------|----------|---------|---------|------------------------------------------------------------
All files | 31.09 | 15.49 | 40.71 | 63.94 |
bin | 0 | 100 | 100 | 0 |
fxa-payments-server.js | 0 | 100 | 100 | 0 | 5-7
config | 100 | 100 | 100 | 100 |
index.js | 100 | 100 | 100 | 100 |
coverage/lcov-report | 0 | 0 | 0 | 0 |
block-navigation.js | 0 | 0 | 0 | 0 | 2-87
prettify.js | 0 | 0 | 0 | 0 | 2
sorter.js | 0 | 0 | 0 | 0 | 2-196
lib | 77.11 | 56.36 | 69.7 | 77.11 |
404.js | 14.29 | 0 | 0 | 14.29 | 8-18
amplitude.js | 100 | 100 | 100 | 100 |
csp.js | 100 | 100 | 100 | 100 |
html-middleware.js | 100 | 100 | 100 | 100 |
no-robots.js | 100 | 100 | 100 | 100 |
server.js | 66.04 | 34.48 | 47.06 | 66.04 | 51,122-137,195-196,203-207,222-235,248-264,291,316,329-338
version.js | 88.24 | 83.33 | 100 | 88.24 | 35-36,56-57
lib/csp | 96.97 | 75 | 100 | 96.97 |
blocking.js | 96.77 | 75 | 100 | 96.77 | 127
report-only.js | 100 | 100 | 100 | 100 |
lib/logging | 83.33 | 50 | 60 | 88.24 |
log.js | 100 | 100 | 100 | 100 |
route-logging.js | 81.25 | 50 | 60 | 86.67 | 39,58
lib/routes | 91.6 | 87.5 | 94.12 | 91.38 |
index.js | 100 | 100 | 100 | 100 |
legal-docs.js | 98.59 | 96.43 | 100 | 98.57 | 77
navigation-timing.js | 77.27 | 0 | 75 | 76.19 | 17-25
post-metrics.js | 83.33 | 50 | 100 | 83.33 | 55-60
-------------------------|---------|----------|---------|---------|------------------------------------------------------------
Test Suites: 7 passed, 7 total
Tests: 44 passed, 44 total
Snapshots: 0 total
Time: 10.007 s
Ran all test suites.
Force exiting Jest: Have you considered using `--detectOpenHandles` to detect async operations that kept running after all tests finished?
```
### With `collectCoverageFrom: ['**/*.js', '!bin/*', '!coverage/**', '!**/jest*js']`
```sh
-----------------------|---------|----------|---------|---------|------------------------------------------------------------
File | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
-----------------------|---------|----------|---------|---------|------------------------------------------------------------
All files | 84.38 | 68.04 | 77.97 | 84.47 |
config | 100 | 100 | 100 | 100 |
index.js | 100 | 100 | 100 | 100 |
lib | 77.11 | 56.36 | 69.7 | 77.11 |
404.js | 14.29 | 0 | 0 | 14.29 | 8-18
amplitude.js | 100 | 100 | 100 | 100 |
csp.js | 100 | 100 | 100 | 100 |
html-middleware.js | 100 | 100 | 100 | 100 |
no-robots.js | 100 | 100 | 100 | 100 |
server.js | 66.04 | 34.48 | 47.06 | 66.04 | 51,122-137,195-196,203-207,222-235,248-264,291,316,329-338
version.js | 88.24 | 83.33 | 100 | 88.24 | 35-36,56-57
lib/csp | 96.97 | 75 | 100 | 96.97 |
blocking.js | 96.77 | 75 | 100 | 96.77 | 127
report-only.js | 100 | 100 | 100 | 100 |
lib/logging | 83.33 | 50 | 60 | 88.24 |
log.js | 100 | 100 | 100 | 100 |
route-logging.js | 81.25 | 50 | 60 | 86.67 | 39,58
lib/routes | 91.6 | 87.5 | 94.12 | 91.38 |
index.js | 100 | 100 | 100 | 100 |
legal-docs.js | 98.59 | 96.43 | 100 | 98.57 | 77
navigation-timing.js | 77.27 | 0 | 75 | 76.19 | 17-25
post-metrics.js | 83.33 | 50 | 100 | 83.33 | 55-60
-----------------------|---------|----------|---------|---------|------------------------------------------------------------
Test Suites: 7 passed, 7 total
Tests: 44 passed, 44 total
Snapshots: 0 total
Time: 3.475 s, estimated 4 s
Ran all test suites.
Force exiting Jest: Have you considered using `--detectOpenHandles` to detect async operations that kept running after all tests finished?
```
2022-10-27 10:17:14 -07:00
1ebffd7e48
chore(deps): bump replace-in-file from 6.1.0 to 6.3.5
...
Bumps [replace-in-file](https://github.com/adamreisnz/replace-in-file ) from 6.1.0 to 6.3.5.
- [Release notes](https://github.com/adamreisnz/replace-in-file/releases )
- [Changelog](https://github.com/adamreisnz/replace-in-file/blob/main/CHANGELOG.md )
- [Commits](https://github.com/adamreisnz/replace-in-file/compare/v6.1.0...v6.3.5 )
---
updated-dependencies:
- dependency-name: replace-in-file
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-27 15:46:30 +00:00
6941fd4d64
Merge pull request #14341 from mozilla/dependabot/npm_and_yarn/stylelint-config-recommended-scss-8.0.0
...
chore(deps-dev): bump stylelint-config-recommended-scss from 7.0.0 to 8.0.0
2022-10-27 11:30:45 -04:00
d491b885ef
Merge pull request #14343 from mozilla/dependabot/npm_and_yarn/pm2-5.2.2
...
chore(deps): bump pm2 from 5.1.2 to 5.2.2
2022-10-27 11:29:58 -04:00
d6e43b9359
Merge pull request #14348 from mozilla/dependabot/npm_and_yarn/type-fest-3.1.0
...
chore(deps-dev): bump type-fest from 3.0.0 to 3.1.0
2022-10-27 11:28:58 -04:00
74803c4928
chore(deps): bump @stripe/react-stripe-js from 1.13.0 to 1.14.0
...
Bumps [@stripe/react-stripe-js](https://github.com/stripe/react-stripe-js ) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/stripe/react-stripe-js/releases )
- [Changelog](https://github.com/stripe/react-stripe-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/react-stripe-js/compare/v1.13.0...v1.14.0 )
---
updated-dependencies:
- dependency-name: "@stripe/react-stripe-js"
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-27 06:32:09 +00:00
0702a86273
chore(deps-dev): bump type-fest from 3.0.0 to 3.1.0
...
Bumps [type-fest](https://github.com/sindresorhus/type-fest ) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/sindresorhus/type-fest/releases )
- [Commits](https://github.com/sindresorhus/type-fest/compare/v3.0.0...v3.1.0 )
---
updated-dependencies:
- dependency-name: type-fest
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2022-10-27 06:25:07 +00:00
5374c84759
Merge pull request #14344 from vpomerleau/FXA-6154-update-admin-panel-docs-for-stripe-key
...
docs(admin-panel): Add instructions to set up stripe test key
2022-10-26 16:39:23 -05:00
da7510fec8
Merge pull request #14346 from mozilla/train-244
...
Release 1.244.0
2022-10-26 13:46:26 -07:00
99ff971734
Release 1.244.0
2022-10-26 13:04:00 -07:00
9881e4e3ff
Merge pull request #14345 from mozilla/disable-preview-invoice-frontend-call
...
fix(payments): short Circuit Preview Invoice If Automatic Tax Not Enabled
2022-10-26 12:07:12 -07:00
367738aaa3
Merge pull request #14118 from mozilla/FXA-5480
...
fix(subscriptions): stop upgrade of IAP subscriptions on same product set
2022-10-26 15:01:42 -04:00
6f10eb62e5
disable FE call
2022-10-26 11:39:03 -07:00
9db5491754
docs(admin-panel): Add instructions to set up stripe test key
...
Because:
- With the addition of subscriptions, admin-panel now requires a stripe test key to be added to admin-server, but this change is not documented in admin-panel docs.
- Running the admin-panel without a valid stripe test key results in an error when retrieving account details.
This commit:
- Add instructions in the admin-panel readme about adding a stripe test key or disabling feature flags in the admin-server
Closes #FXA-6154
2022-10-26 11:08:38 -07:00
319554a705
Merge pull request #14337 from mozilla/FXA-6062-generalize-react-app
...
feat(fxa-content-server, fxa-settings): generalize settings app
2022-10-26 10:46:05 -07:00
b6b3f7050f
fix(subscriptions): stop upgrade of IAP subscriptions on same product set
...
Because:
* With the current setup, users are redirected to the iap already subscribed
error page without a clear understanding why their product could not be upgraded
This commit:
* Blocks the upgrade and sends user to error page
* Provides error message directing users to contact our support team for help
* Shows button linking to our support team for users to get help
Closes FXA-5480
2022-10-26 13:45:14 -04:00
cb5a511b3f
feat(fxa-content-server, fxa-settings): generalize settings app
...
Because:
Currently, the React app that shows all of Settings' views is designed to only show routes within Settings. We want to be able to move the remaining backbone views (from the content server) into this React app. Paired with the accompanying experiment PR, we'll be able to gradually roll out this new version of Settings to users without them experiencing any changes.
This commit:
Creates a more generalized version of the Settings app
Moves the existing Settings code into a sub-directory for the sake of clarity. (Future directory structure for new routes will be dictated by the route patterns.)
Creates a "FlowContext" so that flowQueryParams can still be reached by the Settings app.
Checks the status of the experiment and shows a user the appropriate treatment
Closes #https://mozilla-hub.atlassian.net/browse/FXA-6062
Acceptance criteria (from the above jira ticket):
The new version of the app must be able to display urls other than /settings.
It must be able to show routes to unauthenticated users.
The experience of the Settings app within the new version has to retain all functionality and be unchanged for the end user in all ways.
The new version should only be visible to members of the experiment
The old version should appear for anyone not a member of the experiment
Cleanup after full rollout should be straightforward.
Please see the jira ticket above for more detail.
2022-10-26 10:15:48 -07:00
3366d24703
Merge pull request #14194 from mozilla/fxa-5539/display-tax-amount
...
feat(payments): display Tax Amount If Applicable
2022-10-26 09:37:45 -07:00
Vijay Budhram
dependabot[bot]
Barry Chen
Barry Chen
Meghan Sardesai
Reino Muhl
Ivo Plamenac
Bianca Danforth
Dan Schomburg
Meghan Sardesai
Valerie Pomerleau
Lauren Zugai
Peter deHaan
Lisa Chan
Vijay Budhram
dschom
millsoper