From 59674744be3a2aaed7c03ad4d9b223f1ced672c7 Mon Sep 17 00:00:00 2001
From: Krishna Acondy <kc.acondy@outlook.com>
Date: Thu, 13 Aug 2020 21:46:08 +0100
Subject: [PATCH] fix(*): use fetch polyfill for Firefox versions older than 60

---
 src/SASjs.ts            |  4 ++--
 src/utils/isIeOrEdge.ts | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/SASjs.ts b/src/SASjs.ts
index 8ab8daf..c78eb3a 100644
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -1,6 +1,6 @@
 import * as e6p from "es6-promise";
 (e6p as any).polyfill();
-if (isIEorEdgeOrFirefox60()) {
+if (isIEorEdgeOrOldFirefox()) {
   window.fetch = undefined as any; // ensure the polyfill runs
 }
 // tslint:disable-next-line
@@ -31,7 +31,7 @@ import {
 import { SASViyaApiClient } from "./SASViyaApiClient";
 import { SAS9ApiClient } from "./SAS9ApiClient";
 import { FileUploader } from "./FileUploader";
-import { isIEorEdgeOrFirefox60 } from "./utils/isIeOrEdge";
+import { isIEorEdgeOrOldFirefox } from "./utils/isIeOrEdge";
 
 const defaultConfig: SASjsConfig = {
   serverUrl: "",
diff --git a/src/utils/isIeOrEdge.ts b/src/utils/isIeOrEdge.ts
index 33db0d8..59400da 100644
--- a/src/utils/isIeOrEdge.ts
+++ b/src/utils/isIeOrEdge.ts
@@ -1,8 +1,12 @@
-export function isIEorEdgeOrFirefox60() {
+export function isIEorEdgeOrOldFirefox() {
   const ua = window.navigator.userAgent;
 
-  if (ua.indexOf("Firefox/60") > 0) {
-    return true;
+  if (ua.indexOf("Firefox") > 0) {
+    const version = parseInt(
+      ua.substring(ua.lastIndexOf("Firefox/") + 8, ua.length),
+      10
+    );
+    return version <= 60;
   }
 
   const msie = ua.indexOf("MSIE ");