fix(api): only use homeLocation as a fallback (#40517)

This commit is contained in:
Oliver Eyton-Williams
2020-12-30 20:10:38 +01:00
committed by Mrugesh Mohapatra
parent 03fa21a565
commit a076547d43
22 changed files with 207 additions and 600 deletions

View File

@ -17,10 +17,10 @@ import { dasherize } from '../../../utils/slugs';
import { fixCompletedChallengeItem } from '../../common/utils';
import { getChallenges } from '../utils/get-curriculum';
import {
getParamsFromReq,
getRedirectParams,
getRedirectBase,
normalizeParams
} from '../utils/get-return-to';
} from '../utils/redirection';
const log = debug('fcc:boot:challenges');
@ -34,7 +34,7 @@ export default async function bootChallenge(app, done) {
const redirectToCurrentChallenge = createRedirectToCurrentChallenge(
challengeUrlResolver,
normalizeParams,
getParamsFromReq
getRedirectParams
);
api.post(
@ -336,11 +336,11 @@ function backendChallengeCompleted(req, res, next) {
export function createRedirectToCurrentChallenge(
challengeUrlResolver,
normalizeParams,
getParamsFromReq
getRedirectParams
) {
return async function redirectToCurrentChallenge(req, res, next) {
const { user } = req;
const { origin, pathPrefix } = normalizeParams(getParamsFromReq(req));
const { origin, pathPrefix } = getRedirectParams(req, normalizeParams);
const redirectBase = getRedirectBase(origin, pathPrefix);
if (!user) {