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

rename browserType to deviceType

Browse Source
This commit is contained in:
Kyle Spearrin
2018-01-05 11:13:24 -05:00
parent 2ef937f333
commit 01cf48bbed
8 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/abstractions/browserUtils.service.ts
View File

@@ -1,8 +1,8 @@
import { BrowserType } from '../../enums/browserType.enum';
import { DeviceType } from '../../enums/deviceType.enum';
export interface BrowserUtilsService {
getBrowser(): BrowserType;
getBrowserString(): string;
getDevice(): DeviceType;
getDeviceString(): string;
isFirefox(): boolean;
isChrome(): boolean;
isEdge(): boolean;

2
src/services/api.service.ts
View File

@@ -38,7 +38,7 @@ export default class ApiService {
constructor(private tokenService: TokenService, browserUtilsService: BrowserUtilsService,
logoutCallback: Function) {
this.logoutCallback = logoutCallback;
this.deviceType = browserUtilsService.getBrowser().toString();
this.deviceType = browserUtilsService.getDevice().toString();
}
setUrls(urls: EnvironmentUrls) {

10
src/services/browserUtils.service.spec.ts
View File

@@ -1,5 +1,5 @@
import BrowserUtilsService from './browserUtils.service';
import { BrowserType } from '../enums/browserType.enum';
import { DeviceType } from '../enums/deviceType.enum';
describe('Browser Utils Service', () => {
describe('getDomain', () => {
@@ -48,7 +48,7 @@ describe('Browser Utils Service', () => {
});
const browserUtilsService = new BrowserUtilsService();
expect(browserUtilsService.getBrowser()).toBe(BrowserType.Chrome);
expect(browserUtilsService.getDevice()).toBe(DeviceType.Chrome);
});
it('should detect firefox', () => {
@@ -58,7 +58,7 @@ describe('Browser Utils Service', () => {
});
const browserUtilsService = new BrowserUtilsService();
expect(browserUtilsService.getBrowser()).toBe(BrowserType.Firefox);
expect(browserUtilsService.getDevice()).toBe(DeviceType.Firefox);
});
it('should detect opera', () => {
@@ -68,7 +68,7 @@ describe('Browser Utils Service', () => {
});
const browserUtilsService = new BrowserUtilsService();
expect(browserUtilsService.getBrowser()).toBe(BrowserType.Opera);
expect(browserUtilsService.getDevice()).toBe(DeviceType.Opera);
});
it('should detect edge', () => {
@@ -78,7 +78,7 @@ describe('Browser Utils Service', () => {
});
const browserUtilsService = new BrowserUtilsService();
expect(browserUtilsService.getBrowser()).toBe(BrowserType.Edge);
expect(browserUtilsService.getDevice()).toBe(DeviceType.Edge);
});
});
});

63
src/services/browserUtils.service.ts
View File

@@ -1,14 +1,14 @@
import * as tldjs from 'tldjs';
import { BrowserType } from '../enums/browserType.enum';
import { DeviceType } from '../enums/deviceType.enum';
import { BrowserUtilsService as BrowserUtilsServiceInterface } from './abstractions/browserUtils.service';
const AnalyticsIds = {
[BrowserType.Chrome]: 'UA-81915606-6',
[BrowserType.Firefox]: 'UA-81915606-7',
[BrowserType.Opera]: 'UA-81915606-8',
[BrowserType.Edge]: 'UA-81915606-9',
[BrowserType.Vivaldi]: 'UA-81915606-15',
[BrowserType.Safari]: 'UA-81915606-16',
[DeviceType.Chrome]: 'UA-81915606-6',
[DeviceType.Firefox]: 'UA-81915606-7',
[DeviceType.Opera]: 'UA-81915606-8',
[DeviceType.Edge]: 'UA-81915606-9',
[DeviceType.Vivaldi]: 'UA-81915606-15',
[DeviceType.Safari]: 'UA-81915606-16',
};
export default class BrowserUtilsService implements BrowserUtilsServiceInterface {
@@ -49,56 +49,56 @@ export default class BrowserUtilsService implements BrowserUtilsServiceInterface
return ipRegex.test(ipString);
}
private browserCache: BrowserType = null;
private deviceCache: DeviceType = null;
private analyticsIdCache: string = null;
getBrowser(): BrowserType {
if (this.browserCache) {
return this.browserCache;
getDevice(): DeviceType {
if (this.deviceCache) {
return this.deviceCache;
}
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Gecko/') !== -1) {
this.browserCache = BrowserType.Firefox;
this.deviceCache = DeviceType.Firefox;
} else if ((!!(window as any).opr && !!opr.addons) || !!(window as any).opera ||
navigator.userAgent.indexOf(' OPR/') >= 0) {
this.browserCache = BrowserType.Opera;
this.deviceCache = DeviceType.Opera;
} else if (navigator.userAgent.indexOf(' Edge/') !== -1) {
this.browserCache = BrowserType.Edge;
this.deviceCache = DeviceType.Edge;
} else if (navigator.userAgent.indexOf(' Vivaldi/') !== -1) {
this.browserCache = BrowserType.Vivaldi;
this.deviceCache = DeviceType.Vivaldi;
} else if ((window as any).chrome) {
this.browserCache = BrowserType.Chrome;
this.deviceCache = DeviceType.Chrome;
}
return this.browserCache;
return this.deviceCache;
}
getBrowserString(): string {
return BrowserType[this.getBrowser()].toLowerCase();
getDeviceString(): string {
return DeviceType[this.getDevice()].toLowerCase();
}
isFirefox(): boolean {
return this.getBrowser() === BrowserType.Firefox;
return this.getDevice() === DeviceType.Firefox;
}
isChrome(): boolean {
return this.getBrowser() === BrowserType.Chrome;
return this.getDevice() === DeviceType.Chrome;
}
isEdge(): boolean {
return this.getBrowser() === BrowserType.Edge;
return this.getDevice() === DeviceType.Edge;
}
isOpera(): boolean {
return this.getBrowser() === BrowserType.Opera;
return this.getDevice() === DeviceType.Opera;
}
isVivaldi(): boolean {
return this.getBrowser() === BrowserType.Vivaldi;
return this.getDevice() === DeviceType.Vivaldi;
}
isSafari(): boolean {
return this.getBrowser() === BrowserType.Safari;
return this.getDevice() === DeviceType.Safari;
}
analyticsId(): string {
@@ -106,7 +106,7 @@ export default class BrowserUtilsService implements BrowserUtilsServiceInterface
return this.analyticsIdCache;
}
this.analyticsIdCache = AnalyticsIds[this.getBrowser()];
this.analyticsIdCache = AnalyticsIds[this.getDevice()];
return this.analyticsIdCache;
}
@@ -215,11 +215,18 @@ export default class BrowserUtilsService implements BrowserUtilsServiceInterface
isViewOpen(): boolean {
const popupOpen = chrome.extension.getViews({ type: 'popup' }).length > 0;
const tabOpen = chrome.extension.getViews({ type: 'tab' }).length > 0;
if (popupOpen) {
return true;
}
const sidebarView = this.sidebarViewName();
const sidebarOpen = sidebarView != null && chrome.extension.getViews({ type: sidebarView }).length > 0;
if (sidebarOpen) {
return true;
}
return popupOpen || tabOpen || sidebarOpen;
const tabOpen = chrome.extension.getViews({ type: 'tab' }).length > 0;
return tabOpen;
}
private sidebarViewName(): string {