jprdonnelly/freeCodeCamp
1
0
Fork 0
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-02-13 13:00:27 -05:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Oliver Eyton-Williams
2023-08-29 15:05:27 +02:00
committed by GitHub
parent 2428910ad1
commit cb9d6a6243
29 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
config/cors-settings.js → api-server/config/cors-settings.js
View File

0
config/secrets.js → api-server/config/secrets.js
View File

2
api-server/src/server/boot/authentication.js
View File

@@ -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,

2
api-server/src/server/boot/challenge.js
View File

@@ -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 {

2
api-server/src/server/boot/donate.js
View File

@@ -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,

2
api-server/src/server/component-passport.js
View File

@@ -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 {

2
api-server/src/server/datasources.production.js
View File

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

2
api-server/src/server/index.js
View File

@@ -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');

2
api-server/src/server/middlewares/constant-headers.js
View File

@@ -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) {

2
api-server/src/server/middlewares/request-authorization.js
View File

@@ -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 {

2
api-server/src/server/middlewares/sentry-error-handler.js
View File

@@ -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

2
api-server/src/server/middlewares/sentry-request-handler.js
View File

@@ -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'

2
api-server/src/server/middlewares/sentry-tracing-handler.js
View File

@@ -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'

2
api-server/src/server/middlewares/user-token.js
View File

@@ -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

2
api-server/src/server/passport-providers.js
View File

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

2
api-server/src/server/utils/donation.js
View File

@@ -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');

2
api-server/src/server/utils/donation.test.js
View File

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

2
api-server/src/server/utils/getSetAccessToken.js
View File

@@ -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';

2
api-server/src/server/utils/redirection.js
View File

@@ -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');

2
api/src/routes/challenge.ts
View File

@@ -1,7 +1,7 @@
import { type FastifyPluginCallbackTypebox } from '@fastify/type-provider-typebox';
import jwt from 'jsonwebtoken';
import { uniqBy } from 'lodash';
import { jwtSecret } from '../../../config/secrets';
import { jwtSecret } from '../../../api-server/config/secrets';
import { getChallenges } from '../utils/get-challenges';
import { updateUserChallengeData } from '../utils/common-challenge-functions';
import { formatValidationError } from '../utils/error-formatting';

5
client/config/analytics-settings.ts Normal file
View File

@@ -0,0 +1,5 @@
export const prodAnalyticsId = 'GTM-57R6KJM';
export const devAnalyticsId = 'GTM-WSS47LM';
// this id includes a stream for the spanish learn platform
export const prodAnalyticsESId = 'GTM-KCS6GSD';

0
config/misc.ts → client/config/misc.ts
View File

2
client/src/analytics/index.ts
View File

@@ -4,7 +4,7 @@ import {
devAnalyticsId,
prodAnalyticsId,
prodAnalyticsESId
} from '../../../config/analytics-settings';
} from '../../config/analytics-settings';
import envData from '../../../config/env.json';

2
client/src/components/Header/components/universal-nav.tsx
View File

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
import { useMediaQuery } from 'react-responsive';
import { isLanding } from '../../../utils/path-parsers';
import { Link, SkeletonSprite } from '../../helpers';
import { SEARCH_EXPOSED_WIDTH } from '../../../../../config/misc';
import { SEARCH_EXPOSED_WIDTH } from '../../../../config/misc';
import MenuButton from './menu-button';
import NavLinks, { type NavLinksProps } from './nav-links';
import NavLogo from './nav-logo';

2
client/src/templates/Challenges/classic/lower-jaw.tsx
View File

@@ -10,7 +10,7 @@ import GreenPass from '../../../assets/icons/green-pass';
import { randomCompliment } from '../../../../src/utils/get-words';
import Help from '../../../assets/icons/help';
import Reset from '../../../assets/icons/reset';
import { MAX_MOBILE_WIDTH } from '../../../../../config/misc';
import { MAX_MOBILE_WIDTH } from '../../../../config/misc';
import { apiLocation } from '../../../../../config/env.json';
import { ChallengeMeta } from '../../../redux/prop-types';
import { Share } from '../../../components/share';

2
client/src/templates/Challenges/classic/mobile-layout.tsx
View File

@@ -15,7 +15,7 @@ import {
showPreviewPortalSelector,
showPreviewPaneSelector
} from '../redux/selectors';
import { TOOL_PANEL_HEIGHT } from '../../../../../config/misc';
import { TOOL_PANEL_HEIGHT } from '../../../../config/misc';
import ToolPanel from '../components/tool-panel';
import PreviewPortal from '../components/preview-portal';
import EditorTabs from './editor-tabs';

2
client/src/templates/Challenges/classic/show.tsx
View File

@@ -11,7 +11,7 @@ import store from 'store';
import { editor } from 'monaco-editor';
import { challengeTypes } from '../../../../../config/challenge-types';
import LearnLayout from '../../../components/layouts/learn';
import { MAX_MOBILE_WIDTH } from '../../../../../config/misc';
import { MAX_MOBILE_WIDTH } from '../../../../config/misc';
import {
ChallengeFiles,

2
client/src/templates/Challenges/components/preview-portal.tsx
View File

@@ -18,7 +18,7 @@ import {
isAdvancingToChallengeSelector,
chapterSlugSelector
} from '../redux/selectors';
import { MAX_MOBILE_WIDTH } from '../../../../../config/misc';
import { MAX_MOBILE_WIDTH } from '../../../../config/misc';
interface PreviewPortalProps {
children: ReactElement | null;

5
config/analytics-settings.js
View File

@@ -1,5 +0,0 @@
exports.prodAnalyticsId = 'GTM-57R6KJM';
exports.devAnalyticsId = 'GTM-WSS47LM';
// this id includes a stream for the spanish learn platform
exports.prodAnalyticsESId = 'GTM-KCS6GSD';