Fix oauth routes and link issues
Этот коммит содержится в:
@@ -60,10 +60,10 @@ export default class Login extends React.Component {
|
||||
let loginMessage = [];
|
||||
if (global.window.mm_config.EnableSignUpWithGitLab === 'true') {
|
||||
loginMessage.push(
|
||||
<Link
|
||||
<a
|
||||
className='btn btn-custom-login gitlab'
|
||||
key='gitlab'
|
||||
to={'/api/v1/oauth/gitlab/login?team=' + encodeURIComponent(teamName)}
|
||||
href={'/api/v1/oauth/gitlab/login?team=' + encodeURIComponent(teamName)}
|
||||
>
|
||||
<span className='icon'/>
|
||||
<span>
|
||||
@@ -72,16 +72,16 @@ export default class Login extends React.Component {
|
||||
defaultMessage='with GitLab'
|
||||
/>
|
||||
</span>
|
||||
</Link>
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
if (global.window.mm_config.EnableSignUpWithGoogle === 'true') {
|
||||
loginMessage.push(
|
||||
<Link
|
||||
<a
|
||||
className='btn btn-custom-login google'
|
||||
key='google'
|
||||
to={'/api/v1/oauth/google/login?team=' + encodeURIComponent(teamName)}
|
||||
href={'/api/v1/oauth/google/login?team=' + encodeURIComponent(teamName)}
|
||||
>
|
||||
<span className='icon'/>
|
||||
<span>
|
||||
@@ -90,7 +90,7 @@ export default class Login extends React.Component {
|
||||
defaultMessage='with Google Apps'
|
||||
/>
|
||||
</span>
|
||||
</Link>
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -317,10 +317,10 @@ class SignupUserComplete extends React.Component {
|
||||
var signupMessage = [];
|
||||
if (global.window.mm_config.EnableSignUpWithGitLab === 'true') {
|
||||
signupMessage.push(
|
||||
<Link
|
||||
<a
|
||||
className='btn btn-custom-login gitlab'
|
||||
key='gitlab'
|
||||
to={'/api/v1/oauth/gitlab/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)}
|
||||
href={'/api/v1/oauth/gitlab/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)}
|
||||
>
|
||||
<span className='icon'/>
|
||||
<span>
|
||||
@@ -329,16 +329,16 @@ class SignupUserComplete extends React.Component {
|
||||
defaultMessage='with GitLab'
|
||||
/>
|
||||
</span>
|
||||
</Link>
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
if (global.window.mm_config.EnableSignUpWithGoogle === 'true') {
|
||||
signupMessage.push(
|
||||
<Link
|
||||
<a
|
||||
className='btn btn-custom-login google'
|
||||
key='google'
|
||||
to={'/api/v1/oauth/google/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)}
|
||||
href={'/api/v1/oauth/google/signup' + window.location.search + '&team=' + encodeURIComponent(this.state.teamName)}
|
||||
>
|
||||
<span className='icon'/>
|
||||
<span>
|
||||
@@ -347,7 +347,7 @@ class SignupUserComplete extends React.Component {
|
||||
defaultMessage='with Google'
|
||||
/>
|
||||
</span>
|
||||
</Link>
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@ class SSOSignUpPage extends React.Component {
|
||||
this.props.service,
|
||||
(data) => {
|
||||
if (data.follow_link) {
|
||||
browserHistory.push(data.follow_link);
|
||||
window.location.href = data.follow_link;
|
||||
} else {
|
||||
browserHistory.push('/' + team.name + '/channels/town-square');
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user