PLT-6268 Clear blue bar correctly when removing expiring license (#6247)

* Don't sanitize license for system admin

* Clear blue bar error whe removing expiring license

* Fix unit test

3 files changed, 18 insertions, 1 deletions

diff --git a/api4/system.go b/api4/system.go
index 7e860ba76..1f4589bf5 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -231,6 +231,14 @@ func getClientLicense(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	var clientLicense map[string]string
+
+	if app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
+		clientLicense = utils.ClientLicense
+	} else {
+		clientLicense = utils.GetSanitizedClientLicense()
+	}
+
 	w.Header().Set(model.HEADER_ETAG_SERVER, etag)
-	w.Write([]byte(model.MapToJson(utils.GetSanitizedClientLicense())))
+	w.Write([]byte(model.MapToJson(clientLicense)))
 }
diff --git a/api4/system_test.go b/api4/system_test.go
index ba30dd1eb..850705040 100644
--- a/api4/system_test.go
+++ b/api4/system_test.go
@@ -180,6 +180,13 @@ func TestGetOldClientLicense(t *testing.T) {
 	if _, err := Client.DoApiGet("/license/client?format=junk", ""); err == nil || err.StatusCode != http.StatusBadRequest {
 		t.Fatal("should have errored with 400")
 	}
+
+	license, resp = th.SystemAdminClient.GetOldClientLicense("")
+	CheckNoError(t, resp)
+
+	if len(license["IsLicensed"]) == 0 {
+		t.Fatal("license not returned correctly")
+	}
 }
 
 func TestGetAudits(t *testing.T) {
diff --git a/webapp/components/admin_console/license_settings.jsx b/webapp/components/admin_console/license_settings.jsx
index 84867ab2e..844dd0569 100644
--- a/webapp/components/admin_console/license_settings.jsx
+++ b/webapp/components/admin_console/license_settings.jsx
@@ -5,6 +5,7 @@ import $ from 'jquery';
 import ReactDOM from 'react-dom';
 import * as Utils from 'utils/utils.jsx';
 
+import ErrorStore from 'stores/error_store.jsx';
 import {uploadLicenseFile, removeLicenseFile} from 'actions/admin_actions.jsx';
 
 import {injectIntl, intlShape, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'react-intl';
@@ -80,6 +81,7 @@ class LicenseSettings extends React.Component {
             () => {
                 $('#remove-button').button('reset');
                 this.setState({fileSelected: false, fileName: null, serverError: null});
+                ErrorStore.clearLastError(true);
                 window.location.reload(true);
             },
             (error) => {