Skip to content
Permalink
Browse files

Merge train-141 into master

#1739
r=shane-tomlinson
  • Loading branch information...
philbooth committed Jul 11, 2019
2 parents eca7cd4 + f2a5c61 commit 33be5fe03d2dfa7addff6163e54d14c5e8f63faf
@@ -1,3 +1,17 @@
## 1.141.3

No changes.

## 1.141.2

### Other changes

- package: manually bump version strings to 1.141.1 (737265b25)

## 1.141.1

No changes.

## 1.141.0

### New features

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-auth-db-mysql",
"version": "1.141.0",
"version": "1.141.3",
"description": "MySQL backend for Firefox Accounts",
"main": "index.js",
"repository": {
@@ -1,3 +1,19 @@
## 1.141.3

### Bug fixes

- api: prevent /account/destroy failing due to subhub errors (bfede8ef5)

## 1.141.2

### Other changes

- package: manually bump version strings to 1.141.1 (737265b25)

## 1.141.1

No changes.

## 1.141.0

### New features
@@ -307,12 +307,13 @@ module.exports = function(log, config) {
try {
return await api.deleteCustomer(uid);
} catch (err) {
log.error('subhub.deleteCustomer.failed', { uid, err });

if (err.statusCode === 404) {
throw error.unknownCustomer(uid);
// This method is called optimistically, so swallow `unknownCustomer` errors.
return { message: 'unknown customer' };
}

log.error('subhub.deleteCustomer.failed', { uid, err });

throw err;
}
},

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-auth-server",
"version": "1.141.0",
"version": "1.141.3",
"description": "Firefox Accounts, an identity provider for Mozilla cloud services",
"bin": {
"fxa-auth": "./bin/key_server.js"
@@ -2780,6 +2780,19 @@ describe('/account/destroy', () => {
});
});

it('should fail if subhub.deleteCustomer fails', async () => {
mockSubhub.deleteCustomer = sinon.spy(async function() {
throw new Error('wibble');
});
let failed = false;
try {
await runTest(buildRoute(), mockRequest);
} catch (err) {
failed = true;
}
assert.isTrue(failed);
});

it('should not attempt to cancel subscriptions with config.subscriptions.enabled = false', async () => {
const route = buildRoute(false);
return runTest(route, mockRequest, () => {
@@ -567,11 +567,20 @@ describe('subhub client', () => {
assert.deepEqual(response, { message: 'wibble' });
});

it('should throw on unknown user', async () => {
it('should not fail for unknown user', async () => {
mockServer
.delete(`/v1/customer/${UID}`)
.reply(404, { message: 'invalid uid' });
const { subhub } = makeSubject();
const response = await subhub.deleteCustomer(UID);
assert.deepEqual(response, { message: 'unknown customer' });
});

it('should fail for other errors', async () => {
mockServer
.delete(`/v1/customer/${UID}`)
.reply(400, { message: 'wibble' });
const { subhub } = makeSubject();

let failed = false;

@@ -580,7 +589,7 @@ describe('subhub client', () => {
} catch (err) {
failed = true;

assert.equal(err.errno, error.ERRNO.UNKNOWN_SUBSCRIPTION_CUSTOMER);
assert.equal(err.message, 'wibble');
}

assert.isTrue(failed);
@@ -1,3 +1,11 @@
## 1.141.3

No changes.

## 1.141.2

No changes.

## 1.141.1

### New features

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-content-server",
"version": "1.141.1",
"version": "1.141.3",
"description": "Firefox Accounts Content Server",
"scripts": {
"build-production": "NODE_ENV=production grunt build",
@@ -1,3 +1,17 @@
## 1.141.3

No changes.

## 1.141.2

### Other changes

- package: manually bump version strings to 1.141.1 (737265b25)

## 1.141.1

No changes.

## 1.141.0

### Bug fixes

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-customs-server",
"version": "1.141.0",
"version": "1.141.3",
"description": "Firefox Accounts Customs Server",
"author": "Mozilla (https://mozilla.org/)",
"license": "MPL-2.0",

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-email-event-proxy",
"version": "1.141.0",
"version": "1.141.3",
"description": "Proxies events from Sendgrid to FxA SQS queues",
"main": "index.js",
"scripts": {
@@ -1,3 +1,17 @@
## 1.141.3

No changes.

## 1.141.2

### Other changes

- package: manually bump version strings to 1.141.1 (737265b25)

## 1.141.1

No changes.

## 1.141.0

### Bug fixes

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-event-broker",
"version": "1.137.1",
"version": "1.141.3",
"description": "Firefox Accounts Event Broker",
"scripts": {
"build": "./node_modules/typescript/bin/tsc",

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-payments-server",
"version": "0.0.1",
"version": "1.141.3",
"description": "Firefox Accounts Payments Service",
"scripts": {
"lint": "npm-run-all --parallel lint:*",
@@ -1,3 +1,17 @@
## 1.141.3

No changes.

## 1.141.2

### Other changes

- package: manually bump version strings to 1.141.1 (737265b25)

## 1.141.1

No changes.

## 1.141.0

### Other changes

Some generated files are not rendered by default. Learn more.

@@ -1,6 +1,6 @@
{
"name": "fxa-profile-server",
"version": "1.141.0",
"version": "1.141.3",
"private": true,
"description": "Firefox Accounts Profile service.",
"scripts": {
@@ -299,6 +299,7 @@ packages/fxa-customs-server
packages/fxa-email-event-proxy
packages/fxa-email-service
packages/fxa-event-broker
packages/fxa-payments-server
packages/fxa-profile-server"

for TARGET in $TARGETS; do

0 comments on commit 33be5fe

Please sign in to comment.
You can’t perform that action at this time.