diff --git a/api4/license_test.go b/api4/license_test.go index 919d04156c..af3b6fb8df 100644 --- a/api4/license_test.go +++ b/api4/license_test.go @@ -212,14 +212,6 @@ func TestRequestTrialLicense(t *testing.T) { CheckForbiddenStatus(t, resp) }) - t.Run("blank site url", func(t *testing.T) { - th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.SiteURL = "" }) - defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.SiteURL = "http://localhost:8065/" }) - resp, err := th.SystemAdminClient.RequestTrialLicense(1000) - CheckErrorID(t, err, "api.license.request_trial_license.no-site-url.app_error") - CheckBadRequestStatus(t, resp) - }) - t.Run("trial license user count less than current users", func(t *testing.T) { nUsers := 1 license := model.NewTestLicense() diff --git a/app/license.go b/app/license.go index 5f4b1a79d4..c6617bd76f 100644 --- a/app/license.go +++ b/app/license.go @@ -71,10 +71,6 @@ func (w *licenseWrapper) RequestTrialLicense(requesterID string, users int, term } } - if *w.srv.Config().ServiceSettings.SiteURL == "" { - return model.NewAppError("RequestTrialLicense", "api.license.request_trial_license.no-site-url.app_error", nil, "", http.StatusBadRequest) - } - trialLicenseRequest := &model.TrialLicenseRequest{ ServerID: w.srv.TelemetryId(), Name: requester.GetDisplayName(model.ShowFullName), diff --git a/i18n/en.json b/i18n/en.json index 0900d84156..985491ceef 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2053,10 +2053,6 @@ "id": "api.license.request_trial_license.fail_get_user_count.app_error", "translation": "Unable to get a trial license, please try again or contact with support@mattermost.com. Cannot obtain the number of registered users." }, - { - "id": "api.license.request_trial_license.no-site-url.app_error", - "translation": "Unable to request a trial license. Please configure a Site URL in the web server section of the Mattermost System Console." - }, { "id": "api.license.upgrade_needed.app_error", "translation": "Feature requires an upgrade to Enterprise Edition."