diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-23 09:21:14 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-23 09:21:14 -0800 |
commit | a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2 (patch) | |
tree | f1b1c37242136098941d3d96b32245bf2b6a528c /web/react/pages | |
parent | dc79707787b521ea5fc0d9088ccd9069780c8e0c (diff) | |
parent | d42d0e3467c8eec38fdca429ba9ba5ac2af68db8 (diff) | |
download | chat-a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2.tar.gz chat-a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2.tar.bz2 chat-a9d48ff994cd2d03f8e1b2438e50fc6dd0d9bdc2.zip |
Merge pull request #237 from mattermost/mm-1570
fixes mm-1570 adds support for using mattermost as an OAuth client
Diffstat (limited to 'web/react/pages')
-rw-r--r-- | web/react/pages/login.jsx | 4 | ||||
-rw-r--r-- | web/react/pages/signup_user_complete.jsx | 6 | ||||
-rw-r--r-- | web/react/pages/signup_user_oauth.jsx | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx index 8348f0b5d..6e7528373 100644 --- a/web/react/pages/login.jsx +++ b/web/react/pages/login.jsx @@ -3,9 +3,9 @@ var Login = require('../components/login.jsx'); -global.window.setup_login_page = function(teamDisplayName, teamName) { +global.window.setup_login_page = function(team_display_name, team_name, auth_services) { React.render( - <Login teamDisplayName={teamDisplayName} teamName={teamName}/>, + <Login teamDisplayName={team_display_name} teamName={team_name} authServices={auth_services} />, document.getElementById('login') ); }; diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx index a24c8d4c8..60c3a609a 100644 --- a/web/react/pages/signup_user_complete.jsx +++ b/web/react/pages/signup_user_complete.jsx @@ -3,9 +3,9 @@ var SignupUserComplete =require('../components/signup_user_complete.jsx'); -global.window.setup_signup_user_complete_page = function(email, domain, name, id, data, hash) { +global.window.setup_signup_user_complete_page = function(email, name, ui_name, id, data, hash, auth_services) { React.render( - <SignupUserComplete team_id={id} domain={domain} team_name={name} email={email} hash={hash} data={data} />, + <SignupUserComplete teamId={id} teamName={name} teamDisplayName={ui_name} email={email} hash={hash} data={data} authServices={auth_services} />, document.getElementById('signup-user-complete') ); -};
\ No newline at end of file +}; diff --git a/web/react/pages/signup_user_oauth.jsx b/web/react/pages/signup_user_oauth.jsx new file mode 100644 index 000000000..6a0707702 --- /dev/null +++ b/web/react/pages/signup_user_oauth.jsx @@ -0,0 +1,11 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + +var SignupUserOAuth = require('../components/signup_user_oauth.jsx'); + +global.window.setup_signup_user_oauth_page = function(user, team_name, team_display_name) { + React.render( + <SignupUserOAuth user={user} teamName={team_name} teamDisplayName={team_display_name} />, + document.getElementById('signup-user-complete') + ); +}; |