Skip to content

Commit

Permalink
Merge pull request #220 from rygh4775/develop
Browse files Browse the repository at this point in the history
fix: login API route 수정
  • Loading branch information
rygh4775 authored Mar 30, 2019
2 parents 95a99d0 + a08c993 commit 22458a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 2 additions & 2 deletions backend/routes/v1/index.route.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var express = require('express'),
expressJwt = require('express-jwt');

var config = require('../../config/config'),
authRoutes = require('./auth.route'),
loginRoutes = require('./login.route'),
userRoutes = require('./user.route'),
eventRoutes = require('./event.route'),
aggsRoutes = require('./aggs.route'),
Expand All @@ -11,7 +11,7 @@ var config = require('../../config/config'),
const router = express.Router();
const auth = expressJwt({secret: config.jwtSecret, requestProperty: 'decoded'});

router.use('/groups/:groupId/auth', authRoutes);
router.use('/groups/:groupId/login', loginRoutes);

// router.use('/groups/:groupId/users', auth, userRoutes);
router.use('/groups/:groupId/users', userRoutes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ var paramValidation = require('../../config/param-validation'),
const router = express.Router(); // eslint-disable-line new-cap

/** POST /api/auth/login - Returns token if correct username and password is provided */
router.route('/login')
router.route('/')
.post(validate(paramValidation.login), authCtrl.login);

/** POST /api/auth/register */
router.route('/register')
.post(validate(paramValidation.register), authCtrl.loadUserToRegister, userCtrl.update);

module.exports = router;

0 comments on commit 22458a3

Please sign in to comment.