Merge pull request #41 from VSchool/update-interval

disable location check for now

.env.vault

@@ -4,13 +4,13 @@
 #/--------------------------------------------------/
 
 # development
-DOTENV_VAULT_DEVELOPMENT="DelsMBqLYnsobM+tDYKYM3htZ/oPL+G4dQVeCw8H0qplhiZZW316lf5SVNm+ccsTBHo+HDcdNlFPWXQpEScnwVllRrGbJuHn0icwpG3lq38WfP1eGzRl1I0+XvUFsgAL6tZM4Z95ViGIE/pFhagMx+QDQMyopP8iRxvJuSsKn0nlIk0yb0BJ7JCxDEK3GM/Ch1wNscBiexAGUH+ypkC9JKCttQrYFPJQMvhGbOeKV0eZRAxEVFSagn1cwi6dHiVWyO/Wh4O2GNTHAypegxacjUqJYdlUfSUKhUxBascEeYIsaSbJFHDGsi2DIG6iMQFNIOAv0dbbAhvEVB4J6zJWGyNAaLWxMBMGCOr5tZXh4yWVl0re4zQ126I4dj0VVcU0TLEPFdWmT2hgJHC8S6Q8fZTZ3JLDhFx5+8IesjxnQD9cNzBs3xP0s6BKFOnUrbkFKMmI2jwGA/E2h/Y10HqDmAB1Qx5fR5fNCRDzN0Ca4vXJwCFih2AmhSOS60aejfsX9g7LeLlUoCGRh/4uO4Yc/N2jj5IAJKfss7jzG0SwOh5pfd7iN1914kwJUoCtOv63fB7L4leDjzica9x1MbG2/lvwpP8fu5PTjj6hyq9MMAALqWczkvV3EnnVzSCwwEgYWb7Bgy6ddSDaPnOrOl+aR0B0M6ZH7jRQpH8Of74JyaHpmK8wBztR2YDLPQVXMDqCwboxtpA1DrKeIiRX/KPvUT6VbmazSOvpuADaWxaWo5+i3HgUFOi+cessJhFMV7F6zktZzzRulPQYN6wxSOf3xhAZ1x2dgiI0UTYyx3sT9HcJNmnIUu0CX78w66TiHtYvKzeARVteKE5/az/1VU7AKS0fZhHfXvaPTlM="
+DOTENV_VAULT_DEVELOPMENT="4oi/VHLO79K/3dV20Yre2dOmjIGdE+2pRmsgZUnwYiE/24Fzax6IP67h4xXejm3yfwxNqWtAfg4mBAhkpWHPChZdUkDUCqq2FrmtoGcf46ujAL3k2pbQ+3LQcbcqmaT/Es+r5zrEYB6mo82OrFJlQotnsR68mzE4aRHylKF7yZCokE1wf/u6UsaGrLoMgAY11W2gmFODqM9mlhvSfQeLA1d4I8EyNP8lDfeHN2ZF0rQ/jjA01qDASm1maJOgZKDYiqnHY3rm2zdfh/Qr0/QwjgtNV4ydWtrgkWoVIOOK+56FHILmrrnR4eKwicK2slMXQ8in/oPHuWfFHdn+JgEnmPJucNE7nJucl7nemkJaPqfK0INKr9sdb2KpkRl7lK3AM1zxtnwBKx1mZv+Q719aHrNaqE065dsnAVQevgA/vtqAO0BAAKGILxScPZYhwE9nAuQyD9jAoQ2Kajf77J9js4x4aUh33FzVCLndkt+ffp8QUqt9nFSd70cnxQ95wTI/wIpGhByuBXV73bcEJtNc6u9NvC/MtsXipXbi9l7EfUHW/Qd8dxhFsZT8OLnNVl2EekEP5AFOHYbiGcr4h5A2vGJ5TG/br69izMzG4xY+Wkr+tafJAl/icujrzDGikFr9ITLZ8Nw58XiA2n+Gy9PhDvq0+XL4e6g6ScaY/Z0IUbZXDYrAkMlLiJChyLiFlVIwGzGgH7+HBAqO5ZrOdKJm4sFXrEN7FX1LdaHwg59g+7jSSzBmBCjjjs3JW4CH2xLxiC4AYkNjBH5Yoi5C616nEzQ30e1uh9HPah4KQXVdAFbQ5nZa1bamL3mDPaLjGHMTdKeoeEQ3We24q6Lcwvmy3cNuKf2QMPIw63CGNcQiXEIp+t7VrA7H2U9+WYJEN3Be9gVENtTB"
 
 # ci
-DOTENV_VAULT_CI="oCsND8bnN8MCTLGPvnwP96DOq95zSOvSK2AlJUCCytUBaP4RnxSkYCHr6oJN+9qIHGP3v7OeirZUY94Ms3CJQWa5UdGZNmiU46Q9o4hagxJSZlyBGZF+YdEOqGwMN06oxK1K+LTBuaXNtto5VG5PwIeyZn3YtYBmSKp7EN3vaUzt5yitNdQDwq3WmRZgNxRBWdqnujHhjR7Luin+7/uXBciazDVZ5/4fjnzQldB/hKGxQo6aNbpQE++wzXK93KC3WG0TvyMgXGyxzyT3r5HUTi4tBMhIGuEq5aBPtSKHyknjVtASM8bEZaMfYgWm3t9Mj5cT0VZgil8o6so1ZXQALMygE6/3S2QL02UkDreRz+bI99VA6980MJatK/ivgq2VXHR6x/KPb3deov6asRrkwhJK2KlLtGlVTQGYkS6ybSgBoL/DAkK2PDyQuTqunJPQuzyIg4MmoMRlgY/UR4pYRYa39Ylkrjz+r9QpreIih93b6ndSzyo9kVyBZauuZxmVDgwN2w55ULQ/WLFdA6a1qqTKt72a/pB8QUjGJ7NYPBfUykEx4e1axzxsMqNN9nVAAy4pXf1oIIJV+ANuuiw1R9L7ofaBj0hqX9sGHeol9ZEJr2Uya0UtJQNTDoUDtcB3TWQBkzyUm1m0YmbuhlahvXVS1zNl2oCMhL7Yi/tX9UqQ2ZKq8TKW/qxeuXgdMe4r0bipZrhsWocFqxOM/rK8QuV6dlvyEYOdEvxuxNErxNkQA8eMXNkRsBoXcj0Z1dQurx8kN/hfhOc9EjecXaWxa3AP9bbSNpq5GdTbhoCou8jsPTvj754+IyAyhyJ8qncGwLv35khBW0lM/GBxi/hSdR9EagasM6MLH8DyIux/PJGBcaOvWIugNbmsF9q/"
+DOTENV_VAULT_CI="3xh4GDjvwO5Irw+EfgB/pq9kA0p6sqWbxP6z8NnXPFo/LIUegLgW+3gWC0ma34aa7Brt45Ua6P142YW2Rq+kSt/0E4/poZtx6PhUlt8and41Bn/UhgFvflxZcSZUNIYGRI1CMM+i+KWv2Eyayrrtv4x6JFLEvvKcA/OgnZ03iXLz3r2dzIVoIJbNOWzopzXLKWGBXeX2Y6szOFFGA3oiDt3Qw1ii9OEnRGbBJZPE1DFgs6wY1nbZPTz3RTJ6C2cVOiBzwBTTTOg6PzuBsSzQE4K4+WmW9nkZFo2Gcu9tgXqHwhQdBnZtVw8CxJjN6D4zaK431Y0Js3YnTHfbkmPHYerZyCw7lI8ZkyrIwdYUu7k1cnYOVUCeiGsNxx7JHbeHfV9iDRJAN9xCa7Q5AiVTUsqwUvC1idM+4RpsPrMJUNwPfIzZeydpiAPnI5pogUzPnDXg+KX5EWk+EJuB1/q14wteklpNB7hVl2cl6KAUyBiR/d5pTfmfTRpRVsFLoij5Nn19GfmEU8QMGL+f0MX/O3qb2R44Z64v5bEapgbKjbJo02LQMBNEnbrTsoN3nDQ4Qwi2ifRkMG3OinmPLCytrii+kEeNcC8RpSchS7MgOdAz/VqXyE2/o0jqxWnVlCyhJoFnQEn52NUiM2sN8LBFbHm96vHfmBNEXind8VdA9NdUrm7ygXxVk+R9/MRMkeAaCoVzJXlZf+PBo9cEy3DEpZX/Y9ZlWoDy5tVYbsXb1wM/VKJTefVOmWRrBX+6ULDEyADLVsVT871R+HLWpwY1mF7QF+sl9KqWm3KJcmdC+eJQvsamyQj+ZFz3fDr2Q7+Uiw/CoqcRndehZ4V5R42YlsiZSm4q4Eo702jlrTcPgB7ACZhBtqQc5zi4RbTAwBNLN05ourl659Y8wsHer9C2ik8vGMYT0WJhHw=="
 
 # qa
-DOTENV_VAULT_QA="61YTdvfyvtM2lsSxtgMOzHpHtQ2tT6Pal0Fafu55hoxmTPuvoNwW4qH4c/huPdRvVB+V/WwmWZbeAnRt68DdXhi9gfDrnkT5pg0ikQC1GNZ+DYUBzLGBNmUMnuffI5xenWhCQrU80SRJSLlJ/1azuX6Vfm0WE4ouHhNtGfnlG5LMOxkoOvGw71U7NT5tbe13UWQ9ejpUjP1MO17LLZ+IU851eFXRT/71/Mk+b2wOFUtXP8LZ6XybZtlLNMkJUQ8iOBTGGgTbV1J1s9B9AV/H7OVWNDaKpoBE/9B39Ogpk9j0JqZtg60vsht2dkFWhKr5z3H6bYVpYlTcRDlIq8ei1lmW9o74ERMUmMIQqKc7pOlq7z+sRQRVPVbybBWNVCKXtoQKxY5VESEco1Xx0ODcgqOZoR3jKeqCC3DoZOURzNau3khL5v72ZiTJhWBPUR0yWumvd6C2UJUYxVo0Z4cubc2Qoq0lxQr3y2bLACq+oXbMXqct+UPkHY7aBlXyCbE7xAhPN8jbvCAZphd7WhqRKKEiL6ShjiksGtSFjtLPN/S9oSx55LLTEeHIW0X6yWTemdwl/FqMRsNZDb27SrhRz0ztp6BZtI6xVzgI+fj9XsxZagzR+/TgGon8b+/8CYAarHkgSaUYsG9fD78ARBKhZSsfnj+keDby+0kGbcYg4EuuXyhxitzYEa6iG+5fpP3EHTz5m61DrnRhUs5AkUCxfRXZ4XcWetGonpBZFYpZMpyUBogoQjQJzBr41KtqYsOjqljBzCZEeL9rdNpBEgNT9e35z5b00Aq8Vio/KTZqAb/u3KaSU1MYonYy"
+DOTENV_VAULT_QA="V3tKxTMFJlt837KLir6jhj5LrUK7Mpzv7ABGUj+eRxntZlJclJscS/CnVGyRFRC0LJ4gyrM5J/TYJajUNNY1mFP5Z9AY+L5EzJ48CbZVPuyIE4NQf0JXO0Z9ntg1yVm5bGwbJU9a5GsJKOYRWYeck3E8r5tofELh8KBfgX8+nKvdJcY0lcuh4g7wvK0Skk8llF2k9cJhqXbY8cTNj4SR9tW9+vSNobssvIkcHlgXxe+rM2vzVkjq5IhU/gmXwZhNtU8LOqljS4vxQkJv6Ltn1fWKVwTOAFJp+ebwWUiDOqstQgWMKQ1VL3MBgDMnOnuVQmOCyHmFVtJeffitMP8pEJPMK2uxOBBB9R1BCE+ewVzp6QUjiAaNMx1NZs8UIQtg1Eev8MiOgNANKDwk8KCStxn4JAfJBz09/sHDP8wTjih4ITllGHUvrchiFLy9mHzj8pvoE5aawah1b5bSK6JACnn7Q0cwCHszQA5wp+jjbP9BMs2+2F4AWR66NrrHo5CW0iW3hh2JmyXhGotE1A8BicVYMbvGhKvg3aIGn4fSPZO1uFW7JVssgKY3AoPeod8dhwTvCtrbsy9Yq3muA4tWKpfOKUsNRutZpeXUoVmcWlLuuK8xm0diLiXQ9tyEU7REypg0AhTMGn+UHsxYGBD9fnVb9twQ0W07F71DyVU8P/i6Sltn62x8jIon2aUtKb+n3xYDG+rkzmLw0Td+/Ycsfwe/4hJapgTxDFLWWL0gkrY5WXEjeYpbw/2e81fc6bWSiOg7ebPXuwLzCK5uawaK0L6a8kqTyZWm4RnMNLRLdI+/j9Jq3UwWJ8PoaS5qF15a6VhQ/dQOoWIs/SyZ+qLC/42S9ZZauA=="
 
 # template
 DOTENV_VAULT_TEMPLATE="f1H2dBoJp+9JjHyPnPVoalZ2VA7AHrGYuXpnmWwiyCA5i3lv0uX6191QTTEnlFIOy1zv7hScphu700zVJrZyiLXXvg/pdXFNwXpwrG/5JtXAC8K7nO7Yb7uKuqusJeN6SpKJ82ESrq+CdLbFgcSHNz5fuNyVr3iiZ4hDtXWjWBL8MzYgp4Xf/CkhZjvBOd4aSjXEVGmzrsqty47nz1pCTGhFmPADUhCkrBIwJuUqZotVkYtWwUvQ3EhYNmvn3J8oG4SDqyDSfQdw2D1hbvsdwjkTBTqMnbcLT8RCf/xlorvsA2oeKthYlMx6XCCilmig0+OIyIxGVgvMj6wAb9s/Ar7sBHuKQxSnf32iE3G6+s4DD8Nod0OkhYYTl1CKXtnLYO3tzpW2cX4C+pYSNG6Bw3l2xRFco5VV+XRutoeBukxXsaD009R04pPof8AcpG0y5/SmpAO4Rdt0Mk3q/ZMcHPpQSLhIOndVHMSy4C4qd2p+R53iRpJlfOllte6RJFeUqy065vhepx0XxKjNNxHWeAppu+NCW5cPmJtqND4ems9T4JMSpanFl7GtGvtR03KYIrDsNE8JGzyYz3L+V1fynzOXxW4v7+r/gsxJAQFbBOVWWLH9ppKWMWSQvmHjduN0LCBRCOcdyw0KFFL9wtqnaLHWbsu6FpjZDPELugotrcSxswxvs/M5tYQtr3q4a7oXkb4ZiSEoAzUGQvMt6nGykgM8PTvYIveB0Ys0apPcbUkZijAYHP21ovxMQHN5qS3d0fTyvYiiMz1Zduwbz2wfFEg03FX2LI4sHduMSLByrbgHcwgG7JmVfMyeBfB/EX7njcwgwuTcS+pJODmcVs1hy49pdvjAsitLxiMw7V9/RQHbFa2m6ksS5QULDwFkseRHOzYprCa454rGqZ/kS0uvPZR0z8bHPzk2+wjIxOcJcEVMglN0PXPPcN3bbqrmhytn5n4OBz2TGG1yBzv+wZb5Wd7oMa9+244hqbQ8kzsvWIBPlhKxnczAMFYHjZ98Vw76XPXFAkkm0GoSkv4Z+2tNdqCC50DQusb7gHVfSkmRkwOvo/Es2ExEKEBlHhmj3LBEBfCQHF2hNMa89Jc7bugdfdMGAnqkWsjFITQMYG1Hj/VC374HwBwLSMEaMkObFL7fPU4+NavGq6yPXcz3/PXQR+4TeSdVj/Yd3IKSnTfIvQfV9g1jMKY9YIZ/sTr/vJNwRm7pDoD1/s/V3CVwFPx42Qsr7kyVN1HgcorP6Vb2rAjo/mUbmkomfAamgjteFaArpfS9QlFAKQDflwNollA2yecjIh+qjdj7dFpql9Ih/TI="

src/routers/qr-code.router.test.ts

@@ -10,18 +10,21 @@ const signSpy = jest.spyOn(jwt, "sign");
 
 describe("qr-code-router.ts", () => {
   describe("GET /api/qr-code/generate", () => {
-    it("Should bypass location check in dev environment and generate a QR code as a base64 encoded png and an access code with configured expiration date", async () => {
+    it("Should generate a QR code as a base64 encoded png and an access code with configured expiration date", async () => {
       const getLocationCoordinatesSpy = jest.spyOn(
         locationService,
         "getLocationCoordinates",
       );
-      const isProductionEnvSpy = jest.spyOn(utils, "isProductionEnv");
-      isProductionEnvSpy.mockReturnValue(false);
+      const isLocationCheckEnabledSpy = jest.spyOn(
+        utils,
+        "isLocationCheckEnabled",
+      );
+      isLocationCheckEnabledSpy.mockReturnValue(false);
 
       const response = await mockServer().get("/api/qr-code/generate");
       expect(response.headers["content-type"]).toContain("application/json");
       expect(getLocationCoordinatesSpy).toHaveBeenCalledTimes(0);
-      expect(isProductionEnvSpy).toHaveReturnedWith(false);
+      expect(isLocationCheckEnabledSpy).toHaveReturnedWith(false);
       expect(response.body.dataUrl).toContain(
         "data:image/png;base64,iVBORw0KGgo",
       );
@@ -34,15 +37,18 @@ describe("qr-code-router.ts", () => {
       );
     });
 
-    it("Should perform location check in prod environment and generate a QR code as a base64 encoded png and an access code with configured expiration date", async () => {
+    it("Should perform location check if enabled and generate a QR code as a base64 encoded png and an access code with configured expiration date", async () => {
       const getLocationCoordinatesSpy = jest.spyOn(
         locationService,
         "getLocationCoordinates",
       );
-      const isProductionEnvSpy = jest.spyOn(utils, "isProductionEnv");
+      const isLocationCheckEnabledSpy = jest.spyOn(
+        utils,
+        "isLocationCheckEnabled",
+      );
       const validateCoordsSpy = jest.spyOn(utils, "validateCoords");
 
-      isProductionEnvSpy.mockReturnValue(true);
+      isLocationCheckEnabledSpy.mockReturnValue(true);
       getLocationCoordinatesSpy.mockResolvedValue({
         latitude: 100,
         longitude: 100,
@@ -69,10 +75,13 @@ describe("qr-code-router.ts", () => {
         locationService,
         "getLocationCoordinates",
       );
-      const isProductionEnvSpy = jest.spyOn(utils, "isProductionEnv");
+      const isLocationCheckEnabledSpy = jest.spyOn(
+        utils,
+        "isLocationCheckEnabled",
+      );
       const validateCoordsSpy = jest.spyOn(utils, "validateCoords");
 
-      isProductionEnvSpy.mockReturnValue(true);
+      isLocationCheckEnabledSpy.mockReturnValue(true);
       getLocationCoordinatesSpy.mockResolvedValue({
         latitude: 100,
         longitude: 100,

src/routers/qr-code.router.ts

@@ -6,17 +6,17 @@ import {
 import { generateAccessToken } from "../services/auth.service";
 import { validateAccessToken } from "../middleware";
 import { getLocationCoordinates } from "../services/location.service";
-import { isProductionEnv, parseIp, validateCoords } from "../utils";
+import { isLocationCheckEnabled, parseIp, validateCoords } from "../utils";
 
 const qrCodeRouter = ex.Router();
 
 qrCodeRouter.get("/generate", async (req, res, next) => {
   try {
     const ip = parseIp(req);
 
-    if (isProductionEnv()) {
+    if (isLocationCheckEnabled()) {
       const coords = await getLocationCoordinates(ip as string);
-      console.log('Validating location of IP: ' + ip, coords)
+      console.log("Validating location of IP: " + ip, coords);
       if (!validateCoords(coords)) throw Error("Invalid location of request");
     }
     const accessToken = generateAccessToken();

src/utils.test.ts

@@ -1,4 +1,8 @@
-import { parseEntryFilterQueryParams, validateCoords } from "./utils";
+import {
+  isLocationCheckEnabled,
+  parseEntryFilterQueryParams,
+  validateCoords,
+} from "./utils";
 
 describe("utils.ts", () => {
   describe("parseEntryFilterQueryParams()", () => {
@@ -32,4 +36,12 @@ describe("utils.ts", () => {
       ).toBe(false);
     });
   });
+
+  describe("isLocationCheckEnabled", () => {
+    it("Should return true or false based on process.env.ENABLE_LOCATION_CHECK value", () => {
+      expect(isLocationCheckEnabled()).toBe(
+        JSON.parse(process.env.ENABLE_LOCATION_CHECK as string),
+      );
+    });
+  });
 });

src/utils.ts

@@ -53,3 +53,7 @@ export const parseIp = (req: Request): string => {
 
 export const isProductionEnv = () =>
   !["test", "development"].includes(process.env.NODE_ENV as string);
+
+export const isLocationCheckEnabled = () => {
+  return process.env.ENABLE_LOCATION_CHECK === "true";
+};