fix: implified the exported interface

src/js/hmrc/mtdFraudPrevention.js

@@ -28,39 +28,32 @@ export const fraudPreventionHeadersEnum = {
   DEVICE_ID: "Gov-Client-Device-ID",
 };
 
-const getScreenDetails = () => {
+const getScreenData = () => {
   const screenDetails = `width=${getScreenWidth()}&height=${getScreenHeight()}&scaling-factor=${getScreenScalingFactor()}&colour-depth=${getScreenColourDepth()}`;
   return encodeURI(screenDetails);
 };
 
+export const getScreenDetails = () => {
+  return {
+    width: getScreenWidth(),
+    height: getScreenHeight(),
+    colorDepth: getScreenColourDepth(),
+    scalingFactor: getScreenScalingFactor(),
+  };
+}
+
 const getWindowSize = () => {
   const windowSize = `width=${getWindowWidth()}&height=${getWindowHeight()}`;
   return encodeURI(windowSize);
 };
 
-export const screenWidth = () => {
-  return getScreenWidth();
-}
-
-export const screenHeight = () => {
-  return getScreenHeight();
-}
-
-export const screenColorDepth = () => {
-  return getScreenColourDepth();
+export const windowDetails = () => {
+  return {
+    width: getWindowWidth(),
+    height: getWindowHeight(),
+  };
 }
 
-export const screenScalingFactor = () => {
-  return getScreenScalingFactor();
-}
-
-export const windowWidth = () => {
-  return getWindowWidth();
-}
-
-export const windowHeight = () => {
-  return getWindowHeight();
-}
 /**
  * Returns Map of HMRC Fraud prevention headers.
  * @returns {object} with two fields headers and errors - The headers are a Map object and the errors are an array. If there are no errors, the array is empty
@@ -72,7 +65,7 @@ export const getFraudPreventionHeaders = async () => {
     { header: fraudPreventionHeadersEnum.TIMEZONE, callback: getTimezone },
     {
       header: fraudPreventionHeadersEnum.SCREENS_DETAILS,
-      callback: getScreenDetails,
+      callback: getScreenData,
     },
     { header: fraudPreventionHeadersEnum.WINDOW_SIZE, callback: getWindowSize },
     {

src/js/index.js

@@ -1,21 +1,12 @@
 import {
   fraudPreventionHeadersEnum,
   getFraudPreventionHeaders,
-  screenWidth,
-  screenHeight,
-  screenColorDepth,
-  screenScalingFactor,
-  windowWidth,
-  windowHeight,
+  getScreenDetails,
+  windowDetails,
 } from "./hmrc/mtdFraudPrevention";
 
 exports.fraudPreventionHeadersEnum = fraudPreventionHeadersEnum;
 exports.getFraudPreventionHeaders = getFraudPreventionHeaders;
 
-exports.screenWidth = screenWidth;
-exports.screenHeight = screenHeight;
-exports.screenColorDepth = screenColorDepth;
-exports.screenScalingFactor = screenScalingFactor;
-
-exports.windowWidth = windowWidth;
-exports.windowHeight = windowHeight;
+exports.getScreenDetails = getScreenDetails;
+exports.windowDetails = windowDetails;

tests/unit/hmrc/mtdFraudPrevention.test.js

@@ -1,12 +1,8 @@
 import getMockBrowserPluginDetails from "../mock/MockData";
-import { 
-  getFraudPreventionHeaders, 
-  screenWidth, 
-  screenHeight, 
-  screenColorDepth, 
-  screenScalingFactor, 
-  windowWidth, 
-  windowHeight 
+import {
+  getFraudPreventionHeaders,
+  getScreenDetails,
+  windowDetails,
 } from "../../../src/js";
 import {
   MockRTCPeerConnection,
@@ -136,10 +132,10 @@ describe("FraudPreventionHeaders", () => {
         devicePixelRatio: 2,
       }));
     });
-    it("width", () => expect(screenWidth()).toBe(1019));
-    it("height", () => expect(screenHeight()).toBe(1021));
-    it("color depth", () => expect(screenColorDepth()).toBe(17));
-    it("scaling factor", () => expect(screenScalingFactor()).toBe(2));
+    it("width", () => expect(getScreenDetails().width).toBe(1019));
+    it("height", () => expect(getScreenDetails().height).toBe(1021));
+    it("color depth", () => expect(getScreenDetails().colorDepth).toBe(17));
+    it("scaling factor", () => expect(getScreenDetails().scalingFactor).toBe(2));
   });
   describe("window details", () => {
     beforeEach(() => {
@@ -148,8 +144,8 @@ describe("FraudPreventionHeaders", () => {
         innerHeight: 1013,
       }));
     });
-    it("width", () => expect(windowWidth()).toBe(1009));
-    it("height", () => expect(windowHeight()).toBe(1013));
+    it("width", () => expect(windowDetails().width).toBe(1009));
+    it("height", () => expect(windowDetails().height).toBe(1013));
   });
 
 });