From be924f23e6d0c4e158a455aff233a72f97b5b4f9 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <daniel@infisical.com>
Date: Tue, 8 Jul 2025 22:21:29 +0400
Subject: [PATCH] minor fixes

---
 backend/src/lib/config/env.ts |  3 ++-
 package-lock.json             | 26 --------------------------
 package.json                  |  2 --
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/backend/src/lib/config/env.ts b/backend/src/lib/config/env.ts
index 11b7ecedc1..d052f089a9 100644
--- a/backend/src/lib/config/env.ts
+++ b/backend/src/lib/config/env.ts
@@ -364,9 +364,10 @@ export const initEnvConfig = async (superAdminDAL?: TSuperAdminDALFactory, logge
 
     if (fipsEnabled) {
       const newEnvCfg = {
-        ...envCfg,
+        ...parsedEnv.data,
         ROOT_ENCRYPTION_KEY: envCfg.ENCRYPTION_KEY
       };
+
       delete newEnvCfg.ENCRYPTION_KEY;
 
       envCfg = Object.freeze(newEnvCfg);
diff --git a/package-lock.json b/package-lock.json
index ce284b4315..4d72220afd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,11 +8,9 @@
       "license": "ISC",
       "dependencies": {
         "@radix-ui/react-radio-group": "^1.1.3",
-        "crypto-js": "^4.2.0",
         "secrets.js-grempe": "^2.0.0"
       },
       "devDependencies": {
-        "@types/crypto-js": "^4.2.2",
         "@types/uuid": "^9.0.7",
         "eslint": "^8.57.1",
         "husky": "^8.0.3"
@@ -482,13 +480,6 @@
         }
       }
     },
-    "node_modules/@types/crypto-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.2.tgz",
-      "integrity": "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@types/uuid": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
@@ -654,12 +645,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==",
-      "license": "MIT"
-    },
     "node_modules/debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
@@ -1851,12 +1836,6 @@
         "@radix-ui/react-use-layout-effect": "1.0.1"
       }
     },
-    "@types/crypto-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.2.tgz",
-      "integrity": "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==",
-      "dev": true
-    },
     "@types/uuid": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.7.tgz",
@@ -1979,11 +1958,6 @@
         "which": "^2.0.1"
       }
     },
-    "crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
-    },
     "debug": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
diff --git a/package.json b/package.json
index f30fda33dc..db15de3fb7 100644
--- a/package.json
+++ b/package.json
@@ -19,14 +19,12 @@
     ]
   },
   "devDependencies": {
-    "@types/crypto-js": "^4.2.2",
     "@types/uuid": "^9.0.7",
     "eslint": "^8.57.1",
     "husky": "^8.0.3"
   },
   "dependencies": {
     "@radix-ui/react-radio-group": "^1.1.3",
-    "crypto-js": "^4.2.0",
     "secrets.js-grempe": "^2.0.0"
   }
 }