fix: 🐛 returned spacing in header strings

Author: josh-hemphill

src/index.ts

@@ -73,19 +73,23 @@ export class CspDirectives {
 				const val = typeof this.CSP[v] === 'boolean'
 					? ''
 					: normalizeArrayString(this.CSP[v])
-						.map((v) => `'${v}'`).join(' ');
+						.map((v) => ` '${v}'`).join('');
 				results['Content-Security-Policy'] +=
-					` ${v} ${val};`;
+					` ${v}${val};`;
 			}
 			if (this.ReportOnly && this.ReportOnly[v]) {
 				const val = typeof this.ReportOnly[v] === 'boolean'
 					? ''
 					: normalizeArrayString(this.ReportOnly[v])
-						.map((v) => `'${v}'`).join(' ');
+						.map((v) => ` '${v}'`).join('');
 				results['Content-Security-Policy-Report-Only'] +=
-					` ${v} ${val};`;
+					` ${v}${val};`;
 			}
 		});
+		results['Content-Security-Policy-Report-Only'] =
+			results['Content-Security-Policy-Report-Only'].trim();
+		results['Content-Security-Policy'] =
+			results['Content-Security-Policy'].trim();
 		return results;
 	}
 }

tests/basic.test.ts

@@ -39,6 +39,21 @@ describe('new CspDirectives()',() => {
 				'Referrer-Policy': 'strict-origin-when-cross-origin',
 			});
 		});
+		it('returns boolean directives',() => {
+			const csp: Directives = {
+				'upgrade-insecure-requests': true,
+			};
+			const inst = new CspDirectives(csp,[],csp);
+			const getHeaders = jest.spyOn(inst,'getHeaders');
+			const headers = inst.getHeaders();
+			expect(getHeaders).toHaveReturned();
+			expect(headers).toMatchObject({
+				'Content-Security-Policy-Report-Only': 'upgrade-insecure-requests;',
+				'Content-Security-Policy': 'upgrade-insecure-requests;',
+				'Report-To': '',
+				'Referrer-Policy': 'strict-origin-when-cross-origin',
+			});
+		});
 		it('returns on all set',() => {
 			const sampleSha256 = `sha256-${sample64Hash('sha256')}` as const;
 			const csp: Directives = {
@@ -73,7 +88,7 @@ describe('new CspDirectives()',() => {
 					endpoints: [{url:endpoint}],
 				},
 			];
-			const result = Object.entries(csp).map(([k,v]) => ` ${k} '${v}';`).join('');
+			const result = Object.entries(csp).map(([k,v]) => `${k} '${v}';`).join(' ');
 			const inst = new CspDirectives(csp,reportTo,csp,'strict-origin');
 			const getHeaders = jest.spyOn(inst,'getHeaders');
 			const headers = inst.getHeaders();