bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

feature/cli-18-import (#8)

Browse Source 
* feature/cli-18-import

* updates to jslib
This commit is contained in:
Brandon Davis
2018-08-06 09:37:56 -04:00
committed by Kyle Spearrin
parent 49d3f22704
commit a5476f12aa
4 changed files with 243 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/misc/utils.ts
View File

@@ -71,7 +71,7 @@ export class Utils {
static fromBufferToB64(buffer: ArrayBuffer): string {
if (Utils.isNode) {
return new Buffer(buffer).toString('base64');
return Buffer.from(buffer).toString('base64');
} else {
let binary = '';
const bytes = new Uint8Array(buffer);
@@ -84,7 +84,7 @@ export class Utils {
static fromBufferToUtf8(buffer: ArrayBuffer): string {
if (Utils.isNode) {
return new Buffer(buffer).toString('utf8');
return Buffer.from(buffer).toString('utf8');
} else {
const bytes = new Uint8Array(buffer);
const encodedString = String.fromCharCode.apply(null, bytes);
@@ -99,7 +99,7 @@ export class Utils {
// ref: https://stackoverflow.com/a/40031979/1090359
static fromBufferToHex(buffer: ArrayBuffer): string {
if (Utils.isNode) {
return new Buffer(buffer).toString('hex');
return Buffer.from(buffer).toString('hex');
} else {
const bytes = new Uint8Array(buffer);
return Array.prototype.map.call(bytes, (x: number) => ('00' + x.toString(16)).slice(-2)).join('');
@@ -126,7 +126,7 @@ export class Utils {
static fromB64ToUtf8(b64Str: string): string {
if (Utils.isNode) {
return new Buffer(b64Str, 'base64').toString('utf8');
return Buffer.from(b64Str, 'base64').toString('utf8');
} else {
return decodeURIComponent(escape(window.atob(b64Str)));
}