polish(auth): Normalize fxa-shared require references

packages/fxa-auth-server/config/popular-email-domains.js

@@ -4,6 +4,6 @@
 
 'use strict';
 
-const popularDomains = require('fxa-shared').email.popularDomains;
+const { popularDomains } = require('fxa-shared/email');
 
 module.exports = new Set(popularDomains);

packages/fxa-auth-server/lib/log.js

@@ -10,7 +10,7 @@ const mozlog = require('mozlog');
 const { config } = require('../config');
 const logConfig = config.get('log');
 const amplitudeConfig = config.get('amplitude');
-const validateAmplitudeEvent = require('fxa-shared').metrics.amplitude.validate;
+const { amplitude } = require('fxa-shared/metrics/amplitude');
 let statsd;
 const Sentry = require('@sentry/node');
 const notifier = require('./notifier');
@@ -251,7 +251,7 @@ Lug.prototype.amplitudeEvent = function (data) {
 
   if (amplitudeConfig.schemaValidation) {
     try {
-      validateAmplitudeEvent(data);
+      amplitude.validate(data);
     } catch (err) {
       this.error('amplitude.validationError', { err, amplitudeEvent: data });
 

packages/fxa-auth-server/lib/oauth/auth_client_management.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth').scopes;
 
 const { OauthError } = require('@fxa/accounts/errors');
 const token = require('./token');

packages/fxa-auth-server/lib/oauth/authorized_clients.js

@@ -4,7 +4,7 @@
 
 const { OauthError } = require('@fxa/accounts/errors');
 const oauthDB = require('./db');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 // Helper function to render each returned record in the expected form.
 function serialize(clientIdHex, token) {

packages/fxa-auth-server/lib/oauth/db/mysql/index.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const encrypt = require('fxa-shared/auth/encrypt');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const unique = require('../../unique');
 const AccessToken = require('../accessToken');
 

packages/fxa-auth-server/lib/oauth/grant.js

@@ -9,7 +9,7 @@ const { config } = require('../../config');
 const { OauthError } = require('@fxa/accounts/errors');
 const db = require('./db');
 const util = require('./util');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const JWTAccessToken = require('./jwt_access_token');
 const sub = require('./jwt_sub');
 

packages/fxa-auth-server/lib/oauth/token.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 const { OauthError } = require('@fxa/accounts/errors');
 const { config } = require('../../config');

packages/fxa-auth-server/lib/oauth/validators.js

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const Joi = require('joi');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const authServerValidators = require('../routes/validators');
 
 const { config } = require('../../config');

packages/fxa-auth-server/lib/routes/emails.js

@@ -15,7 +15,7 @@ const { FxaMailer } = require('../senders/fxa-mailer');
 const { FxaMailerFormat } = require('../senders/fxa-mailer-format');
 const validators = require('./validators');
 const { reportSentryError } = require('../sentry');
-const { emailsMatch, normalizeEmail } = require('fxa-shared').email.helpers;
+const { emailsMatch, normalizeEmail } = require('fxa-shared/email/helpers');
 const { recordSecurityEvent } = require('./utils/security-event');
 const EMAILS_DOCS = require('../../docs/swagger/emails-api').default;
 const DESCRIPTION = require('../../docs/swagger/shared/descriptions').default;

packages/fxa-auth-server/lib/routes/oauth/token.js

@@ -50,7 +50,7 @@ const {
   authenticateClient,
   clientAuthValidators,
 } = require('../../oauth/client');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const OAUTH_DOCS = require('../../../docs/swagger/oauth-api').default;
 const OAUTH_SERVER_DOCS =
   require('../../../docs/swagger/oauth-server-api').default;

packages/fxa-auth-server/lib/routes/utils/oauth.js

@@ -11,7 +11,7 @@ const {
   MAX_NEW_ACCOUNT_AGE,
 } = require('fxa-shared/oauth/constants');
 const token = require('../../oauth/token');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const { Container } = require('typedi');
 const { FxaMailer } = require('../../senders/fxa-mailer');
 const { FxaMailerFormat } = require('../../senders/fxa-mailer-format');

packages/fxa-auth-server/lib/routes/utils/signin.js

@@ -11,7 +11,7 @@ const butil = require('../../crypto/butil');
 const { AppError: error } = require('@fxa/accounts/errors');
 const { Container } = require('typedi');
 const { AccountEventsManager } = require('../../account-events');
-const { emailsMatch } = require('fxa-shared').email.helpers;
+const { emailsMatch } = require('fxa-shared/email/helpers');
 const otp = require('../utils/otp');
 const { fetchRpCmsData } = require('../utils/account');
 const { RelyingPartyConfigurationManager } = require('@fxa/shared/cms');

packages/fxa-auth-server/lib/routes/utils/signup.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 'use strict';
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const { OAUTH_SCOPE_OLD_SYNC } = require('fxa-shared/oauth/constants');
 const { Container } = require('typedi');
 const { FxaMailer } = require('../../senders/fxa-mailer');

packages/fxa-auth-server/lib/senders/email.js

@@ -13,7 +13,7 @@ const { URL } = url;
 const {
   localizedPlanConfig,
 } = require('fxa-shared/subscriptions/configuration/utils');
-const { productDetailsFromPlan } = require('fxa-shared').subscriptions.metadata;
+const { productDetailsFromPlan } = require('fxa-shared/subscriptions/metadata');
 const Renderer = require('./renderer').default;
 const { NodeRendererBindings } = require('./renderer/bindings-node');
 const { determineLocale } = require('../../../../libs/shared/l10n/src');

packages/fxa-auth-server/test/local/routes/account.js

@@ -24,7 +24,7 @@ const { Container } = require('typedi');
 const { CapabilityService } = require('../../../lib/payments/capability');
 const { AccountEventsManager } = require('../../../lib/account-events');
 const { AccountDeleteManager } = require('../../../lib/account-delete');
-const { normalizeEmail } = require('fxa-shared').email.helpers;
+const { normalizeEmail } = require('fxa-shared/email/helpers');
 const { MozillaSubscriptionTypes } = require('fxa-shared/subscriptions/types');
 const {
   PlaySubscriptions,

packages/fxa-auth-server/test/local/routes/auth-schemes/auth-oauth.js

@@ -5,7 +5,7 @@
 const { assert } = require('chai');
 const proxyquire = require('proxyquire');
 const { AppError, OauthError: OauthAppError } = require('@fxa/accounts/errors');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 const authOauthPath = '../../../../lib/routes/auth-schemes/auth-oauth';
 const mockRequest = {

packages/fxa-auth-server/test/local/routes/auth-schemes/refresh-token.js

@@ -8,7 +8,7 @@ const { assert } = require('chai');
 const proxyquire = require('proxyquire');
 const { AppError: error } = require('@fxa/accounts/errors');
 const sinon = require('sinon');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 const USER_ID = Buffer.from('620203b5773b4c1d968e1fd4505a6885', 'hex');
 const OAUTH_CLIENT_ID = '3c49430b43dfba77';

packages/fxa-auth-server/test/local/routes/emails.js

@@ -15,7 +15,7 @@ const mocks = require('../../mocks');
 const nock = require('nock');
 const proxyquire = require('proxyquire');
 const uuid = require('uuid');
-const { normalizeEmail } = require('fxa-shared').email.helpers;
+const { normalizeEmail } = require('fxa-shared/email/helpers');
 const { gleanMetrics } = require('../../../lib/metrics/glean');
 const gleanConfig = {
   enabled: false,

packages/fxa-auth-server/test/local/routes/subscriptions/stripe.js

@@ -57,8 +57,12 @@ const {
   stripeInvoicesToSubsequentInvoicePreviewsDTO,
 } = require('../../../../lib/payments/stripe-formatter');
 
-const { filterCustomer, filterSubscription, filterInvoice, filterIntent } =
-  require('fxa-shared').subscriptions.stripe;
+const {
+  filterCustomer,
+  filterSubscription,
+  filterInvoice,
+  filterIntent,
+} = require('fxa-shared/subscriptions/stripe');
 
 const subscription2 = require('../../payments/fixtures/stripe/subscription2.json');
 const cancelledSubscription = require('../../payments/fixtures/stripe/subscription_cancelled.json');

packages/fxa-auth-server/test/mailer_helper.js

@@ -7,7 +7,7 @@
 'use strict';
 
 const uuid = require('uuid');
-const { normalizeEmail } = require('fxa-shared').email.helpers;
+const { normalizeEmail } = require('fxa-shared/email/helpers');
 
 const zeroBuffer16 = Buffer.from(
   '00000000000000000000000000000000',

packages/fxa-auth-server/test/mocks.js

@@ -14,7 +14,7 @@ const crypto = require('crypto');
 const { AppError: error } = require('@fxa/accounts/errors');
 const knownIpLocation = require('./known-ip-location');
 const sinon = require('sinon');
-const { normalizeEmail } = require('fxa-shared').email.helpers;
+const { normalizeEmail } = require('fxa-shared/email/helpers');
 const { Container } = require('typedi');
 const { AccountEventsManager } = require('../lib/account-events');
 const { gleanMetrics } = require('../lib/metrics/glean');

packages/fxa-auth-server/test/oauth/api.js

@@ -7,7 +7,7 @@ const { assert } = require('chai');
 const nock = require('nock');
 const buf = (v) => (Buffer.isBuffer(v) ? v : Buffer.from(v, 'hex'));
 const testServer = require('../lib/server');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const { decodeJWT } = require('../lib/util');
 const sinon = require('sinon');
 

packages/fxa-auth-server/test/oauth/db/index.js

@@ -7,7 +7,7 @@ const crypto = require('crypto');
 const { assert } = require('chai');
 const buf = (v) => (Buffer.isBuffer(v) ? v : Buffer.from(v, 'hex'));
 const hex = (v) => (Buffer.isBuffer(v) ? v.toString('hex') : v);
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 const encrypt = require('fxa-shared/auth/encrypt');
 const db = require('../../../lib/oauth/db');

packages/fxa-auth-server/test/oauth/grant.js

@@ -8,7 +8,7 @@ const proxyquire = require('proxyquire');
 const { default: Container } = require('typedi');
 
 const { config } = require('../../config');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const { OauthError: AppError } = require('@fxa/accounts/errors');
 const { decodeJWT } = require('../lib/util');
 const { CapabilityService } = require('../../lib/payments/capability');

packages/fxa-auth-server/test/oauth/jwt_access_token.js

@@ -6,7 +6,7 @@ const { assert } = require('chai');
 const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const { OauthError: AppError } = require('@fxa/accounts/errors');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const { OAUTH_SCOPE_OLD_SYNC } = require('fxa-shared/oauth/constants');
 const TOKEN_SERVER_URL =
   require('../../config').default.get('syncTokenserverUrl');

packages/fxa-auth-server/test/oauth/routes/verify.js

@@ -6,7 +6,7 @@ const path = require('path');
 const { assert } = require('chai');
 const proxyquire = require('proxyquire');
 const sinon = require('sinon');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 const TOKEN =
   'df6dcfe7bf6b54a65db5742cbcdce5c0a84a5da81a0bb6bdf5fc793eef041fc6';

packages/fxa-auth-server/test/oauth/token.js

@@ -5,7 +5,7 @@
 const { assert } = require('chai');
 const token = require('../../lib/oauth/token');
 const JWTAccessToken = require('../../lib/oauth/jwt_access_token');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 describe('token', function () {
   describe('verify', function () {

packages/fxa-auth-server/test/remote/attached_clients_tests.js

@@ -10,7 +10,7 @@ const Client = require('../client')();
 const config = require('../../config').default.getProperties();
 const tokens = require('../../lib/tokens')({ trace: () => {} }, config);
 const testUtils = require('../lib/util');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 const buf = (v) => (Buffer.isBuffer(v) ? v : Buffer.from(v, 'hex'));
 const hashRefreshToken = require('fxa-shared/auth/encrypt').hash;
 

packages/fxa-auth-server/test/remote/db_tests.js

@@ -14,7 +14,7 @@ const UnblockCode = require('../../lib/crypto/random').base32(
   config.signinUnblock.codeLength
 );
 const uuid = require('uuid');
-const { normalizeEmail } = require('fxa-shared').email.helpers;
+const { normalizeEmail } = require('fxa-shared/email/helpers');
 const ioredis = require('ioredis');
 
 const log = { debug() {}, trace() {}, info() {}, error() {} };

packages/fxa-content-server/server/lib/flow-event.js

@@ -22,8 +22,12 @@ const geolocate = require('fxa-shared/express/geo-locate').geolocate(geodb)(
 )(log);
 const os = require('os');
 const statsd = require('./statsd');
-const { VERSION, PERFORMANCE_TIMINGS, limitLength, isValidTime } =
-  require('fxa-shared').metrics.flowPerformance;
+const {
+  VERSION,
+  PERFORMANCE_TIMINGS,
+  limitLength,
+  isValidTime,
+} = require('fxa-shared/metrics/flowPerformance');
 
 const VALIDATION_PATTERNS = require('./validation').PATTERNS;
 const DNT_ALLOWED_DATA = ['context', 'entrypoint', 'service'];

packages/fxa-content-server/server/lib/routes/react-app/route-definition-index.js

@@ -11,7 +11,7 @@ function getIndexRouteDefinition(config) {
   let featureFlags;
   const featureFlagConfig = config.get('featureFlags');
   if (featureFlagConfig.enabled) {
-    featureFlags = require('fxa-shared').featureFlags(
+    featureFlags = require('fxa-shared/scripts/feature-flags')(
       featureFlagConfig,
       logger
     );

packages/fxa-profile-server/lib/profileCache.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 const P = require('./promise');
 const batch = require('./batch');

packages/fxa-profile-server/lib/server/web.js

@@ -8,7 +8,7 @@ const logger = require('../logging')('server.web');
 const Hapi = require('@hapi/hapi');
 const Sentry = require('@sentry/node');
 const cloneDeep = require('lodash/cloneDeep');
-const ScopeSet = require('fxa-shared').oauth.scopes;
+const ScopeSet = require('fxa-shared/oauth/scopes');
 
 const AppError = require('../error');
 const request = require('../request');

packages/fxa-shared/feature-flags/README.md

@@ -196,7 +196,8 @@ like so:
 let featureFlags;
 const featureFlagConfig = config.get('featureFlags');
 if (featureFlagConfig.enabled) {
-  featureFlags = require('fxa-shared').featureFlags(featureFlagConfig, logger);
+  const
+  featureFlags = require('fxa-shared/scripts/feature-flags')(featureFlagConfig, logger);
 } else {
   featureFlags = { get: () => ({}) };
 }