From 4f294642974c1528356fa307737235a7f80e4aba Mon Sep 17 00:00:00 2001
From: eternal-flame-AD <ef@eternalflame.info>
Date: Sun, 10 Mar 2019 15:03:37 +0800
Subject: [PATCH] use js-base64 for password base64 encoding

---
 ui/package-lock.json  | 13 +++++++++----
 ui/package.json       |  2 ++
 ui/src/CurrentUser.ts |  3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 82c12b2..9cbe286 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -230,6 +230,12 @@
       "integrity": "sha512-/UMY+2GkOZ27Vrc51pqC5J8SPd39FKt7kkoGAtWJ8s4msj0b15KehDWIiJpWY3/7tLxBQLLzJhIBhnEsXdzpgw==",
       "dev": true
     },
+    "@types/js-base64": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@types/js-base64/-/js-base64-2.3.1.tgz",
+      "integrity": "sha512-4RKbhIDGC87s4EBy2Cp2/5S2O6kmCRcZnD5KRCq1q9z2GhBte1+BdsfVKCpG8yKpDGNyEE2G6IqFIh6W2YwWPA==",
+      "dev": true
+    },
     "@types/json5": {
       "version": "0.0.29",
       "resolved": "http://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
@@ -7507,10 +7513,9 @@
       }
     },
     "js-base64": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz",
-      "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==",
-      "dev": true
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
     },
     "js-tokens": {
       "version": "3.0.2",
diff --git a/ui/package.json b/ui/package.json
index a6275a5..290a474 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -9,6 +9,7 @@
     "axios": "^0.18.0",
     "codemirror": "^5.43.0",
     "detect-browser": "^3.0.0",
+    "js-base64": "^2.5.1",
     "mobx": "^5.1.1",
     "mobx-react": "^5.2.8",
     "mobx-utils": "^5.0.2",
@@ -40,6 +41,7 @@
     "@types/detect-browser": "^2.0.1",
     "@types/get-port": "^4.0.0",
     "@types/jest": "^23.3.1",
+    "@types/js-base64": "^2.3.1",
     "@types/node": "^10.9.0",
     "@types/notifyjs": "^3.0.0",
     "@types/puppeteer": "^1.6.3",
diff --git a/ui/src/CurrentUser.ts b/ui/src/CurrentUser.ts
index 6e89e90..fb08056 100644
--- a/ui/src/CurrentUser.ts
+++ b/ui/src/CurrentUser.ts
@@ -1,5 +1,6 @@
 import axios, {AxiosResponse} from 'axios';
 import * as config from './config';
+import {Base64} from 'js-base64';
 import {detect} from 'detect-browser';
 import {SnackReporter} from './snack/SnackManager';
 import {observable} from 'mobx';
@@ -47,7 +48,7 @@ export class CurrentUser {
                 url: config.get('url') + 'client',
                 method: 'POST',
                 data: {name},
-                auth: {username, password},
+                headers: {Authorization: 'Basic ' + Base64.encode(username + ':' + password)},
             })
             .then((resp: AxiosResponse<IClient>) => {
                 this.snack(`A client named '${name}' was created for your session.`);