From 3d845feb7ee392dff3752b72deba1bf7fa4ef55d Mon Sep 17 00:00:00 2001 From: Mario de Frutos Dieguez Date: Tue, 23 Mar 2021 15:27:40 +0100 Subject: [PATCH] Split CWS url in two: public and API (#17100) Signed-off-by: Mario de Frutos Co-authored-by: Mattermod --- model/config.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/model/config.go b/model/config.go index 63b9a31be56..d7364cda152 100644 --- a/model/config.go +++ b/model/config.go @@ -235,8 +235,9 @@ const ( OFFICE365_SETTINGS_DEFAULT_TOKEN_ENDPOINT = "https://login.microsoftonline.com/common/oauth2/v2.0/token" OFFICE365_SETTINGS_DEFAULT_USER_API_ENDPOINT = "https://graph.microsoft.com/v1.0/me" - CLOUD_SETTINGS_DEFAULT_CWS_URL = "https://customers.mattermost.com" - OPENID_SETTINGS_DEFAULT_SCOPE = "profile openid email" + CLOUD_SETTINGS_DEFAULT_CWS_URL = "https://customers.mattermost.com" + CLOUD_SETTINGS_DEFAULT_CWS_API_URL = "https://portal.internal.prod.cloud.mattermost.com" + OPENID_SETTINGS_DEFAULT_SCOPE = "profile openid email" LOCAL_MODE_SOCKET_PATH = "/var/tmp/mattermost_local.socket" ) @@ -2702,13 +2703,17 @@ func (s *JobSettings) SetDefaults() { } type CloudSettings struct { - CWSUrl *string `access:"environment,write_restrictable"` + CWSUrl *string `access:"environment,write_restrictable"` + CWSAPIUrl *string `access:"environment,write_restrictable"` } func (s *CloudSettings) SetDefaults() { if s.CWSUrl == nil { s.CWSUrl = NewString(CLOUD_SETTINGS_DEFAULT_CWS_URL) } + if s.CWSAPIUrl == nil { + s.CWSAPIUrl = NewString(CLOUD_SETTINGS_DEFAULT_CWS_API_URL) + } } type PluginState struct {