From 729a59ac1110f19a41c201e4321311c49606cb9f Mon Sep 17 00:00:00 2001 From: Brooke Date: Mon, 24 Oct 2022 10:33:15 -0700 Subject: [PATCH 1/3] TCA-595 #comment this commit adds the local url to CORS --- api-server/src/server/boot/challenge.js | 2 -- client/src/templates/Challenges/redux/completion-epic.js | 3 --- config/cors-settings.js | 3 ++- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/api-server/src/server/boot/challenge.js b/api-server/src/server/boot/challenge.js index 499bab69a70f69..38ac25098e3a73 100644 --- a/api-server/src/server/boot/challenge.js +++ b/api-server/src/server/boot/challenge.js @@ -252,8 +252,6 @@ export function isValidChallengeCompletion(req, res, next) { body: { id, challengeType, solution } } = req; - console.debug('Checking validity', id, challengeType, solution); - // ToDO: Validate other things (challengeFiles, etc) const isValidChallengeCompletionErrorMsg = { type: 'error', diff --git a/client/src/templates/Challenges/redux/completion-epic.js b/client/src/templates/Challenges/redux/completion-epic.js index f81cde2f9bbaee..2505efaca9065b 100644 --- a/client/src/templates/Challenges/redux/completion-epic.js +++ b/client/src/templates/Challenges/redux/completion-epic.js @@ -65,9 +65,6 @@ function postChallenge(update, username) { } function submitModern(type, state) { - console.debug('submitting modern'); - console.trace(); - const challengeType = state.challenge.challengeMeta.challengeType; const tests = challengeTestsSelector(state); if ( diff --git a/config/cors-settings.js b/config/cors-settings.js index 79f6acc24b54ab..9b85d737e0c07a 100644 --- a/config/cors-settings.js +++ b/config/cors-settings.js @@ -5,5 +5,6 @@ exports.allowedOrigins = [ 'https://beta.freecodecamp.org', 'https://chinese.freecodecamp.dev', 'https://chinese.freecodecamp.org', - 'https://freecodecamp.topcoder-dev.com' + 'https://freecodecamp.topcoder-dev.com', + 'https://local.topcoder-dev.com' ]; From 8556ccf350203cdef9c710b54870a923a3f192bc Mon Sep 17 00:00:00 2001 From: Brooke Date: Mon, 24 Oct 2022 11:01:31 -0700 Subject: [PATCH 2/3] TCA-595 More logging #time 15m --- api-server/src/server/boot/challenge.js | 7 +++++++ config/cors-settings.js | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api-server/src/server/boot/challenge.js b/api-server/src/server/boot/challenge.js index 38ac25098e3a73..beebe43b429f0d 100644 --- a/api-server/src/server/boot/challenge.js +++ b/api-server/src/server/boot/challenge.js @@ -252,6 +252,8 @@ export function isValidChallengeCompletion(req, res, next) { body: { id, challengeType, solution } } = req; + console.debug('Checking validity', id, challengeType, solution); + // ToDO: Validate other things (challengeFiles, etc) const isValidChallengeCompletionErrorMsg = { type: 'error', @@ -273,10 +275,14 @@ export function isValidChallengeCompletion(req, res, next) { console.debug('solution', solution, !isURL(solution)); return res.status(403).json(isValidChallengeCompletionErrorMsg); } + + console.debug('Challenge is valid.'); return next(); } export function modernChallengeCompleted(req, res, next) { + console.debug('modernChallengeCompleted', req.user); + const user = req.user; return user .getCompletedChallenges$() @@ -321,6 +327,7 @@ export function modernChallengeCompleted(req, res, next) { }) ); return Observable.fromPromise(updatePromise).map(() => { + console.debug('returning from modern completion'); return res.json({ points, alreadyCompleted, diff --git a/config/cors-settings.js b/config/cors-settings.js index 9b85d737e0c07a..79f6acc24b54ab 100644 --- a/config/cors-settings.js +++ b/config/cors-settings.js @@ -5,6 +5,5 @@ exports.allowedOrigins = [ 'https://beta.freecodecamp.org', 'https://chinese.freecodecamp.dev', 'https://chinese.freecodecamp.org', - 'https://freecodecamp.topcoder-dev.com', - 'https://local.topcoder-dev.com' + 'https://freecodecamp.topcoder-dev.com' ]; From badff5b40a30ef7ec7ce9678b9b3c0e363d59916 Mon Sep 17 00:00:00 2001 From: Brooke Date: Mon, 24 Oct 2022 11:05:06 -0700 Subject: [PATCH 3/3] TCA-595 more logging --- client/src/templates/Challenges/redux/completion-epic.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/src/templates/Challenges/redux/completion-epic.js b/client/src/templates/Challenges/redux/completion-epic.js index 2505efaca9065b..f81cde2f9bbaee 100644 --- a/client/src/templates/Challenges/redux/completion-epic.js +++ b/client/src/templates/Challenges/redux/completion-epic.js @@ -65,6 +65,9 @@ function postChallenge(update, username) { } function submitModern(type, state) { + console.debug('submitting modern'); + console.trace(); + const challengeType = state.challenge.challengeMeta.challengeType; const tests = challengeTestsSelector(state); if (