Merge pull request #2735 from mozilla/train-147, r=@vladikoff

Train 147 uplift to master
2019-10-03 14:07:19 -04:00 · 2019-10-03 14:07:19 -04:00 · f8a3a3dbdf
--- a/18
+++ b/18
@ -26,12 +26,12 @@ ckarlof
 Dan Callahan
 Danny Amey
 Danny Coates
-dave justice
 Dave Justice
+dave justice
 Deepti
 dependabot[bot]
-divyabiyani
 Divya Biyani
+divyabiyani
 Edouard Oger
 Edwin Wong
 Emin Mastizada
@ -44,8 +44,8 @@ Francois Marier
 Glen Mailer
 Greg Guthe
 Gurjeet Singh
-hannahqd
 Hannah Quay-de la Vallee
+hannahqd
 Heather Booker
 Hector Zhao
 hritvi
@ -58,9 +58,9 @@ Jarek
 Jason Strutz
 jbonacci
 Jed Parsons
-johngruen
 John Gruen
 John Morrison
+johngruen
 Jon Buckley
 Jon Petto
 jotes
@ -70,15 +70,15 @@ Jurgen Brunink
 ka7
 Karan Sapolia
 Kit Cambridge
-larissagaulia
 Larissa Gaulia
+larissagaulia
 Lauren Zugai
 Leif Oines
 Les Orchard
 Lloyd Hilaiel
 luke crouch
-markh@babelzilla.org
 Mark Striemer
+markh@babelzilla.org
 matjaz@mozilla.com
 max thomas
 MeridelW
@ -98,8 +98,8 @@ Nicholas Mandel
 Nick Alexander
 Nick Chapman
 Omkar Yadav
-petercpg@mail.moztw.org
 Peter deHaan
+petercpg@mail.moztw.org
 Phil Booth
 Philip Jenvey
 Princi Vershwal
@ -108,8 +108,8 @@ Ramya Praneetha
 Ramyashree DG
 Renoir Boulanger
 Renovate Bot
-riadhchtara
 Riadh Chtara
+riadhchtara
 Rishi Baldawa
 Robert Kowalski
 Roger Meier
@ -145,5 +145,5 @@ vladikoff
 Wil Clouser
 Xavier RENE-CORAIL
 YFdyh000
-Zachary Carter
 Zach Carter
+Zachary Carter
--- a/packages/fxa-auth-db-mysql/CHANGELOG.md
+++ b/packages/fxa-auth-db-mysql/CHANGELOG.md
@ -1,3 +1,7 @@
+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### Bug fixes
@ -5,6 +9,10 @@
 - build: npm audit fix (4839fcc5e)
 - db: Reset `keysChangedAt` to NULL if we don't know its correct value. (89a8423d4)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 No changes.
--- a/packages/fxa-auth-db-mysql/npm-shrinkwrap.json
+++ b/packages/fxa-auth-db-mysql/npm-shrinkwrap.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-auth-db-mysql",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-auth-db-mysql/package.json
+++ b/packages/fxa-auth-db-mysql/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-auth-db-mysql",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "MySQL backend for Firefox Accounts",
  "main": "index.js",
  "repository": {
--- a/packages/fxa-auth-server/CHANGELOG.md
+++ b/packages/fxa-auth-server/CHANGELOG.md
@ -1,3 +1,7 @@
+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### New features
@ -28,6 +32,10 @@
 - metrics: add sampling rate config for statsd (1c4f6e75a)
 - log: Replace `fatal` error log with `warn` (a7aeb08a9)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 ### Bug fixes
--- a/packages/fxa-auth-server/package-lock.json
+++ b/packages/fxa-auth-server/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-auth-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-auth-server/package.json
+++ b/packages/fxa-auth-server/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-auth-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "Firefox Accounts, an identity provider for Mozilla cloud services",
  "bin": {
    "fxa-auth": "./bin/key_server.js"
--- a/packages/fxa-content-server/CHANGELOG.md
+++ b/packages/fxa-content-server/CHANGELOG.md
@ -1,3 +1,9 @@
+## 1.147.1
+
+### Other changes
+
+-   experiments: Actually enable sign-in codes for all reliers (89fc63cb4)
+
 ## 1.147.0

 ### New features
@ -18,6 +24,12 @@

 -   metrics: de-categorise content server perf events (c1ea6c0c8)

+## 1.146.4
+
+### Other changes
+
+-   experiments: Actually enable sign-in codes for all reliers (89fc63cb4)
+
 ## 1.146.3

 ### Bug fixes
--- a/packages/fxa-content-server/app/scripts/models/auth_brokers/base.js
+++ b/packages/fxa-content-server/app/scripts/models/auth_brokers/base.js
@ -593,7 +593,7 @@ const BaseAuthenticationBroker = Backbone.Model.extend({
    /**
     * Are token codes flow supported?
     */
-    tokenCode: false,
+    tokenCode: true,
  },

  /**
--- a/packages/fxa-content-server/app/scripts/models/auth_brokers/fx-desktop-v3.js
+++ b/packages/fxa-content-server/app/scripts/models/auth_brokers/fx-desktop-v3.js
@ -20,7 +20,7 @@ const FxDesktopV3AuthenticationBroker = FxDesktopV2AuthenticationBroker.extend({
  defaultCapabilities: _.extend({}, proto.defaultCapabilities, {
    allowUidChange: true,
    emailFirst: true,
-    tokenCode: false,
+    tokenCode: true,
  }),

  type: 'fx-desktop-v3',
--- a/packages/fxa-content-server/app/scripts/models/reliers/browser.js
+++ b/packages/fxa-content-server/app/scripts/models/reliers/browser.js
@ -38,7 +38,7 @@ export default Relier.extend({
    doNotSync: false,
    multiService: false,
    signinCode: undefined,
-    tokenCode: false,
+    tokenCode: true,
  }),

  initialize(attributes, options = {}) {
--- a/packages/fxa-content-server/npm-shrinkwrap.json
+++ b/packages/fxa-content-server/npm-shrinkwrap.json
@ -1,6 +1,6 @@
 {
    "name": "fxa-content-server",
-    "version": "1.147.0",
+    "version": "1.147.1",
    "lockfileVersion": 1,
    "requires": true,
    "dependencies": {
--- a/packages/fxa-content-server/package.json
+++ b/packages/fxa-content-server/package.json
@ -1,6 +1,6 @@
 {
    "name": "fxa-content-server",
-    "version": "1.147.0",
+    "version": "1.147.1",
    "description": "Firefox Accounts Content Server",
    "scripts": {
        "build-production": "NODE_ENV=production grunt build",
--- a/packages/fxa-customs-server/CHANGELOG.md
+++ b/packages/fxa-customs-server/CHANGELOG.md
@ -1,3 +1,7 @@
+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### New features
@ -11,6 +15,10 @@
 - dataflow: ensure old-format messages don't clog the queue (b10a483a5)
 - dataflow: ignore old message from dataflow queue (2dafaf378)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 No changes.
--- a/packages/fxa-customs-server/package-lock.json
+++ b/packages/fxa-customs-server/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-customs-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-customs-server/package.json
+++ b/packages/fxa-customs-server/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-customs-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "Firefox Accounts Customs Server",
  "author": "Mozilla (https://mozilla.org/)",
  "license": "MPL-2.0",
--- a/packages/fxa-email-event-proxy/package-lock.json
+++ b/packages/fxa-email-event-proxy/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-email-event-proxy",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-email-event-proxy/package.json
+++ b/packages/fxa-email-event-proxy/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-email-event-proxy",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "Proxies events from Sendgrid to FxA SQS queues",
  "main": "index.js",
  "scripts": {
--- a/packages/fxa-email-service/CHANGELOG.md
+++ b/packages/fxa-email-service/CHANGELOG.md
@ -1,3 +1,7 @@
+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### Other changes
@ -6,6 +10,10 @@
 - config: remove fxa-email-service circleci config (9d9609ca6)
 - deps: update email service deps ## 1.146.3 rust version (0e7fa07a9)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 No changes.
--- a/packages/fxa-email-service/Cargo.lock
+++ b/packages/fxa-email-service/Cargo.lock
@ -689,7 +689,7 @@ dependencies = [

 [[package]]
 name = "fxa_email_service"
-version = "1.147.0"
+version = "1.147.1"
 dependencies = [
 "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/packages/fxa-email-service/Cargo.toml
+++ b/packages/fxa-email-service/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "fxa_email_service"
-version = "1.147.0"
+version = "1.147.1"
 publish = false
 edition = "2018"

--- a/packages/fxa-event-broker/CHANGELOG.md
+++ b/packages/fxa-event-broker/CHANGELOG.md
@ -1,5 +1,9 @@
 # Change history

+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### New features
@ -11,6 +15,10 @@
 - event-broker: add interface Version (942100a80)
 - event-broker: response to /**version** route (7a7a148bc)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 No changes.
--- a/packages/fxa-event-broker/package-lock.json
+++ b/packages/fxa-event-broker/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-event-broker",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-event-broker/package.json
+++ b/packages/fxa-event-broker/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-event-broker",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "Firefox Accounts Event Broker",
  "scripts": {
    "build": "./node_modules/typescript/bin/tsc",
--- a/packages/fxa-geodb/CHANGELOG.md
+++ b/packages/fxa-geodb/CHANGELOG.md
@ -1,5 +1,9 @@
 # Change history

+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### Bug fixes
@ -10,6 +14,10 @@

 - deps: Update fxa-geodb to use nyc, not istanbul (ab5d2c2c6)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 No changes.
--- a/packages/fxa-geodb/package-lock.json
+++ b/packages/fxa-geodb/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-geodb",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-geodb/package.json
+++ b/packages/fxa-geodb/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-geodb",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "private": false,
  "description": "Firefox Accounts GeoDB Repo for Geolocation based services",
  "main": "lib/fxa-geodb.js",
--- a/packages/fxa-payments-server/CHANGELOG.md
+++ b/packages/fxa-payments-server/CHANGELOG.md
@ -1,5 +1,9 @@
 # Change history

+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### New features
@ -17,6 +21,10 @@

 - legal: update payments server footer links (69e13ae50)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 ### Bug fixes
--- a/packages/fxa-payments-server/package-lock.json
+++ b/packages/fxa-payments-server/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-payments-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-payments-server/package.json
+++ b/packages/fxa-payments-server/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-payments-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "Firefox Accounts Payments Service",
  "scripts": {
    "lint": "npm-run-all --parallel lint:*",
--- a/packages/fxa-profile-server/CHANGELOG.md
+++ b/packages/fxa-profile-server/CHANGELOG.md
@ -1,3 +1,7 @@
+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### Bug fixes
@ -5,6 +9,10 @@
 - build: Add nsp exception to auth and profile servers (63e4708ef)
 - build: npm audit fix (4839fcc5e)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 No changes.
--- a/packages/fxa-profile-server/package-lock.json
+++ b/packages/fxa-profile-server/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-profile-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-profile-server/package.json
+++ b/packages/fxa-profile-server/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-profile-server",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "private": true,
  "description": "Firefox Accounts Profile service.",
  "scripts": {
--- a/packages/fxa-shared/CHANGELOG.md
+++ b/packages/fxa-shared/CHANGELOG.md
@ -1,11 +1,19 @@
 # Change history

+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### Bug fixes

 - docs: update feature-flag readme with monorepo details (f9a49a667)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 No changes.
--- a/packages/fxa-shared/package-lock.json
+++ b/packages/fxa-shared/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-shared",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-shared/package.json
+++ b/packages/fxa-shared/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-shared",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "Shared module for FxA repositories",
  "main": "dist/index.js",
  "scripts": {
--- a/packages/fxa-support-panel/CHANGELOG.md
+++ b/packages/fxa-support-panel/CHANGELOG.md
@ -1,11 +1,19 @@
 # Change history

+## 1.147.1
+
+No changes.
+
 ## 1.147.0

 ### Bug fixes

 - build: npm audit fix (4839fcc5e)

+## 1.146.4
+
+No changes.
+
 ## 1.146.3

 ### Bug fixes
--- a/packages/fxa-support-panel/package-lock.json
+++ b/packages/fxa-support-panel/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-support-panel",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/packages/fxa-support-panel/package.json
+++ b/packages/fxa-support-panel/package.json
@ -1,6 +1,6 @@
 {
  "name": "fxa-support-panel",
-  "version": "1.147.0",
+  "version": "1.147.1",
  "description": "Small app to help customer support access FxA details",
  "directories": {
    "test": "test"