Update to self

bitwarden · Sep 28, 2022 · 8f1eb2e · 8f1eb2e
1 parent a384a69
commit 8f1eb2e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/apps/browser/src/globals.d.ts b/apps/browser/src/globals.d.ts
@@ -1,3 +1,5 @@
+export {};
+
 declare function escape(s: string): string;
 declare function unescape(s: string): string;
 /**
@@ -127,3 +129,10 @@ declare namespace chrome {
 declare let opr: Opera | undefined;
 declare let opera: unknown | undefined;
 declare let safari: any;
+
+declare global {
+  interface Window {
+    opr: Opera | undefined;
+    opera: unknown;
+  }
+}
diff --git a/apps/browser/src/services/browserPlatformUtils.service.ts b/apps/browser/src/services/browserPlatformUtils.service.ts
@@ -33,16 +33,16 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
     ) {
       this.deviceCache = DeviceType.FirefoxExtension;
     } else if (
-      (typeof opr !== "undefined" && typeof opr.addons !== "undefined") ||
-      typeof opera !== "undefined" ||
+      (self.opr && self.opr.addons) ||
+      self.opera ||
       navigator.userAgent.indexOf(" OPR/") >= 0
     ) {
       this.deviceCache = DeviceType.OperaExtension;
     } else if (navigator.userAgent.indexOf(" Edg/") !== -1) {
       this.deviceCache = DeviceType.EdgeExtension;
     } else if (navigator.userAgent.indexOf(" Vivaldi/") !== -1) {
       this.deviceCache = DeviceType.VivaldiExtension;
-    } else if ((window as any).chrome && navigator.userAgent.indexOf(" Chrome/") !== -1) {
+    } else if (window.chrome && navigator.userAgent.indexOf(" Chrome/") !== -1) {
       this.deviceCache = DeviceType.ChromeExtension;
     } else if (navigator.userAgent.indexOf(" Safari/") !== -1) {
       this.deviceCache = DeviceType.SafariExtension;