From c39e95c7cb1ad6e812aa3ce4000b4dfdf214e77e Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 15 Jul 2015 12:48:50 -0400 Subject: inital implementation of using GitLab OAuth2 provider for signup/login --- config/config.json | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config/config.json b/config/config.json index 085dd6de6..61183948f 100644 --- a/config/config.json +++ b/config/config.json @@ -23,6 +23,12 @@ "UseLocalStorage": true, "StorageDirectory": "./data/" }, + "SSOSettings": { + "AllowGitLabSSO": true, + "GitLabSecret" : "8526ada64f38a1a67cafe6650d54310f1484f8a5d06ad23abb9f8e4b8af1c429", + "GitLabId": "0af4138195d246d5d4e958a93100379066bb087fa9892cd323b0c97bbd696008", + "GitLabUrl": "http://dockerhost:8080" + }, "SqlSettings": { "DriverName": "mysql", "DataSource": "mmuser:mostest@tcp(dockerhost:3306)/mattermost_test", -- cgit v1.2.3-1-g7c22 From 03528b9619747b8bd184b852497dcf14ee1e0081 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 17 Jul 2015 09:47:25 -0400 Subject: made oauth architecture more generalized --- config/config.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index 61183948f..f92b873d1 100644 --- a/config/config.json +++ b/config/config.json @@ -24,10 +24,14 @@ "StorageDirectory": "./data/" }, "SSOSettings": { - "AllowGitLabSSO": true, - "GitLabSecret" : "8526ada64f38a1a67cafe6650d54310f1484f8a5d06ad23abb9f8e4b8af1c429", - "GitLabId": "0af4138195d246d5d4e958a93100379066bb087fa9892cd323b0c97bbd696008", - "GitLabUrl": "http://dockerhost:8080" + "gitlab": { + "Allow": true, + "Secret" : "8526ada64f38a1a67cafe6650d54310f1484f8a5d06ad23abb9f8e4b8af1c429", + "Id": "0af4138195d246d5d4e958a93100379066bb087fa9892cd323b0c97bbd696008", + "AuthEndpoint": "http://dockerhost:8080/oauth/authorize", + "TokenEndpoint": "http://dockerhost:8080/oauth/token", + "UserApiEndpoint": "http://dockerhost:8080/api/v3/user" + } }, "SqlSettings": { "DriverName": "mysql", -- cgit v1.2.3-1-g7c22 From 62c0603c50c7cc85003fb03ed55d1a585c32dc34 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 22 Jul 2015 10:12:28 -0400 Subject: merged with new team domain changes and added signup/login links for gitlab --- config/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index f92b873d1..84e675a72 100644 --- a/config/config.json +++ b/config/config.json @@ -26,8 +26,8 @@ "SSOSettings": { "gitlab": { "Allow": true, - "Secret" : "8526ada64f38a1a67cafe6650d54310f1484f8a5d06ad23abb9f8e4b8af1c429", - "Id": "0af4138195d246d5d4e958a93100379066bb087fa9892cd323b0c97bbd696008", + "Secret" : "0495d3d6e528d91ba46605622a3645a8409ac5971ee287b1c3a6519fe27e6f6a", + "Id": "87a4aeb746c67e87a54df78f6eccf85229dd30a3a797bfdb423b82ba4e749cd0", "AuthEndpoint": "http://dockerhost:8080/oauth/authorize", "TokenEndpoint": "http://dockerhost:8080/oauth/token", "UserApiEndpoint": "http://dockerhost:8080/api/v3/user" -- cgit v1.2.3-1-g7c22 From 41bbbbf4462205348c978a2cce5162f73e35f6b7 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 22 Jul 2015 15:05:20 -0400 Subject: add changes from team review --- config/config.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config') diff --git a/config/config.json b/config/config.json index 84e675a72..14fd6e593 100644 --- a/config/config.json +++ b/config/config.json @@ -25,12 +25,12 @@ }, "SSOSettings": { "gitlab": { - "Allow": true, - "Secret" : "0495d3d6e528d91ba46605622a3645a8409ac5971ee287b1c3a6519fe27e6f6a", - "Id": "87a4aeb746c67e87a54df78f6eccf85229dd30a3a797bfdb423b82ba4e749cd0", - "AuthEndpoint": "http://dockerhost:8080/oauth/authorize", - "TokenEndpoint": "http://dockerhost:8080/oauth/token", - "UserApiEndpoint": "http://dockerhost:8080/api/v3/user" + "Allow": false, + "Secret" : "", + "Id": "", + "AuthEndpoint": "/oauth/authorize", + "TokenEndpoint": "/oauth/token", + "UserApiEndpoint": "/api/v3/user" } }, "SqlSettings": { -- cgit v1.2.3-1-g7c22 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 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config') 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": { -- cgit v1.2.3-1-g7c22 From fabdc9a32661fd0410560ca918f5302249f9cfad Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 22 Jul 2015 16:27:08 -0400 Subject: added SSOSettings to docker config file --- config/config_docker.json | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'config') diff --git a/config/config_docker.json b/config/config_docker.json index 062cdef65..a9ed98f1a 100644 --- a/config/config_docker.json +++ b/config/config_docker.json @@ -23,6 +23,16 @@ "UseLocalStorage": true, "StorageDirectory": "/mattermost/data/" }, + "SSOSettings": { + "gitlab": { + "Allow": false, + "Secret" : "", + "Id": "", + "AuthEndpoint": "", + "TokenEndpoint": "", + "UserApiEndpoint": "" + } + }, "SqlSettings": { "DriverName": "mysql", "DataSource": "mmuser:mostest@tcp(localhost:3306)/mattermost_test", -- cgit v1.2.3-1-g7c22