Commit 49df2047 authored by Maxime Buquet's avatar Maxime Buquet Committed by Jordi Mallach

Phab OAuth: Missing pieces for 5.0

Signed-off-by: Maxime Buquet's avatarMaxime “pep” Buquet <pep@collabora.com>
parent 8b7bacee
......@@ -293,6 +293,10 @@ func (a *App) Desanitize(cfg *model.Config) {
cfg.GitLabSettings.Secret = actual.GitLabSettings.Secret
}
if cfg.PhabricatorSettings.Secret == model.FAKE_SETTING {
cfg.PhabricatorSettings.Secret = actual.PhabricatorSettings.Secret
}
if *cfg.SqlSettings.DataSource == model.FAKE_SETTING {
*cfg.SqlSettings.DataSource = *actual.SqlSettings.DataSource
}
......
......@@ -10,6 +10,7 @@ import (
// Plugins
_ "github.com/mattermost/mattermost-server/model/gitlab"
_ "github.com/mattermost/mattermost-server/model/phabricator"
// Enterprise Imports
_ "github.com/mattermost/mattermost-server/imports"
......
......@@ -2558,6 +2558,10 @@ func (o *Config) Sanitize() {
o.GitLabSettings.Secret = FAKE_SETTING
}
if len(o.PhabricatorSettings.Secret) > 0 {
o.PhabricatorSettings.Secret = FAKE_SETTING
}
*o.SqlSettings.DataSource = FAKE_SETTING
o.SqlSettings.AtRestEncryptKey = 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