From 91c849c9f22b841a69df1005c7bdcb4399505f82 Mon Sep 17 00:00:00 2001
From: Alexis Tyler <xo@wvvw.me>
Date: Tue, 20 Apr 2021 21:22:23 +0930
Subject: [PATCH] fix: use btoa to read key file

---
 app/core/modules/info/get-license.ts | 5 +++--
 package-lock.json                    | 5 +++++
 package.json                         | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/core/modules/info/get-license.ts b/app/core/modules/info/get-license.ts
index 6abb899af..6956550a9 100644
--- a/app/core/modules/info/get-license.ts
+++ b/app/core/modules/info/get-license.ts
@@ -4,6 +4,7 @@
  */
 
 import fs from 'fs';
+import btoa from 'btoa';
 import { varState } from '../../states';
 import { CoreContext, CoreResult } from '../../types';
 import { ensurePermission } from '../../utils';
@@ -27,8 +28,8 @@ export const getLicense = async function (context: CoreContext): Promise<CoreRes
 	// Get license data
 	const type = varState.data.regTy;
 	const state = (varState.data.regCheck.trim() === '' ? type : varState.data.regCheck).toUpperCase();
-	const file = await fs.promises.readFile(varState.data.regFile, 'utf8');
-	const parsedFile = Buffer.from(file).toString('base64').trim().replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+	const file = await fs.promises.readFile(varState.data.regFile, 'binary');
+	const parsedFile = btoa(file).trim().replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
 
 	return {
 		get text() {
diff --git a/package-lock.json b/package-lock.json
index 7a3468222..b86434814 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2745,6 +2745,11 @@
         "node-int64": "^0.4.0"
       }
     },
+    "btoa": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz",
+      "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+    },
     "buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
diff --git a/package.json b/package.json
index 9ad8f10e9..e0c9574b7 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "apollo-server-express": "2.19.2",
     "async-exit-hook": "^2.0.1",
     "async-mutex": "^0.3.0",
+    "btoa": "^1.2.1",
     "bycontract": "^2.0.10",
     "bytes": "^3.1.0",
     "camelcase": "6.2.0",