Commit 2ba919e5 authored by Jordi Mallach's avatar Jordi Mallach 🔥

Extra bits that got lost.

parent a7545dba
Pipeline #5375 failed with stage
in 0 seconds
......@@ -178,7 +178,7 @@ Examples:
Arguments:
from_auth:
The authentication service to migrate users accounts from.
Supported options: email, gitlab, ldap, saml.
Supported options: email, gitlab, phabricator, ldap, saml.
to_auth:
The authentication service to migrate users to.
......@@ -202,7 +202,7 @@ Examples:
Arguments:
from_auth:
The authentication service to migrate users accounts from.
Supported options: email, gitlab, ldap, saml.
Supported options: email, gitlab, phabricator, ldap, saml.
to_auth:
The authentication service to migrate users to.
......@@ -592,7 +592,7 @@ func migrateAuthToLdapCmdF(command *cobra.Command, args []string) error {
fromAuth := args[0]
matchField := args[2]
if len(fromAuth) == 0 || (fromAuth != "email" && fromAuth != "gitlab" && fromAuth != "saml") {
if len(fromAuth) == 0 || (fromAuth != "email" && fromAuth != "gitlab" && fromAuth != "phabricator" && fromAuth != "saml") {
return errors.New("Invalid from_auth argument")
}
......@@ -645,7 +645,7 @@ func migrateAuthToSamlCmdF(command *cobra.Command, args []string) error {
fromAuth := args[0]
if len(fromAuth) == 0 || (fromAuth != "email" && fromAuth != "gitlab" && fromAuth != "ldap") {
if len(fromAuth) == 0 || (fromAuth != "email" && fromAuth != "gitlab" && fromAuth != "phabricator" && fromAuth != "ldap") {
return errors.New("Invalid from_auth argument")
}
......
......@@ -223,6 +223,7 @@ func GenerateLimitedClientConfig(c *model.Config, diagnosticId string, license *
props["EmailLoginButtonTextColor"] = *c.EmailSettings.LoginButtonTextColor
props["EnableSignUpWithGitLab"] = strconv.FormatBool(*c.GitLabSettings.Enable)
props["EnableSignUpWithPhabricator"] = strconv.FormatBool(*c.PhabricatorSettings.Enable)
props["TermsOfServiceLink"] = *c.SupportSettings.TermsOfServiceLink
props["PrivacyPolicyLink"] = *c.SupportSettings.PrivacyPolicyLink
......
......@@ -2316,6 +2316,7 @@ func (o *Config) SetDefaults() {
o.PrivacySettings.setDefaults()
o.Office365Settings.setDefaults()
o.GitLabSettings.setDefaults()
o.PhabricatorSettings.setDefaults()
o.GoogleSettings.setDefaults()
o.ServiceSettings.SetDefaults()
o.PasswordSettings.SetDefaults()
......@@ -2870,8 +2871,8 @@ func (o *Config) Sanitize() {
*o.GitLabSettings.Secret = FAKE_SETTING
}
if len(o.PhabricatorSettings.Secret) > 0 {
o.PhabricatorSettings.Secret = FAKE_SETTING
if len(*o.PhabricatorSettings.Secret) > 0 {
*o.PhabricatorSettings.Secret = FAKE_SETTING
}
*o.SqlSettings.DataSource = FAKE_SETTING
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment