Merge pull request #20 from wes4m/dev

v0.1.9 Fixes

Author: wes4m

README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <br/>
   <img src="./docs/logo.png"/>
-  <p>v0.1.8 (experimental)</p>
+  <p>v0.1.9 (experimental)</p>
   <br/>
   <br/>
   <p>
@@ -17,7 +17,7 @@
         <img src="https://img.shields.io/badge/maintainer-wes4m-blue"/>
     </a>
     <a href="https://badge.fury.io/js/zatca-xml-js">
-      <img src="https://badge.fury.io/js/zatca-xml-js.svg/?v=0.1.8"/>
+      <img src="https://badge.fury.io/js/zatca-xml-js.svg/?v=0.1.9"/>
     </a>
   </p>
 

package-lock.json

@@ -1,9 +1,11 @@
 {
   "name": "zatca-xml-js",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "An implementation of Saudi Arabia ZATCA's E-Invoicing requirements, processes, and standards.",
   "main": "lib/index.js",
-  "files": ["lib/**/*"],
+  "files": [
+    "lib/**/*"
+  ],
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
     "test": "tsc && node testing_lib/tests/test.js",

package.json

@@ -60,6 +60,10 @@ const invoice = new ZATCASimplifiedTaxInvoice({
 const main = async () => {
     try {
 
+        // TEMP_FOLDER: Use .env or set directly here (Default: /tmp/)
+        // Enable for windows
+        // process.env.TEMP_FOLDER = `${require("os").tmpdir()}\\`;
+
         // Init a new EGS
         const egs = new EGS(egsunit);
 

src/examples/full.ts

@@ -84,8 +84,8 @@ const generateCSR = async (egs_info: EGSUnitInfo, production: boolean, solution_
     // This creates a temporary private file, and csr config file to pass to OpenSSL in order to create and sign the CSR.
     // * In terms of security, this is very bad as /tmp can be accessed by all users. a simple watcher by unauthorized user can retrieve the keys.
     // Better change it to some protected dir.
-    const private_key_file = `/tmp/${uuidv4()}.pem`;
-    const csr_config_file = `/tmp/${uuidv4()}.cnf`;
+    const private_key_file = `${process.env.TEMP_FOLDER ?? "/tmp/"}${uuidv4()}.pem`;
+    const csr_config_file = `${process.env.TEMP_FOLDER ?? "/tmp/"}${uuidv4()}.cnf`;
     fs.writeFileSync(private_key_file, egs_info.private_key);
     fs.writeFileSync(csr_config_file, defaultCSRConfig({
         egs_model: egs_info.model,

src/zatca/egs/index.ts

@@ -92,7 +92,8 @@ export const generateQR = ({invoice_xml, digital_signature, public_key, certific
 const TLV = (tags: any[]): Buffer => {
     const tlv_tags: Buffer[] = []
     tags.forEach((tag, i) => {
-        const current_tlv_value: Buffer = Buffer.from([i+1, tag.length, ...Buffer.from(tag)]);
+        const tagValueBuffer: Buffer = Buffer.from(tag);
+        const current_tlv_value: Buffer = Buffer.from([i+1, tagValueBuffer.byteLength, ...tagValueBuffer]);
         tlv_tags.push(current_tlv_value)
     });
     return Buffer.concat(tlv_tags);

src/zatca/qr/index.ts

@@ -118,8 +118,7 @@ export const getCertificateInfo = (certificate_string: string): {hash: string, i
  * @returns String base64 encoded certificate body.
  */
 export const cleanUpCertificateString = (certificate_string: string): string => {
-    const r = process.platform === "win32" ? "\r" : "";
-    return certificate_string.replace(`-----BEGIN CERTIFICATE-----${r}\n`, "").replace("-----END CERTIFICATE-----", "").trim()
+    return certificate_string.replace(`-----BEGIN CERTIFICATE-----\n`, "").replace("-----END CERTIFICATE-----", "").trim()
 }
 
 /**
@@ -128,8 +127,7 @@ export const cleanUpCertificateString = (certificate_string: string): string =>
  * @returns String base64 encoded private key body.
  */
  export const cleanUpPrivateKeyString = (certificate_string: string): string => {
-    const r = process.platform === "win32" ? "\r" : "";
-    return certificate_string.replace(`-----BEGIN EC PRIVATE KEY-----${r}\n`, "").replace("-----END EC PRIVATE KEY-----", "").trim()
+    return certificate_string.replace(`-----BEGIN EC PRIVATE KEY-----\n`, "").replace("-----END EC PRIVATE KEY-----", "").trim()
 }