diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-23 16:26:37 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-23 16:26:37 -0400 |
| commit | 07bf7c498d603d76741fee20f4090438a592a659 (patch) | |
| tree | 68a5cdbe23babd7eb9510d287810ed6df434755a /webapp/root.jsx | |
| parent | 6285ec44bbcafe41dbd47dfe9955982df4bab362 (diff) | |
| parent | 934c7c7a7c8423d71fdc7d1586b9c03aedcc5129 (diff) | |
| download | chat-07bf7c498d603d76741fee20f4090438a592a659.tar.gz chat-07bf7c498d603d76741fee20f4090438a592a659.tar.bz2 chat-07bf7c498d603d76741fee20f4090438a592a659.zip | |
Merge pull request #2465 from mattermost/plt-2260
PLT-2260 Add the ability to switch from email to ldap and back
Diffstat (limited to 'webapp/root.jsx')
| -rw-r--r-- | webapp/root.jsx | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx index 63fbb4422..f4d9a0e47 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -36,7 +36,6 @@ import SignupUserComplete from 'components/signup_user_complete.jsx'; import ShouldVerifyEmail from 'components/should_verify_email.jsx'; import DoVerifyEmail from 'components/do_verify_email.jsx'; import AdminConsole from 'components/admin_console/admin_controller.jsx'; -import ClaimAccount from 'components/claim/claim_account.jsx'; import SignupTeamComplete from 'components/signup_team_complete/components/signup_team_complete.jsx'; import WelcomePage from 'components/signup_team_complete/components/team_signup_welcome_page.jsx'; @@ -47,6 +46,12 @@ import UsernamePage from 'components/signup_team_complete/components/team_signup import PasswordPage from 'components/signup_team_complete/components/team_signup_password_page.jsx'; import FinishedPage from 'components/signup_team_complete/components/team_signup_finished.jsx'; +import Claim from 'components/claim/claim.jsx'; +import EmailToOAuth from 'components/claim/components/email_to_oauth.jsx'; +import OAuthToEmail from 'components/claim/components/oauth_to_email.jsx'; +import LDAPToEmail from 'components/claim/components/ldap_to_email.jsx'; +import EmailToLDAP from 'components/claim/components/email_to_ldap.jsx'; + import {addLocaleData} from 'react-intl'; import enLocaleData from 'react-intl/locale-data/en'; import esLocaleData from 'react-intl/locale-data/es'; @@ -309,10 +314,6 @@ function renderRootComponent() { component={Login} /> <Route - path='claim' - component={ClaimAccount} - /> - <Route path='reset_password' component={PasswordResetSendLink} /> @@ -320,6 +321,27 @@ function renderRootComponent() { path='reset_password_complete' component={PasswordResetForm} /> + <Route + path='claim' + component={Claim} + > + <Route + path='oauth_to_email' + component={OAuthToEmail} + /> + <Route + path='email_to_oauth' + component={EmailToOAuth} + /> + <Route + path='email_to_ldap' + component={EmailToLDAP} + /> + <Route + path='ldap_to_email' + component={LDAPToEmail} + /> + </Route> </Route> </Route> </Route> |