Merge pull request #2176 from rgarmsen2295/plt-1870

PLT-1870 Added license audit parsing to the audit table

2 files changed, 59 insertions, 12 deletions

diff --git a/web/react/components/audit_table.jsx b/web/react/components/audit_table.jsx
index 49892ff98..31d04f19b 100644
--- a/web/react/components/audit_table.jsx
+++ b/web/react/components/audit_table.jsx
@@ -183,6 +183,26 @@ const holders = defineMessages({
     loginFailure: {
         id: 'audit_table.loginFailure',
         defaultMessage: ' (Login failure)'
+    },
+    attemptedLicenseAdd: {
+        id: 'audit_table.attemptedLicenseAdd',
+        defaultMessage: 'Attempted to add new license'
+    },
+    successfullLicenseAdd: {
+        id: 'audit_table.successfullLicenseAdd',
+        defaultMessage: 'Successfully added new license'
+    },
+    failedExpiredLicenseAdd: {
+        id: 'audit_table.failedExpiredLicenseAdd',
+        defaultMessage: 'Failed to add a new license as it has either expired or not yet been started'
+    },
+    failedInvalidLicenseAdd: {
+        id: 'audit_table.failedInvalidLicenseAdd',
+        defaultMessage: 'Failed to add an invalid license'
+    },
+    licenseRemoved: {
+        id: 'audit_table.licenseRemoved',
+        defaultMessage: 'Successfully removed a license'
     }
 });
 
@@ -327,17 +347,17 @@ export function formatAuditInfo(audit, formatMessage) {
 
         switch (actionURL) {
         case '/channels/create':
-            auditDesc = formatMessage(holders.channelCreated, {channelName: channelName});
+            auditDesc = formatMessage(holders.channelCreated, {channelName});
             break;
         case '/channels/create_direct':
             auditDesc = formatMessage(holders.establishedDM, {username: Utils.getDirectTeammate(channelObj.id).username});
             break;
         case '/channels/update':
-            auditDesc = formatMessage(holders.nameUpdated, {channelName: channelName});
+            auditDesc = formatMessage(holders.nameUpdated, {channelName});
             break;
         case '/channels/update_desc': // support the old path
         case '/channels/update_header':
-            auditDesc = formatMessage(holders.headerUpdated, {channelName: channelName});
+            auditDesc = formatMessage(holders.headerUpdated, {channelName});
             break;
         default: {
             let userIdField = [];
@@ -356,9 +376,9 @@ export function formatAuditInfo(audit, formatMessage) {
             if (/\/channels\/[A-Za-z0-9]+\/delete/.test(actionURL)) {
                 auditDesc = formatMessage(holders.channelDeleted, {url: channelURL});
             } else if (/\/channels\/[A-Za-z0-9]+\/add/.test(actionURL)) {
-                auditDesc = formatMessage(holders.userAdded, {username: username, channelName: channelName});
+                auditDesc = formatMessage(holders.userAdded, {username, channelName});
             } else if (/\/channels\/[A-Za-z0-9]+\/remove/.test(actionURL)) {
-                auditDesc = formatMessage(holders.userRemoved, {username: username, channelName: channelName});
+                auditDesc = formatMessage(holders.userRemoved, {username, channelName});
             }
 
             break;
@@ -495,25 +515,25 @@ export function formatAuditInfo(audit, formatMessage) {
             break;
         }
     } else if (actionURL.indexOf('/hooks') === 0) {
-        const webhookInfo = audit.extra_info.split(' ');
+        const webhookInfo = audit.extra_info;
 
         switch (actionURL) {
         case '/hooks/incoming/create':
-            if (webhookInfo[0] === 'attempt') {
+            if (webhookInfo === 'attempt') {
                 auditDesc = formatMessage(holders.attemptedWebhookCreate);
-            } else if (webhookInfo[0] === 'success') {
+            } else if (webhookInfo === 'success') {
                 auditDesc = formatMessage(holders.succcessfullWebhookCreate);
-            } else if (webhookInfo[0] === 'fail - bad channel permissions') {
+            } else if (webhookInfo === 'fail - bad channel permissions') {
                 auditDesc = formatMessage(holders.failedWebhookCreate);
             }
 
             break;
         case '/hooks/incoming/delete':
-            if (webhookInfo[0] === 'attempt') {
+            if (webhookInfo === 'attempt') {
                 auditDesc = formatMessage(holders.attemptedWebhookDelete);
-            } else if (webhookInfo[0] === 'success') {
+            } else if (webhookInfo === 'success') {
                 auditDesc = formatMessage(holders.successfullWebhookDelete);
-            } else if (webhookInfo[0] === 'fail - inappropriate conditions') {
+            } else if (webhookInfo === 'fail - inappropriate conditions') {
                 auditDesc = formatMessage(holders.failedWebhookDelete);
             }
 
@@ -521,6 +541,28 @@ export function formatAuditInfo(audit, formatMessage) {
         default:
             break;
         }
+    } else if (actionURL.indexOf('/license') === 0) {
+        const licenseInfo = audit.extra_info;
+
+        switch (actionURL) {
+        case '/license/add':
+            if (licenseInfo === 'attempt') {
+                auditDesc = formatMessage(holders.attemptedLicenseAdd);
+            } else if (licenseInfo === 'success') {
+                auditDesc = formatMessage(holders.successfullLicenseAdd);
+            } else if (licenseInfo === 'failed - expired or non-started license') {
+                auditDesc = formatMessage(holders.failedExpiredLicenseAdd);
+            } else if (licenseInfo === 'failed - invalid license') {
+                auditDesc = formatMessage(holders.failedInvalidLicenseAdd);
+            }
+
+            break;
+        case '/license/remove':
+            auditDesc = formatMessage(holders.licenseRemoved);
+            break;
+        default:
+            break;
+        }
     } else {
         switch (actionURL) {
         case '/logout':
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 984f16f29..b086b56e5 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -485,6 +485,11 @@
   "audit_table.revokedAll": "Revoked all current sessions for the team",
   "audit_table.loginAttempt": " (Login attempt)",
   "audit_table.loginFailure": " (Login failure)",
+  "audit_table.attemptedLicenseAdd": "Attempted to add new license",
+  "audit_table.successfullLicenseAdd": "Successfully added new license",
+  "audit_table.failedExpiredLicenseAdd": "Failed to add a new license as it has either expired or not yet been started",
+  "audit_table.failedInvalidLicenseAdd": "Failed to add an invalid license",
+  "audit_table.licenseRemoved": "Successfully removed a license",
   "audit_table.userId": "User ID",
   "audit_table.ip": "IP Address",
   "audit_table.session": "Session ID",