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 /model/license.go | |
| 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 'model/license.go')
| -rw-r--r-- | model/license.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/model/license.go b/model/license.go index a77a7349a..a60695890 100644 --- a/model/license.go +++ b/model/license.go @@ -36,6 +36,7 @@ type Features struct { LDAP *bool `json:"ldap"` MFA *bool `json:"mfa"` GoogleSSO *bool `json:"google_sso"` + Office365SSO *bool `json:"office365_sso"` Compliance *bool `json:"compliance"` CustomBrand *bool `json:"custom_brand"` MHPNS *bool `json:"mhpns"` @@ -67,7 +68,12 @@ func (f *Features) SetDefaults() { if f.GoogleSSO == nil { f.GoogleSSO = new(bool) - *f.GoogleSSO = *f.FutureFeatures + *f.GoogleSSO = true + } + + if f.Office365SSO == nil { + f.Office365SSO = new(bool) + *f.Office365SSO = true } if f.Compliance == nil { |