From 56a0a7d1e1fbd9405559a9c6e32962155d9cc562 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 22 Jul 2015 15:32:39 -0400 Subject: only show gitlab signup/login links if gitlab oauth is turned on --- config/config.json | 6 +++--- utils/config.go | 11 +++++++++++ web/react/components/login.jsx | 15 ++++++++++++--- web/react/components/signup_user_complete.jsx | 14 ++++++++++++-- web/react/pages/login.jsx | 4 ++-- web/react/pages/signup_user_complete.jsx | 4 ++-- web/templates/login.html | 2 +- web/templates/signup_user_complete.html | 2 +- web/web.go | 2 ++ 9 files changed, 46 insertions(+), 14 deletions(-) diff --git a/config/config.json b/config/config.json index 14fd6e593..591e38422 100644 --- a/config/config.json +++ b/config/config.json @@ -28,9 +28,9 @@ "Allow": false, "Secret" : "", "Id": "", - "AuthEndpoint": "/oauth/authorize", - "TokenEndpoint": "/oauth/token", - "UserApiEndpoint": "/api/v3/user" + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" } }, "SqlSettings": { diff --git a/utils/config.go b/utils/config.go index b90337b7e..6a428a5c1 100644 --- a/utils/config.go +++ b/utils/config.go @@ -253,3 +253,14 @@ func IsS3Configured() bool { return true } + +func GetAllowedAuthServices() []string { + authServices := []string{} + for name, service := range Cfg.SSOSettings { + if service.Allow { + authServices = append(authServices, name) + } + } + + return authServices +} diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 908e10f31..05918650b 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -90,6 +90,17 @@ module.exports = React.createClass({ focusEmail = true; } + var auth_services = JSON.parse(this.props.authServices); + + var login_message; + if (auth_services.indexOf("gitlab") >= 0) { + login_message = ( +
+ {"Log in with GitLab"} +
+ ); + } + return (
@@ -112,9 +123,7 @@ module.exports = React.createClass({
- + { login_message } diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 577651b90..dc5ba64aa 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -103,7 +103,7 @@ module.exports = React.createClass({ var yourEmailIs = this.state.user.email == "" ? "" : Your email address is { this.state.user.email }. - var email = + var email = (
@@ -111,6 +111,16 @@ module.exports = React.createClass({ { email_error }
+ ); + + var auth_services = JSON.parse(this.props.authServices); + + var signup_message; + if (auth_services.indexOf("gitlab") >= 0) { + signup_message =

{"Choose your username and password for the " + this.props.teamDisplayName + " " + strings.Team} {"or sign up with GitLab."}

; + } else { + signup_message =

{"Choose your username and password for the " + this.props.teamDisplayName + " " + strings.Team + "."}

; + } return (
@@ -119,7 +129,7 @@ module.exports = React.createClass({
-

{"Choose your username and password for the " + this.props.teamDisplayName + " " + strings.Team} {"or sign up with GitLab."}

+ { signup_message }

Your username can be made of lowercase letters and numbers.

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( - , + , document.getElementById('login') ); }; diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx index 490702d3c..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, name, ui_name, id, data, hash) { +global.window.setup_signup_user_complete_page = function(email, name, ui_name, id, data, hash, auth_services) { React.render( - , + , document.getElementById('signup-user-complete') ); }; diff --git a/web/templates/login.html b/web/templates/login.html index 24cebec8f..4b2813358 100644 --- a/web/templates/login.html +++ b/web/templates/login.html @@ -20,7 +20,7 @@
diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html index 0cc655b63..176ca77b1 100644 --- a/web/templates/signup_user_complete.html +++ b/web/templates/signup_user_complete.html @@ -19,7 +19,7 @@
diff --git a/web/web.go b/web/web.go index 6bd4d09a0..1d59ef946 100644 --- a/web/web.go +++ b/web/web.go @@ -188,6 +188,7 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) { page := NewHtmlTemplatePage("login", "Login") page.Props["TeamDisplayName"] = team.DisplayName page.Props["TeamName"] = teamName + page.Props["AuthServices"] = model.ArrayToJson(utils.GetAllowedAuthServices()) page.Render(c, w) } @@ -274,6 +275,7 @@ func signupUserComplete(c *api.Context, w http.ResponseWriter, r *http.Request) page.Props["TeamId"] = props["id"] page.Props["Data"] = data page.Props["Hash"] = hash + page.Props["AuthServices"] = model.ArrayToJson(utils.GetAllowedAuthServices()) page.Render(c, w) } -- cgit v1.2.3-1-g7c22