refactor: stop sharing api/client specific config (#51423)

api-server/src/server/boot/authentication.js

@@ -4,7 +4,7 @@ import jwt from 'jsonwebtoken';
 import passport from 'passport';
 import fetch from 'node-fetch';
 import { isEmail } from 'validator';
-import { jwtSecret } from '../../../../config/secrets';
+import { jwtSecret } from '../../../config/secrets';
 import { decodeEmail } from '../../common/utils';
 import {
   createPassportCallbackAuthenticator,

api-server/src/server/boot/challenge.js

@@ -16,7 +16,7 @@ import isURL from 'validator/lib/isURL';
 import fetch from 'node-fetch';
 import jwt from 'jsonwebtoken';
 
-import { jwtSecret } from '../../../../config/secrets';
+import { jwtSecret } from '../../../config/secrets';
 import { challengeTypes } from '../../../../config/challenge-types';
 
 import {

api-server/src/server/boot/donate.js

@@ -2,7 +2,7 @@ import debug from 'debug';
 import Stripe from 'stripe';
 
 import { donationSubscriptionConfig } from '../../../../config/donation-settings';
-import keys from '../../../../config/secrets';
+import keys from '../../../config/secrets';
 import {
   getAsyncPaypalToken,
   verifyWebHook,

api-server/src/server/component-passport.js

@@ -3,7 +3,7 @@ import dedent from 'dedent';
 import passport from 'passport';
 
 import { availableLangs } from '../../../config/i18n';
-import { jwtSecret } from '../../../config/secrets';
+import { jwtSecret } from '../../config/secrets';
 import passportProviders from './passport-providers';
 import { setAccessTokenToResponse } from './utils/getSetAccessToken';
 import {

api-server/src/server/datasources.production.js

@@ -1,4 +1,4 @@
-var secrets = require('../../../config/secrets');
+var secrets = require('../../config/secrets');
 
 module.exports = {
   db: {

api-server/src/server/index.js

@@ -9,7 +9,7 @@ const loopback = require('loopback');
 const boot = require('loopback-boot');
 const morgan = require('morgan');
 
-const { sentry } = require('../../../config/secrets');
+const { sentry } = require('../../config/secrets');
 const { setupPassport } = require('./component-passport');
 
 const log = createDebugger('fcc:server');

api-server/src/server/middlewares/constant-headers.js

@@ -1,4 +1,4 @@
-import { allowedOrigins } from '../../../../config/cors-settings';
+import { allowedOrigins } from '../../../config/cors-settings';
 
 export default function constantHeaders() {
   return function (req, res, next) {

api-server/src/server/middlewares/request-authorization.js

@@ -1,6 +1,6 @@
 import { isEmpty } from 'lodash';
 
-import { jwtSecret as _jwtSecret } from '../../../../config/secrets';
+import { jwtSecret as _jwtSecret } from '../../../config/secrets';
 
 import { wrapHandledError } from '../utils/create-handled-error';
 import {

api-server/src/server/middlewares/sentry-error-handler.js

@@ -1,5 +1,5 @@
 import { Handlers, captureException } from '@sentry/node';
-import { sentry } from '../../../../config/secrets';
+import { sentry } from '../../../config/secrets';
 import { isHandledError } from '../utils/create-handled-error';
 
 // sends directly to Sentry

api-server/src/server/middlewares/sentry-request-handler.js

@@ -1,5 +1,5 @@
 import { Handlers } from '@sentry/node';
-import { sentry } from '../../../../config/secrets';
+import { sentry } from '../../../config/secrets';
 
 export default function sentryRequestHandler() {
   return sentry.dsn === 'dsn_from_sentry_dashboard'

api-server/src/server/middlewares/sentry-tracing-handler.js

@@ -1,5 +1,5 @@
 import { Handlers } from '@sentry/node';
-import { sentry } from '../../../../config/secrets';
+import { sentry } from '../../../config/secrets';
 
 export default function sentryRequestHandler() {
   return sentry.dsn === 'dsn_from_sentry_dashboard'

api-server/src/server/middlewares/user-token.js

@@ -1,7 +1,7 @@
 import debugFactory from 'debug';
 const log = debugFactory('fcc:boot:user');
 import jwt from 'jsonwebtoken';
-import { jwtSecret } from '../../../../config/secrets';
+import { jwtSecret } from '../../../config/secrets';
 
 /*
  * User tokens for submitting external curriculum are deleted when they sign

api-server/src/server/passport-providers.js

@@ -1,4 +1,4 @@
-import { auth0 } from '../../../config/secrets';
+import { auth0 } from '../../config/secrets';
 
 const { clientID, clientSecret, domain } = auth0;
 

api-server/src/server/utils/donation.js

@@ -3,7 +3,7 @@ import axios from 'axios';
 import debug from 'debug';
 import isEmail from 'validator/lib/isEmail';
 import { donationSubscriptionConfig } from '../../../../config/donation-settings';
-import keys from '../../../../config/secrets';
+import keys from '../../../config/secrets';
 
 const log = debug('fcc:boot:donate');
 

api-server/src/server/utils/donation.test.js

@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 import axios from 'axios';
-import keys from '../../../../config/secrets';
+import keys from '../../../config/secrets';
 import {
   mockApp,
   createDonationMockFn,

api-server/src/server/utils/getSetAccessToken.js

@@ -1,7 +1,7 @@
 import { isBefore } from 'date-fns';
 import jwt from 'jsonwebtoken';
 
-import { jwtSecret as _jwtSecret } from '../../../../config/secrets';
+import { jwtSecret as _jwtSecret } from '../../../config/secrets';
 
 export const jwtCookieNS = 'jwt_access_token';
 

api-server/src/server/utils/redirection.js

@@ -1,5 +1,5 @@
 const jwt = require('jsonwebtoken');
-const { allowedOrigins } = require('../../../../config/cors-settings');
+const { allowedOrigins } = require('../../../config/cors-settings');
 // process.env.HOME_LOCATION is being used as a fallback here. If the one
 // provided by the client is invalid we default to this.
 const { availableLangs } = require('../../../../config/i18n');