bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

vendors for background. clean out gulp.

Browse Source
This commit is contained in:
Kyle Spearrin
2017-11-08 10:22:26 -05:00
parent 1cd192a398
commit f937fca917
8 changed files with 63 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/services/utils.service.ts
View File

@@ -120,6 +120,15 @@ export default class UtilsService {
return bytes;
}
static fromUtf8ToArray(str: string): Uint8Array {
const strUtf8 = unescape(encodeURIComponent(str));
const arr = new Uint8Array(strUtf8.length);
for (let i = 0; i < strUtf8.length; i++) {
arr[i] = strUtf8.charCodeAt(i);
}
return arr;
}
static fromBufferToB64(buffer: ArrayBuffer): string {
let binary = '';
const bytes = new Uint8Array(buffer);
@@ -135,15 +144,6 @@ export default class UtilsService {
return decodeURIComponent(escape(encodedString));
}
static fromUtf8ToArray(str: string): Uint8Array {
const strUtf8 = unescape(encodeURIComponent(str));
const arr = new Uint8Array(strUtf8.length);
for (let i = 0; i < strUtf8.length; i++) {
arr[i] = strUtf8.charCodeAt(i);
}
return arr;
}
static saveObjToStorage(key: string, obj: any) {
return new Promise((resolve) => {
chrome.storage.local.set({ [key]: obj }, () => {
@@ -185,7 +185,7 @@ export default class UtilsService {
if (uriString.startsWith('http://') || uriString.startsWith('https://')) {
try {
const url = new URL(uriString);
if (!url || !url.hostname) {
if (!url.hostname) {
return null;
}
@@ -193,17 +193,17 @@ export default class UtilsService {
return url.hostname;
}
if ((window as any).tldjs) {
const domain = (window as any).tldjs.getDomain(uriString);
if (domain) {
if (typeof tldjs !== 'undefined' && tldjs) {
const domain = tldjs.getDomain(url.hostname);
if (domain != null) {
return domain;
}
}
return url.hostname;
} catch (e) { }
} else if ((window as any).tldjs) {
const domain: string = (window as any).tldjs.getDomain(uriString);
} else if (typeof tldjs !== 'undefined' && tldjs) {
const domain = tldjs.getDomain(uriString);
if (domain != null) {
return domain;
}
@@ -212,12 +212,6 @@ export default class UtilsService {
return null;
}
static validIpAddress(ipString: string): boolean {
// tslint:disable-next-line
const ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
return ipRegex.test(ipString);
}
static getHostname(uriString: string): string {
if (uriString == null) {
return null;
@@ -231,7 +225,7 @@ export default class UtilsService {
if (uriString.startsWith('http://') || uriString.startsWith('https://')) {
try {
const url = new URL(uriString);
if (!url || !url.hostname) {
if (!url.hostname) {
return null;
}
@@ -242,6 +236,12 @@ export default class UtilsService {
return null;
}
private static validIpAddress(ipString: string): boolean {
// tslint:disable-next-line
const ipRegex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
return ipRegex.test(ipString);
}
private browserCache: BrowserType = null;
private analyticsIdCache: string = null;