From 655e6dc2a4f34766792a642a674198fa5e079052 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Fri, 17 Dec 2021 15:10:06 +0530 Subject: [PATCH] refactor: move user agent checks to separate file --- .../hoppscotch-app/helpers/strategies/ExtensionStrategy.ts | 7 +++---- packages/hoppscotch-app/helpers/utils/userAgent.ts | 4 ++++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 packages/hoppscotch-app/helpers/utils/userAgent.ts diff --git a/packages/hoppscotch-app/helpers/strategies/ExtensionStrategy.ts b/packages/hoppscotch-app/helpers/strategies/ExtensionStrategy.ts index 8c18bec48..f5af3e3db 100644 --- a/packages/hoppscotch-app/helpers/strategies/ExtensionStrategy.ts +++ b/packages/hoppscotch-app/helpers/strategies/ExtensionStrategy.ts @@ -1,17 +1,16 @@ import * as TE from "fp-ts/TaskEither" import { pipe } from "fp-ts/function" import { NetworkResponse, NetworkStrategy } from "../network" +import { browserIsChrome, browserIsFirefox } from "../utils/userAgent" export const hasExtensionInstalled = () => typeof window.__POSTWOMAN_EXTENSION_HOOK__ !== "undefined" export const hasChromeExtensionInstalled = () => - hasExtensionInstalled() && - /Chrome/i.test(navigator.userAgent) && - /Google/i.test(navigator.vendor) + hasExtensionInstalled() && browserIsChrome() export const hasFirefoxExtensionInstalled = () => - hasExtensionInstalled() && /Firefox/i.test(navigator.userAgent) + hasExtensionInstalled() && browserIsFirefox() export const cancelRunningExtensionRequest = () => { if ( diff --git a/packages/hoppscotch-app/helpers/utils/userAgent.ts b/packages/hoppscotch-app/helpers/utils/userAgent.ts new file mode 100644 index 000000000..465666a91 --- /dev/null +++ b/packages/hoppscotch-app/helpers/utils/userAgent.ts @@ -0,0 +1,4 @@ +export const browserIsChrome = () => + /Chrome/i.test(navigator.userAgent) && /Google/i.test(navigator.vendor) + +export const browserIsFirefox = () => /Firefox/i.test(navigator.userAgent)