diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-07-29 14:58:37 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-07-29 14:58:37 -0400 |
commit | 3f8dda6f5ad676c976fd5ae575a6790fdb505449 (patch) | |
tree | 015a739989103ce38481176fd5d55f5f703789cb /config | |
parent | 748fdef1fbded624a786533e8f065b91a047b91c (diff) | |
download | chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.tar.gz chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.tar.bz2 chat-3f8dda6f5ad676c976fd5ae575a6790fdb505449.zip |
PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660)
* EE: Add Google and Office365 SSO through OAuth2
* Add localization strings
* Text tweaks for PLT-3633
* Added sign-up button for Office 365
* Updated some error messages and a bit of licensing
* Updated sign-in method section in user settings to include Google and Office365
* Added more localization strings
Diffstat (limited to 'config')
-rw-r--r-- | config/config.json | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/config/config.json b/config/config.json index 8f1bea3ca..22d500c3e 100644 --- a/config/config.json +++ b/config/config.json @@ -142,10 +142,19 @@ "Enable": false, "Secret": "", "Id": "", - "Scope": "", - "AuthEndpoint": "", - "TokenEndpoint": "", - "UserApiEndpoint": "" + "Scope": "profile email", + "AuthEndpoint": "https://accounts.google.com/o/oauth2/v2/auth", + "TokenEndpoint": "https://www.googleapis.com/oauth2/v4/token", + "UserApiEndpoint": "https://www.googleapis.com/plus/v1/people/me" + }, + "Office365Settings": { + "Enable": false, + "Secret": "", + "Id": "", + "Scope": "User.Read", + "AuthEndpoint": "https://login.microsoftonline.com/common/oauth2/v2.0/authorize", + "TokenEndpoint": "https://login.microsoftonline.com/common/oauth2/v2.0/token", + "UserApiEndpoint": "https://graph.microsoft.com/v1.0/me" }, "LdapSettings": { "Enable": false, @@ -201,4 +210,4 @@ "AndroidAppDownloadLink": "https://about.mattermost.com/mattermost-android-app/", "IosAppDownloadLink": "https://about.mattermost.com/mattermost-ios-app/" } -}
\ No newline at end of file +} |