diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/diagnostics.go | 1 | ||||
-rw-r--r-- | app/ldap.go | 8 | ||||
-rw-r--r-- | app/oauth.go | 8 |
3 files changed, 17 insertions, 0 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 250b38646..513cf11f5 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -194,6 +194,7 @@ func (a *App) trackConfig() { "enable_user_access_tokens": *cfg.ServiceSettings.EnableUserAccessTokens, "enable_custom_emoji": *cfg.ServiceSettings.EnableCustomEmoji, "enable_emoji_picker": *cfg.ServiceSettings.EnableEmojiPicker, + "experimental_enable_authentication_transfer": *cfg.ServiceSettings.ExperimentalEnableAuthenticationTransfer, "restrict_custom_emoji_creation": *cfg.ServiceSettings.RestrictCustomEmojiCreation, "enable_testing": cfg.ServiceSettings.EnableTesting, "enable_developer": *cfg.ServiceSettings.EnableDeveloper, diff --git a/app/ldap.go b/app/ldap.go index a01a4aeb6..49f3d034a 100644 --- a/app/ldap.go +++ b/app/ldap.go @@ -39,6 +39,10 @@ func (a *App) TestLdap() *model.AppError { } func (a *App) SwitchEmailToLdap(email, password, code, ldapId, ldapPassword string) (string, *model.AppError) { + if utils.IsLicensed() && !*a.Config().ServiceSettings.ExperimentalEnableAuthenticationTransfer { + return "", model.NewAppError("emailToLdap", "api.user.email_to_ldap.not_available.app_error", nil, "", http.StatusForbidden) + } + user, err := a.GetUserByEmail(email) if err != nil { return "", err @@ -71,6 +75,10 @@ func (a *App) SwitchEmailToLdap(email, password, code, ldapId, ldapPassword stri } func (a *App) SwitchLdapToEmail(ldapPassword, code, email, newPassword string) (string, *model.AppError) { + if utils.IsLicensed() && !*a.Config().ServiceSettings.ExperimentalEnableAuthenticationTransfer { + return "", model.NewAppError("ldapToEmail", "api.user.ldap_to_email.not_available.app_error", nil, "", http.StatusForbidden) + } + user, err := a.GetUserByEmail(email) if err != nil { return "", err diff --git a/app/oauth.go b/app/oauth.go index f27facbec..3202ac5ed 100644 --- a/app/oauth.go +++ b/app/oauth.go @@ -717,6 +717,10 @@ func (a *App) AuthorizeOAuthUser(w http.ResponseWriter, r *http.Request, service } func (a *App) SwitchEmailToOAuth(w http.ResponseWriter, r *http.Request, email, password, code, service string) (string, *model.AppError) { + if utils.IsLicensed() && !*a.Config().ServiceSettings.ExperimentalEnableAuthenticationTransfer { + return "", model.NewAppError("emailToOAuth", "api.user.email_to_oauth.not_available.app_error", nil, "", http.StatusForbidden) + } + var user *model.User var err *model.AppError if user, err = a.GetUserByEmail(email); err != nil { @@ -743,6 +747,10 @@ func (a *App) SwitchEmailToOAuth(w http.ResponseWriter, r *http.Request, email, } func (a *App) SwitchOAuthToEmail(email, password, requesterId string) (string, *model.AppError) { + if utils.IsLicensed() && !*a.Config().ServiceSettings.ExperimentalEnableAuthenticationTransfer { + return "", model.NewAppError("oauthToEmail", "api.user.oauth_to_email.not_available.app_error", nil, "", http.StatusForbidden) + } + var user *model.User var err *model.AppError if user, err = a.GetUserByEmail(email); err != nil { |