From 7f1bccf601ce790b94eff1251c15137cefddedde Mon Sep 17 00:00:00 2001 From: Wil Clouser Date: Fri, 8 Jul 2022 09:32:45 -0700 Subject: [PATCH 1/2] feat(pair): Show Fx View when version >= 106 Because: * We guessed on a version for when to show Firefox View and we've been asked to change to 106 This commit: * Changes the version to 106 Closes FXA-5460 --- .../app/scripts/views/pair/auth_complete.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/fxa-content-server/app/scripts/views/pair/auth_complete.js b/packages/fxa-content-server/app/scripts/views/pair/auth_complete.js index 625a92e46d..2350dd3406 100644 --- a/packages/fxa-content-server/app/scripts/views/pair/auth_complete.js +++ b/packages/fxa-content-server/app/scripts/views/pair/auth_complete.js @@ -23,7 +23,7 @@ class PairAuthCompleteView extends FormView { super.initialize(options); this._notificationChannel = this.createWebchannel(); } - + createWebchannel() { const channel = new WebChannel(Constants.ACCOUNT_UPDATES_WEBCHANNEL_ID); channel.initialize({ @@ -32,7 +32,7 @@ class PairAuthCompleteView extends FormView { return channel; } - + beforeRender() { return this.invokeBrokerMethod('afterPairAuthComplete'); } @@ -41,11 +41,11 @@ class PairAuthCompleteView extends FormView { const deviceContext = assign({}, this.broker.get('remoteMetaData')); const graphicId = this.getGraphicsId(); - context.set({ + context.set({ graphicId, deviceFamily: deviceContext.family, deviceOS: deviceContext.OS, - hasFirefoxViewSupport: this._hasFirefoxViewSupport() + hasFirefoxViewSupport: this._hasFirefoxViewSupport(), }); } @@ -53,7 +53,7 @@ class PairAuthCompleteView extends FormView { const channel = this._notificationChannel; return channel.send(channel.COMMANDS.FIREFOX_VIEW, { // TODO: What is the correct entrypoint value? - entryPoint: "preferences" + entryPoint: 'preferences', }); } @@ -63,14 +63,14 @@ class PairAuthCompleteView extends FormView { // Currently, only supported in FF Nightly // For local testing, override this to true - return uap.isFirefoxDesktop() && browserVersion >= 104; + return uap.isFirefoxDesktop() && browserVersion >= 106; } } Cocktail.mixin( PairAuthCompleteView, DeviceBeingPairedMixin(), - PairingGraphicsMixin, + PairingGraphicsMixin ); export default PairAuthCompleteView; From ab86475903f34f1201a3f29bcafa87650bf17358 Mon Sep 17 00:00:00 2001 From: Ivo Plamenac Date: Fri, 8 Jul 2022 13:59:34 -0700 Subject: [PATCH 2/2] Release 1.236.1 --- packages/fxa-admin-panel/CHANGELOG.md | 4 ++++ packages/fxa-admin-panel/package.json | 2 +- packages/fxa-admin-server/CHANGELOG.md | 4 ++++ packages/fxa-admin-server/package.json | 2 +- packages/fxa-auth-server/CHANGELOG.md | 4 ++++ packages/fxa-auth-server/package.json | 2 +- packages/fxa-content-server/CHANGELOG.md | 6 ++++++ packages/fxa-content-server/package.json | 2 +- packages/fxa-customs-server/CHANGELOG.md | 4 ++++ packages/fxa-customs-server/package.json | 2 +- packages/fxa-event-broker/CHANGELOG.md | 4 ++++ packages/fxa-event-broker/package.json | 2 +- packages/fxa-geodb/CHANGELOG.md | 4 ++++ packages/fxa-geodb/package.json | 2 +- packages/fxa-graphql-api/CHANGELOG.md | 4 ++++ packages/fxa-graphql-api/package.json | 2 +- packages/fxa-payments-server/CHANGELOG.md | 4 ++++ packages/fxa-payments-server/package.json | 2 +- packages/fxa-profile-server/CHANGELOG.md | 4 ++++ packages/fxa-profile-server/package.json | 2 +- packages/fxa-react/CHANGELOG.md | 4 ++++ packages/fxa-react/package.json | 2 +- packages/fxa-settings/CHANGELOG.md | 4 ++++ packages/fxa-settings/package.json | 2 +- packages/fxa-shared/CHANGELOG.md | 4 ++++ packages/fxa-shared/package.json | 2 +- packages/fxa-support-panel/CHANGELOG.md | 4 ++++ packages/fxa-support-panel/package.json | 2 +- 28 files changed, 72 insertions(+), 14 deletions(-) diff --git a/packages/fxa-admin-panel/CHANGELOG.md b/packages/fxa-admin-panel/CHANGELOG.md index e14b319d3d..83c1c554b2 100644 --- a/packages/fxa-admin-panel/CHANGELOG.md +++ b/packages/fxa-admin-panel/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 ### Other changes diff --git a/packages/fxa-admin-panel/package.json b/packages/fxa-admin-panel/package.json index 0d27f04c90..7b2dc8f32b 100644 --- a/packages/fxa-admin-panel/package.json +++ b/packages/fxa-admin-panel/package.json @@ -1,6 +1,6 @@ { "name": "fxa-admin-panel", - "version": "1.236.0", + "version": "1.236.1", "description": "FxA Admin Panel", "scripts": { "build-css": "tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css", diff --git a/packages/fxa-admin-server/CHANGELOG.md b/packages/fxa-admin-server/CHANGELOG.md index f2ce4cc7f9..8012f24c90 100644 --- a/packages/fxa-admin-server/CHANGELOG.md +++ b/packages/fxa-admin-server/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 ### New features diff --git a/packages/fxa-admin-server/package.json b/packages/fxa-admin-server/package.json index 2d2ec036ac..1fca34efe0 100644 --- a/packages/fxa-admin-server/package.json +++ b/packages/fxa-admin-server/package.json @@ -1,6 +1,6 @@ { "name": "fxa-admin-server", - "version": "1.236.0", + "version": "1.236.1", "description": "FxA GraphQL Admin Server", "scripts": { "prebuild": "rimraf dist", diff --git a/packages/fxa-auth-server/CHANGELOG.md b/packages/fxa-auth-server/CHANGELOG.md index 813f6e38f0..6c467908ca 100644 --- a/packages/fxa-auth-server/CHANGELOG.md +++ b/packages/fxa-auth-server/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 ### New features diff --git a/packages/fxa-auth-server/package.json b/packages/fxa-auth-server/package.json index 93b92752be..5002ba5aff 100644 --- a/packages/fxa-auth-server/package.json +++ b/packages/fxa-auth-server/package.json @@ -1,6 +1,6 @@ { "name": "fxa-auth-server", - "version": "1.236.0", + "version": "1.236.1", "description": "Firefox Accounts, an identity provider for Mozilla cloud services", "bin": { "fxa-auth": "./bin/key_server.js" diff --git a/packages/fxa-content-server/CHANGELOG.md b/packages/fxa-content-server/CHANGELOG.md index f30bd79e3f..b66f856a40 100644 --- a/packages/fxa-content-server/CHANGELOG.md +++ b/packages/fxa-content-server/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.236.1 + +### New features + +- pair: Show Fx View when version >= 106 Because: ([7f1bccf601](https://github.com/mozilla/fxa/commit/7f1bccf601)) + ## 1.236.0 ### New features diff --git a/packages/fxa-content-server/package.json b/packages/fxa-content-server/package.json index 90a13f721e..ff3aa09ec8 100644 --- a/packages/fxa-content-server/package.json +++ b/packages/fxa-content-server/package.json @@ -1,6 +1,6 @@ { "name": "fxa-content-server", - "version": "1.236.0", + "version": "1.236.1", "description": "Firefox Accounts Content Server", "scripts": { "build": "tsc --build ../fxa-react && NODE_ENV=production grunt build", diff --git a/packages/fxa-customs-server/CHANGELOG.md b/packages/fxa-customs-server/CHANGELOG.md index 0ad12ff156..0d50bdf0c4 100644 --- a/packages/fxa-customs-server/CHANGELOG.md +++ b/packages/fxa-customs-server/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 No changes. diff --git a/packages/fxa-customs-server/package.json b/packages/fxa-customs-server/package.json index 36f9e2e8dc..b334f458f6 100644 --- a/packages/fxa-customs-server/package.json +++ b/packages/fxa-customs-server/package.json @@ -1,6 +1,6 @@ { "name": "fxa-customs-server", - "version": "1.236.0", + "version": "1.236.1", "description": "Firefox Accounts Customs Server", "author": "Mozilla (https://mozilla.org/)", "license": "MPL-2.0", diff --git a/packages/fxa-event-broker/CHANGELOG.md b/packages/fxa-event-broker/CHANGELOG.md index 00305bd235..163ba7c5bc 100644 --- a/packages/fxa-event-broker/CHANGELOG.md +++ b/packages/fxa-event-broker/CHANGELOG.md @@ -1,5 +1,9 @@ # Change history +## 1.236.1 + +No changes. + ## 1.236.0 ### Other changes diff --git a/packages/fxa-event-broker/package.json b/packages/fxa-event-broker/package.json index 837e965abc..751d524acc 100644 --- a/packages/fxa-event-broker/package.json +++ b/packages/fxa-event-broker/package.json @@ -1,6 +1,6 @@ { "name": "fxa-event-broker", - "version": "1.236.0", + "version": "1.236.1", "description": "Firefox Accounts Event Broker", "scripts": { "audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-", diff --git a/packages/fxa-geodb/CHANGELOG.md b/packages/fxa-geodb/CHANGELOG.md index 532bd6b9a2..0d9c03d649 100644 --- a/packages/fxa-geodb/CHANGELOG.md +++ b/packages/fxa-geodb/CHANGELOG.md @@ -1,5 +1,9 @@ # Change history +## 1.236.1 + +No changes. + ## 1.236.0 ### Other changes diff --git a/packages/fxa-geodb/package.json b/packages/fxa-geodb/package.json index c3a9489a7b..f0f2f61d44 100644 --- a/packages/fxa-geodb/package.json +++ b/packages/fxa-geodb/package.json @@ -1,6 +1,6 @@ { "name": "fxa-geodb", - "version": "1.236.0", + "version": "1.236.1", "description": "Firefox Accounts GeoDB Repo for Geolocation based services", "main": "lib/fxa-geodb.js", "directories": { diff --git a/packages/fxa-graphql-api/CHANGELOG.md b/packages/fxa-graphql-api/CHANGELOG.md index 79af29cb60..3102c93615 100644 --- a/packages/fxa-graphql-api/CHANGELOG.md +++ b/packages/fxa-graphql-api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 ### Other changes diff --git a/packages/fxa-graphql-api/package.json b/packages/fxa-graphql-api/package.json index d1b49544f8..2bebae6501 100644 --- a/packages/fxa-graphql-api/package.json +++ b/packages/fxa-graphql-api/package.json @@ -1,6 +1,6 @@ { "name": "fxa-graphql-api", - "version": "1.236.0", + "version": "1.236.1", "description": "FxA GraphQL API", "scripts": { "prebuild": "rimraf dist", diff --git a/packages/fxa-payments-server/CHANGELOG.md b/packages/fxa-payments-server/CHANGELOG.md index d34b88d1dc..790f97123e 100644 --- a/packages/fxa-payments-server/CHANGELOG.md +++ b/packages/fxa-payments-server/CHANGELOG.md @@ -1,5 +1,9 @@ # Change history +## 1.236.1 + +No changes. + ## 1.236.0 ### New features diff --git a/packages/fxa-payments-server/package.json b/packages/fxa-payments-server/package.json index 5758e262c1..0baf78ce79 100644 --- a/packages/fxa-payments-server/package.json +++ b/packages/fxa-payments-server/package.json @@ -1,6 +1,6 @@ { "name": "fxa-payments-server", - "version": "1.236.0", + "version": "1.236.1", "description": "Firefox Accounts Payments Service", "scripts": { "build-css": "tailwindcss -i ./src/styles/tailwind.css -o ./src/styles/tailwind.out.css", diff --git a/packages/fxa-profile-server/CHANGELOG.md b/packages/fxa-profile-server/CHANGELOG.md index 2fb2619c9f..a289d2a226 100644 --- a/packages/fxa-profile-server/CHANGELOG.md +++ b/packages/fxa-profile-server/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 ### Other changes diff --git a/packages/fxa-profile-server/package.json b/packages/fxa-profile-server/package.json index 3435bd38dd..3308dc0cf4 100644 --- a/packages/fxa-profile-server/package.json +++ b/packages/fxa-profile-server/package.json @@ -1,6 +1,6 @@ { "name": "fxa-profile-server", - "version": "1.236.0", + "version": "1.236.1", "private": true, "description": "Firefox Accounts Profile service.", "scripts": { diff --git a/packages/fxa-react/CHANGELOG.md b/packages/fxa-react/CHANGELOG.md index b0e7ca20ff..c43a7cb137 100644 --- a/packages/fxa-react/CHANGELOG.md +++ b/packages/fxa-react/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 ### Bug fixes diff --git a/packages/fxa-react/package.json b/packages/fxa-react/package.json index 99aad72ad7..61e04d9034 100644 --- a/packages/fxa-react/package.json +++ b/packages/fxa-react/package.json @@ -1,6 +1,6 @@ { "name": "fxa-react", - "version": "1.236.0", + "version": "1.236.1", "description": "Shared components for FxA React Apps", "exports": { "./components/": "./dist/components/", diff --git a/packages/fxa-settings/CHANGELOG.md b/packages/fxa-settings/CHANGELOG.md index a9fbb94702..eb7de2af9d 100644 --- a/packages/fxa-settings/CHANGELOG.md +++ b/packages/fxa-settings/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.236.1 + +No changes. + ## 1.236.0 ### Bug fixes diff --git a/packages/fxa-settings/package.json b/packages/fxa-settings/package.json index 7c7e41fd31..9db81a6d40 100644 --- a/packages/fxa-settings/package.json +++ b/packages/fxa-settings/package.json @@ -1,6 +1,6 @@ { "name": "fxa-settings", - "version": "1.236.0", + "version": "1.236.1", "homepage": "https://accounts.firefox.com/settings", "private": true, "scripts": { diff --git a/packages/fxa-shared/CHANGELOG.md b/packages/fxa-shared/CHANGELOG.md index 2618e61a4d..7fb5619624 100644 --- a/packages/fxa-shared/CHANGELOG.md +++ b/packages/fxa-shared/CHANGELOG.md @@ -1,5 +1,9 @@ # Change history +## 1.236.1 + +No changes. + ## 1.236.0 ### New features diff --git a/packages/fxa-shared/package.json b/packages/fxa-shared/package.json index d49cdf02ef..09844eaf7f 100644 --- a/packages/fxa-shared/package.json +++ b/packages/fxa-shared/package.json @@ -1,6 +1,6 @@ { "name": "fxa-shared", - "version": "1.236.0", + "version": "1.236.1", "description": "Shared module for FxA repositories", "main": "dist/index.js", "exports": { diff --git a/packages/fxa-support-panel/CHANGELOG.md b/packages/fxa-support-panel/CHANGELOG.md index 52cac4eb1f..6d7aa0bdf6 100644 --- a/packages/fxa-support-panel/CHANGELOG.md +++ b/packages/fxa-support-panel/CHANGELOG.md @@ -1,5 +1,9 @@ # Change history +## 1.236.1 + +No changes. + ## 1.236.0 ### New features diff --git a/packages/fxa-support-panel/package.json b/packages/fxa-support-panel/package.json index 9ac778f691..447bc46718 100644 --- a/packages/fxa-support-panel/package.json +++ b/packages/fxa-support-panel/package.json @@ -1,6 +1,6 @@ { "name": "fxa-support-panel", - "version": "1.236.0", + "version": "1.236.1", "description": "Small app to help customer support access FxA details", "directories": { "test": "test"