Omit false form fields when creating backup

mattwebbio · Nov 30, 2022 · 9b1afd7 · 9b1afd7
1 parent 3c4f303
commit 9b1afd7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/src/client.test.ts b/src/client.test.ts
@@ -175,15 +175,15 @@ describe('Client', () => {
       expect(requestBody).toContain('name="adlist"\r\n\r\ntrue');
       expect(requestBody).toContain('name="client"\r\n\r\ntrue');
       expect(requestBody).toContain('name="group"\r\n\r\ntrue');
-      expect(requestBody).toContain('name="auditlog"\r\n\r\nfalse');
-      expect(requestBody).toContain('name="staticdhcpleases"\r\n\r\nfalse');
+      expect(requestBody).not.toContain('name="auditlog"');
+      expect(requestBody).not.toContain('name="staticdhcpleases"');
       expect(requestBody).toContain('name="localdnsrecords"\r\n\r\ntrue');
       expect(requestBody).toContain('name="localcnamerecords"\r\n\r\ntrue');
       expect(requestBody).toContain('name="flushtables"\r\n\r\ntrue');
       expect(requestBody).not.toContain('name="action"\r\n\r\nin');
       expect(requestBody).not.toContain('name="zip_file"\r\n\r\nin');
       expect(requestBody.match(/Content-Disposition: form-data; name=/g)).toHaveLength(
-        13
+        11
       );
     });
   });
@@ -315,8 +315,8 @@ describe('Client', () => {
       expect(requestBody).toContain('name="adlist"\r\n\r\ntrue');
       expect(requestBody).toContain('name="client"\r\n\r\ntrue');
       expect(requestBody).toContain('name="group"\r\n\r\ntrue');
-      expect(requestBody).toContain('name="auditlog"\r\n\r\nfalse');
-      expect(requestBody).toContain('name="staticdhcpleases"\r\n\r\nfalse');
+      expect(requestBody).not.toContain('name="auditlog"');
+      expect(requestBody).not.toContain('name="staticdhcpleases"');
       expect(requestBody).toContain('name="localdnsrecords"\r\n\r\ntrue');
       expect(requestBody).toContain('name="localcnamerecords"\r\n\r\ntrue');
       expect(requestBody).toContain('name="flushtables"\r\n\r\ntrue');
@@ -325,7 +325,7 @@ describe('Client', () => {
         'name="zip_file"; filename="backup.tar.gz"\r\nContent-Type: application/octet-stream'
       );
       expect(requestBody.match(/Content-Disposition: form-data; name=/g)).toHaveLength(
-        15
+        13
       );
     });
 
@@ -369,8 +369,8 @@ describe('Client', () => {
       expect(requestBody).toContain('name="adlist"\r\n\r\ntrue');
       expect(requestBody).toContain('name="client"\r\n\r\ntrue');
       expect(requestBody).toContain('name="group"\r\n\r\ntrue');
-      expect(requestBody).toContain('name="auditlog"\r\n\r\nfalse');
-      expect(requestBody).toContain('name="staticdhcpleases"\r\n\r\nfalse');
+      expect(requestBody).not.toContain('name="auditlog"');
+      expect(requestBody).not.toContain('name="staticdhcpleases"');
       expect(requestBody).toContain('name="localdnsrecords"\r\n\r\ntrue');
       expect(requestBody).toContain('name="localcnamerecords"\r\n\r\ntrue');
       expect(requestBody).toContain('name="flushtables"\r\n\r\ntrue');
@@ -379,7 +379,7 @@ describe('Client', () => {
         'name="zip_file"; filename="backup.tar.gz"\r\nContent-Type: application/octet-stream'
       );
       expect(requestBody.match(/Content-Disposition: form-data; name=/g)).toHaveLength(
-        15
+        13
       );
       updateGravity.mockRestore();
     });

diff --git a/src/client.ts b/src/client.ts
@@ -171,18 +171,18 @@ export class Client {
     const form = new FormData();
     form.append('token', this.token);
 
-    form.append('whitelist', Config.syncOptions.whitelist);
-    form.append('regex_whitelist', Config.syncOptions.regexWhitelist);
-    form.append('blacklist', Config.syncOptions.blacklist);
-    form.append('regexlist', Config.syncOptions.regexlist);
-    form.append('adlist', Config.syncOptions.adlist);
-    form.append('client', Config.syncOptions.client);
-    form.append('group', Config.syncOptions.group);
-    form.append('auditlog', Config.syncOptions.auditlog);
-    form.append('staticdhcpleases', Config.syncOptions.staticdhcpleases);
-    form.append('localdnsrecords', Config.syncOptions.localdnsrecords);
-    form.append('localcnamerecords', Config.syncOptions.localcnamerecords);
-    form.append('flushtables', Config.syncOptions.flushtables);
+    if (Config.syncOptions.whitelist) form.append('whitelist', true);
+    if (Config.syncOptions.regexWhitelist) form.append('regex_whitelist', true);
+    if (Config.syncOptions.blacklist) form.append('blacklist', true);
+    if (Config.syncOptions.regexlist) form.append('regexlist', true);
+    if (Config.syncOptions.adlist) form.append('adlist', true);
+    if (Config.syncOptions.client) form.append('client', true);
+    if (Config.syncOptions.group) form.append('group', true);
+    if (Config.syncOptions.auditlog) form.append('auditlog', true);
+    if (Config.syncOptions.staticdhcpleases) form.append('staticdhcpleases', true);
+    if (Config.syncOptions.localdnsrecords) form.append('localdnsrecords', true);
+    if (Config.syncOptions.localcnamerecords) form.append('localcnamerecords', true);
+    if (Config.syncOptions.flushtables) form.append('flushtables', true);
 
     return form;
   }