Skip to content

Support for passthru authentication #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peebles wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support for passthru authentication #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b40af7
add support for passthru authentication
Jun 22, 2016
54912fb
put back in one line from master
Jun 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/AuthenticatedRoute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class AuthenticatedRoute extends Route {
var loginRoute = router.getLoginRoute();
var redirectTo = (loginRoute || {}).path || (homeRoute || {}).path || '/';

replace(redirectTo);
replace({ nextPathname: nextState.location.pathname }, redirectTo);
}
callback();
});
Expand Down
10 changes: 8 additions & 2 deletions src/components/LoginForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export default class LoginForm extends React.Component {
onFormSubmit(e) {
e.preventDefault();
e.persist();

var next = (err, data) => {
if (err) {
return this.setState({
Expand Down Expand Up @@ -198,7 +198,13 @@ export default class LoginForm extends React.Component {
var router = context.getRouter();
var homeRoute = router.getHomeRoute();
var authenticatedHomeRoute = router.getAuthenticatedHomeRoute();
var redirectTo = this.props.redirectTo || (authenticatedHomeRoute || {}).path || (homeRoute || {}).path || '/';
var logoutRoute = router.getLogoutRoute();

var { location } = this.props;
var passthru = (location && location.state) ? location.state.nextPathname : null;
if ( passthru == ( logoutRoute || {} ).path ) passthru = null;

var redirectTo = this.props.redirectTo || passthru || (authenticatedHomeRoute || {}).path || (homeRoute || {}).path || '/';

this.context.router.push(redirectTo);
}
Expand Down