summaryrefslogtreecommitdiffstats
path: root/config/config.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-18 08:47:35 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-18 08:47:35 -0400
commit2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218 (patch)
tree1de5578c9050a33635960fc046fdf97339254be0 /config/config.json
parent96d1eb1c800a427e31e63970e57d0824a3bc91e3 (diff)
parenta7f09be9783f3354ab38d4fb4fb82085241d018f (diff)
downloadchat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.gz
chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.tar.bz2
chat-2f1dcf6f5267ecf85d14c8a36a9d3059a5d41218.zip
Merge pull request #381 from mattermost/mm-1705
MM-1705 add google as an oauth single-sign-on service
Diffstat (limited to 'config/config.json')
-rw-r--r--config/config.json10
1 files changed, 10 insertions, 0 deletions
diff --git a/config/config.json b/config/config.json
index c446b517c..e7134cba5 100644
--- a/config/config.json
+++ b/config/config.json
@@ -29,9 +29,19 @@
"Allow": false,
"Secret" : "",
"Id": "",
+ "Scope": "",
"AuthEndpoint": "",
"TokenEndpoint": "",
"UserApiEndpoint": ""
+ },
+ "google": {
+ "Allow": false,
+ "Secret": "",
+ "Id": "",
+ "Scope": "email profile",
+ "AuthEndpoint": "https://accounts.google.com/o/oauth2/auth",
+ "TokenEndpoint": "https://www.googleapis.com/oauth2/v3/token",
+ "UserApiEndpoint": "https://www.googleapis.com/plus/v1/people/me"
}
},
"SqlSettings": {