fix send 200 to non users on post to challenges
fix remove random 'yo' debug
This commit is contained in:
@ -41,7 +41,8 @@ var R = require('ramda'),
|
|||||||
observableQueryFromModel = require('../utils/rx').observableQueryFromModel,
|
observableQueryFromModel = require('../utils/rx').observableQueryFromModel,
|
||||||
|
|
||||||
userMigration = require('../utils/middleware').userMigration,
|
userMigration = require('../utils/middleware').userMigration,
|
||||||
ifNoUserRedirectTo = require('../utils/middleware').ifNoUserRedirectTo;
|
ifNoUserRedirectTo = require('../utils/middleware').ifNoUserRedirectTo,
|
||||||
|
ifNoUserSend = require('../utils/middleware').ifNoUserSend;
|
||||||
|
|
||||||
var challengeMapWithNames = utils.getChallengeMapWithNames();
|
var challengeMapWithNames = utils.getChallengeMapWithNames();
|
||||||
var challengeMapWithIds = utils.getChallengeMapWithIds();
|
var challengeMapWithIds = utils.getChallengeMapWithIds();
|
||||||
@ -75,17 +76,32 @@ module.exports = function(app) {
|
|||||||
var router = app.loopback.Router();
|
var router = app.loopback.Router();
|
||||||
var Challenge = app.models.Challenge;
|
var Challenge = app.models.Challenge;
|
||||||
var User = app.models.User;
|
var User = app.models.User;
|
||||||
|
var redirectNonUser =
|
||||||
|
ifNoUserRedirectTo('/challenges/learn-how-free-code-camp-works');
|
||||||
|
var send200toNonUser = ifNoUserSend(true);
|
||||||
|
|
||||||
router.post('/completed-challenge/', completedChallenge);
|
router.post(
|
||||||
router.post('/completed-zipline-or-basejump', completedZiplineOrBasejump);
|
'/completed-challenge/',
|
||||||
router.post('/completed-bonfire', completedBonfire);
|
send200toNonUser,
|
||||||
|
completedChallenge
|
||||||
|
);
|
||||||
|
router.post(
|
||||||
|
'/completed-zipline-or-basejump',
|
||||||
|
send200toNonUser,
|
||||||
|
completedZiplineOrBasejump
|
||||||
|
);
|
||||||
|
router.post(
|
||||||
|
'/completed-bonfire',
|
||||||
|
send200toNonUser,
|
||||||
|
completedBonfire
|
||||||
|
);
|
||||||
|
|
||||||
// the follow routes are covered by userMigration
|
// the follow routes are covered by userMigration
|
||||||
router.use(userMigration);
|
router.use(userMigration);
|
||||||
router.get('/map', challengeMap);
|
router.get('/map', challengeMap);
|
||||||
router.get(
|
router.get(
|
||||||
'/challenges/next-challenge',
|
'/challenges/next-challenge',
|
||||||
ifNoUserRedirectTo('/challenges/learn-how-free-code-camp-works'),
|
redirectNonUser,
|
||||||
returnNextChallenge
|
returnNextChallenge
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -93,7 +109,7 @@ module.exports = function(app) {
|
|||||||
|
|
||||||
router.get(
|
router.get(
|
||||||
'/challenges/',
|
'/challenges/',
|
||||||
ifNoUserRedirectTo('/challenges/learn-how-free-code-camp-works'),
|
redirectNonUser,
|
||||||
returnCurrentChallenge
|
returnCurrentChallenge
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -308,7 +324,6 @@ module.exports = function(app) {
|
|||||||
.withLatestFrom(
|
.withLatestFrom(
|
||||||
Rx.Observable.just(req.user),
|
Rx.Observable.just(req.user),
|
||||||
function(pairedWith, user) {
|
function(pairedWith, user) {
|
||||||
debug('yo');
|
|
||||||
return {
|
return {
|
||||||
user: user,
|
user: user,
|
||||||
pairedWith: pairedWith
|
pairedWith: pairedWith
|
||||||
|
@ -43,3 +43,11 @@ exports.ifNoUserRedirectTo = function ifNoUserRedirectTo(url) {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
exports.ifNoUserSend = function ifNoUserSend(sendThis) {
|
||||||
|
return function(req, res, next) {
|
||||||
|
if (req.user) {
|
||||||
|
return next();
|
||||||
|
}
|
||||||
|
return res.status(200).send(sendThis);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
Reference in New Issue
Block a user