|
@@ -4,6 +4,7 @@ import loggerFactory from '@alias/logger';
|
|
|
import { withTranslation } from 'react-i18next';
|
|
import { withTranslation } from 'react-i18next';
|
|
|
|
|
|
|
|
import LoginContainer from '../services/LoginContainer';
|
|
import LoginContainer from '../services/LoginContainer';
|
|
|
|
|
+import AppContainer from '../services/AppContainer';
|
|
|
import { createSubscribedElement } from './UnstatedUtils';
|
|
import { createSubscribedElement } from './UnstatedUtils';
|
|
|
|
|
|
|
|
const logger = loggerFactory('growi:loginForm');
|
|
const logger = loggerFactory('growi:loginForm');
|
|
@@ -44,7 +45,9 @@ class LoginForm extends React.Component {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
handleLoginWithExternalAuth(e) {
|
|
handleLoginWithExternalAuth(e) {
|
|
|
- this.props.loginContainer.loginWithExternalAuth(e.currentTarget.id);
|
|
|
|
|
|
|
+ const auth = e.currentTarget.id;
|
|
|
|
|
+ const csrf = this.props.appContainer.csrfToken;
|
|
|
|
|
+ window.location.href = `/passport/${auth}?_csrf=${csrf}`;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
renderLocalOrLdapLoginForm() {
|
|
renderLocalOrLdapLoginForm() {
|
|
@@ -278,13 +281,14 @@ class LoginForm extends React.Component {
|
|
|
* Wrapper component for using unstated
|
|
* Wrapper component for using unstated
|
|
|
*/
|
|
*/
|
|
|
const LoginFormWrapper = (props) => {
|
|
const LoginFormWrapper = (props) => {
|
|
|
- return createSubscribedElement(LoginForm, props, [LoginContainer]);
|
|
|
|
|
|
|
+ return createSubscribedElement(LoginForm, props, [AppContainer, LoginContainer]);
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
LoginForm.propTypes = {
|
|
LoginForm.propTypes = {
|
|
|
// i18next
|
|
// i18next
|
|
|
t: PropTypes.func.isRequired,
|
|
t: PropTypes.func.isRequired,
|
|
|
loginContainer: PropTypes.instanceOf(LoginContainer).isRequired,
|
|
loginContainer: PropTypes.instanceOf(LoginContainer).isRequired,
|
|
|
|
|
+ appContainer: PropTypes.instanceOf(AppContainer).isRequired,
|
|
|
isRegistering: PropTypes.bool,
|
|
isRegistering: PropTypes.bool,
|
|
|
username: PropTypes.string,
|
|
username: PropTypes.string,
|
|
|
name: PropTypes.string,
|
|
name: PropTypes.string,
|