Skip to content

Commit 419af1b

Browse files
committed
chore(content): Update refs to use libs instead of fxa-shared
Because: - Cleaning up code duplication This Commit: - References @fxa/shared/sentry - References @fxa/shared/otel - References @fxa/shared/monitoring
1 parent 15dc309 commit 419af1b

9 files changed

Lines changed: 17 additions & 24 deletions

File tree

packages/fxa-content-server/app/scripts/lib/sentry.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44
import * as Sentry from '@sentry/browser';
55

6-
import {
7-
buildSentryConfig,
8-
tagCriticalEvent,
9-
tagFxaName,
10-
} from 'fxa-shared/sentry';
6+
import { buildSentryConfig, tagFxaName } from '@fxa/shared/sentry-utils';
117
import _ from 'underscore';
128

139
import Logger from './logger';
@@ -22,7 +18,6 @@ import Logger from './logger';
2218
* @private
2319
*/
2420
function beforeSend(data) {
25-
data = tagCriticalEvent(data);
2621
if (data && data.request) {
2722
if (data.tags) {
2823
const errno = data.tags.errno;

packages/fxa-content-server/app/scripts/models/reliers/oauth.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ var OAuthRelier = Relier.extend({
402402
this._wantsScopeThatHasKeys = true;
403403
} else {
404404
// Requesting keys, but trying to deliver them to an unexpected uri? Nope.
405+
console.warn('Invalid redirect URI' + this.get('redirectUri'));
405406
throw new Error('Invalid redirect parameter');
406407
}
407408
}

packages/fxa-content-server/server/lib/routes/get-update-firefox.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ const { logFlowEvent } = require('../flow-event');
1111
const Url = require('url');
1212
const uuid = require('node-uuid');
1313
const validation = require('../validation');
14-
const {
15-
overrideJoiMessages,
16-
} = require('fxa-shared/sentry/joi-message-overrides');
14+
const { overrideJoiMessages } = require('@fxa/shared/sentry-node');
1715

1816
const {
1917
ACTION: ACTION_TYPE,

packages/fxa-content-server/server/lib/routes/post-csp.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ const joi = require('joi');
1212
const logger = require('../logging/log')();
1313
const url = require('url');
1414
const validation = require('../validation');
15-
const {
16-
overrideJoiMessages,
17-
} = require('fxa-shared/sentry/joi-message-overrides');
15+
const { overrideJoiMessages } = require('@fxa/shared/sentry-node');
1816

1917
const INTEGER_TYPE = validation.TYPES.INTEGER;
2018
const STRING_TYPE = validation.TYPES.LONG_STRING;

packages/fxa-content-server/server/lib/routes/post-metrics.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ const joi = require('joi');
1212
const logger = require('../logging/log')('server.post-metrics');
1313
const MetricsCollector = require('../metrics-collector-stderr');
1414
const validation = require('../validation');
15-
const {
16-
overrideJoiMessages,
17-
} = require('fxa-shared/sentry/joi-message-overrides');
15+
const { overrideJoiMessages } = require('@fxa/shared/sentry-node');
1816

1917
const clientMetricsConfig = config.get('client_metrics');
2018
const DISABLE_CLIENT_METRICS_STDERR =

packages/fxa-content-server/server/lib/routes/post-nimbus-experiments.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44

55
const joi = require('joi');
66
const Sentry = require('@sentry/node');
7-
const {
8-
overrideJoiMessages,
9-
} = require('fxa-shared/sentry/joi-message-overrides');
7+
const { overrideJoiMessages } = require('@fxa/shared/sentry-node');
108

119
const BODY_SCHEMA = {
1210
client_id: joi.string().required(),
@@ -60,7 +58,8 @@ module.exports = function (config, statsd) {
6058
statsd.increment('cirrus.experiment-fetch-success');
6159
}
6260
} catch (err) {
63-
const isTimeout = err.name === 'AbortError' || err.name === 'TimeoutError';
61+
const isTimeout =
62+
err.name === 'AbortError' || err.name === 'TimeoutError';
6463

6564
if (statsd) {
6665
statsd.increment('cirrus.experiment-fetch-error');
@@ -74,7 +73,7 @@ module.exports = function (config, statsd) {
7473
Sentry.captureException(err, {
7574
tags: {
7675
source: 'nimbus-experiments',
77-
}
76+
},
7877
});
7978
}
8079

packages/fxa-content-server/server/lib/routes/redirect-download-firefox.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
const amplitude = require('../amplitude');
1515
const { logFlowEvent } = require('../flow-event');
1616
const validation = require('../validation');
17-
const {
18-
overrideJoiMessages,
19-
} = require('fxa-shared/sentry/joi-message-overrides');
17+
const { overrideJoiMessages } = require('@fxa/shared/sentry-node');
2018

2119
const {
2220
ACTION: ACTION_TYPE,

packages/fxa-content-server/server/lib/sentry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
const Sentry = require('@sentry/node');
66
const config = require('./configuration');
77
const RELEASE = require('../../package.json').version;
8-
const { buildSentryConfig, tagFxaName } = require('fxa-shared/sentry');
8+
const { buildSentryConfig, tagFxaName } = require('@fxa/shared/sentry-utils');
99
const logger = require('./logging/log')('sentry');
1010

1111
if (config.get('sentry.dsn')) {

packages/fxa-content-server/webpack.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const webpack = require('webpack');
77
const path = require('path');
88
const config = require('./server/lib/configuration').getProperties();
99
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
10+
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
1011

1112
const ENV = config.env;
1213
const webpackConfig = {
@@ -56,6 +57,11 @@ const webpackConfig = {
5657
path.resolve(__dirname, 'node_modules'),
5758
'node_modules',
5859
],
60+
plugins: [
61+
new TsconfigPathsPlugin({
62+
configFile: path.resolve(__dirname, '../../tsconfig.base.json'),
63+
}),
64+
],
5965
alias: {
6066
'chosen-js': require.resolve('chosen-js/public/chosen.jquery'),
6167
'cocktail-lib': require.resolve('backbone.cocktail/Cocktail'),

0 commit comments

Comments
 (0)