Merge pull request #237 from mattermost/mm-1570

fixes mm-1570 adds support for using mattermost as an OAuth client
Этот коммит содержится в:
Corey Hulen
2015-07-23 09:21:14 -08:00
родитель dc79707787 d42d0e3467
Коммит a9d48ff994
21 изменённых файлов: 792 добавлений и 134 удалений

Просмотреть файл

@@ -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')
);
};

Просмотреть файл

@@ -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')
);
};
};

11
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')
);
};