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
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
748fdef1fb
Коммит
3f8dda6f5a
@@ -22,8 +22,9 @@ const (
|
||||
PASSWORD_MAXIMUM_LENGTH = 64
|
||||
PASSWORD_MINIMUM_LENGTH = 5
|
||||
|
||||
SERVICE_GITLAB = "gitlab"
|
||||
SERVICE_GOOGLE = "google"
|
||||
SERVICE_GITLAB = "gitlab"
|
||||
SERVICE_GOOGLE = "google"
|
||||
SERVICE_OFFICE365 = "office365"
|
||||
|
||||
WEBSERVER_MODE_REGULAR = "regular"
|
||||
WEBSERVER_MODE_GZIP = "gzip"
|
||||
@@ -287,6 +288,7 @@ type Config struct {
|
||||
SupportSettings SupportSettings
|
||||
GitLabSettings SSOSettings
|
||||
GoogleSettings SSOSettings
|
||||
Office365Settings SSOSettings
|
||||
LdapSettings LdapSettings
|
||||
ComplianceSettings ComplianceSettings
|
||||
LocalizationSettings LocalizationSettings
|
||||
@@ -309,6 +311,8 @@ func (o *Config) GetSSOService(service string) *SSOSettings {
|
||||
return &o.GitLabSettings
|
||||
case SERVICE_GOOGLE:
|
||||
return &o.GoogleSettings
|
||||
case SERVICE_OFFICE365:
|
||||
return &o.Office365Settings
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Ссылка в новой задаче
Block a user