gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into staging

Browse Source
This commit is contained in:
benmcmahon100
2015-08-20 23:39:06 +01:00
parent 4de75fc9e7 2f4e459e82
commit 184b913895
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/boot/user.js
View File

@ -1,9 +1,11 @@
var _ = require('lodash'), import _ from 'lodash';
async = require('async'), import async from 'async';
moment = require('moment'), import moment from 'moment';
debug = require('debug')('freecc:cntr:userController'); import debugFactory from 'debug';
import { ifNoUser401 } from '../utils/middleware';
const debug = debugFactory('freecc:boot:user');
const daysBetween = 1.5; const daysBetween = 1.5;
function calcCurrentStreak(cals) { function calcCurrentStreak(cals) {
@ -67,7 +69,11 @@ module.exports = function(app) {
router.get('/email-signup', getEmailSignup); router.get('/email-signup', getEmailSignup);
router.get('/email-signin', getEmailSignin); router.get('/email-signin', getEmailSignin);
router.get('/account/api', getAccountAngular); router.get('/account/api', getAccountAngular);
router.post('/account/delete', postDeleteAccount); router.post(
'/account/delete',
ifNoUser401,
postDeleteAccount
);
router.get('/account/unlink/:provider', getOauthUnlink); router.get('/account/unlink/:provider', getOauthUnlink);
router.get('/account', getAccount); router.get('/account', getAccount);
// Ensure this is the last route! // Ensure this is the last route!