Cut staging from master #717

Merged
skhameneh merged 5 commits from master into staging 2018-11-10 05:28:34 +01:00
3 changed files with 3 additions and 3 deletions
Showing only changes of commit 7c7e16ea62 - Show all commits

View file

@ -31,7 +31,7 @@ class ChannelLoginForm extends React.Component {
}), }),
credentials: 'include', credentials: 'include',
}; };
request('login', params) request('auth', params)
.then(({success, channelName, shortChannelId, channelClaimId, message}) => { .then(({success, channelName, shortChannelId, channelClaimId, message}) => {
if (success) { if (success) {
this.props.onChannelLogin(channelName, shortChannelId, channelClaimId); this.props.onChannelLogin(channelName, shortChannelId, channelClaimId);

View file

@ -6,7 +6,7 @@ const handleUserRequest = require('../../controllers/auth/user');
module.exports = { module.exports = {
'/signup': { method: 'post', controller: [ speechPassport.authenticate('local-signup'), handleSignupRequest ] }, '/signup': { method: 'post', controller: [ speechPassport.authenticate('local-signup'), handleSignupRequest ] },
'/login': { method: 'post', controller: handleLoginRequest }, '/auth': { method: 'post', controller: handleLoginRequest },
'/logout': { controller: handleLogoutRequest }, '/logout': { controller: handleLogoutRequest },
'/user': { controller: handleUserRequest }, '/user': { controller: handleUserRequest },
}; };

View file

@ -1,7 +1,7 @@
module.exports = { module.exports = {
...require('./auth'),
...require('./pages'), ...require('./pages'),
...require('./api'), ...require('./api'),
...require('./auth'),
...require('./assets'), ...require('./assets'),
...require('./fallback'), ...require('./fallback'),
}; };