Merge pull request #10 from wes4m/windows_cr_fix

Windows \r\n fix
wes4m · Oct 18, 2022 · ec18c94 · ec18c94
2 parents 56b4300 + 324af4b
commit ec18c94
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/zatca/signing/index.ts b/src/zatca/signing/index.ts
@@ -118,7 +118,8 @@ export const getCertificateInfo = (certificate_string: string): {hash: string, i
  * @returns String base64 encoded certificate body.
  */
 export const cleanUpCertificateString = (certificate_string: string): string => {
-    return certificate_string.replace("-----BEGIN CERTIFICATE-----\n", "").replace("-----END CERTIFICATE-----", "").trim()
+    const r = process.platform === "win32" ? "\r" : "";
+    return certificate_string.replace(`-----BEGIN CERTIFICATE-----${r}\n`, "").replace("-----END CERTIFICATE-----", "").trim()
 }
 
 /**
@@ -127,7 +128,8 @@ export const cleanUpCertificateString = (certificate_string: string): string =>
  * @returns String base64 encoded private key body.
  */
  export const cleanUpPrivateKeyString = (certificate_string: string): string => {
-    return certificate_string.replace("-----BEGIN EC PRIVATE KEY-----\n", "").replace("-----END EC PRIVATE KEY-----", "").trim()
+    const r = process.platform === "win32" ? "\r" : "";
+    return certificate_string.replace(`-----BEGIN EC PRIVATE KEY-----${r}\n`, "").replace("-----END EC PRIVATE KEY-----", "").trim()
 }