From 9481dea0753465335eafd4af7b5fa8f46ea4ac5f Mon Sep 17 00:00:00 2001
From: wanhose <wanhose.development@gmail.com>
Date: Thu, 12 May 2022 20:47:03 +0200
Subject: [PATCH] refactor(report-service): cors policy

---
 packages/report-service/src/index.ts               | 14 ++++++--------
 .../report-service/src/services/environment.ts     |  3 ---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/packages/report-service/src/index.ts b/packages/report-service/src/index.ts
index 85a1332..f49c560 100644
--- a/packages/report-service/src/index.ts
+++ b/packages/report-service/src/index.ts
@@ -8,18 +8,16 @@ const server = fastify({ logger: true });
 
 server.register(cors, {
   origin: (origin, callback) => {
+    const chrome = /chrome-extension:\/\/[a-z]{32}/g;
     const moz =
       /moz-extension:\/\/[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}/g;
 
-    switch (true) {
-      case environment.extension.chrome === origin:
-      case moz.test(origin):
-        callback(null, true);
-        break;
-      default:
-        callback(new Error('Not allowed'), false);
-        break;
+    if (chrome.test(origin) || moz.test(origin)) {
+      callback(null, true);
+      return;
     }
+
+    callback(new Error('Not allowed'), false);
   },
 });
 
diff --git a/packages/report-service/src/services/environment.ts b/packages/report-service/src/services/environment.ts
index ba226c0..69a0aac 100644
--- a/packages/report-service/src/services/environment.ts
+++ b/packages/report-service/src/services/environment.ts
@@ -3,9 +3,6 @@ import dotenv from 'dotenv';
 dotenv.config();
 
 export default {
-  extension: {
-    chrome: process.env.CHROME_EXTENSION_ID ?? '',
-  },
   mail: {
     pass: process.env.MAIL_PASS ?? '',
     user: process.env.MAIL_USER ?? '',