Merge pull request microsoft#365 from microsoft/dev

chore: merge dev into main

Author: Roopan-Microsoft

docs/TroubleShootingSteps.md

@@ -20,6 +20,7 @@ dependencies = [
     "starlette>=0.49.1",
     "uvicorn[standard]>=0.34.0", 
     "h11==0.16.0",
+    "urllib3==2.6.0",
 ]
 
 [dependency-groups]

src/ContentProcessorAPI/pyproject.toml

@@ -691,10 +691,11 @@ typing-inspection==0.4.1 \
     # via
     #   pydantic
     #   pydantic-settings
-urllib3==2.3.0 \
-    --hash=sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df \
-    --hash=sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d
+urllib3==2.6.0 \
+    --hash=sha256:c90f7a39f716c572c4e3e58509581ebd83f9b59cced005b7db7ad2d22b0db99f \
+    --hash=sha256:cb9bcef5a4b345d5da5d145dc3e30834f58e8018828cbc724d30b4cb7d4d49f1
     # via
+    #   contentprocessorapi
     #   requests
     #   sentry-sdk
 uvicorn==0.34.0 \

src/ContentProcessorAPI/requirements.txt

@@ -13,6 +13,7 @@
     "contentprocessor_web": "file:",
     "cra-template-typescript": "1.3.0",
     "json-edit-react": "^1.27.2",
+    "node-forge": ">=1.3.2",
     "nth-check": "2.1.1",
     "postcss": "8.5.6",
     "prismjs": "^1.30.0",
@@ -83,6 +84,7 @@
     "postcss": "^8.5.1",
     "nth-check": "^2.1.1",
     "string_decoder": "^1.3.0",
-    "typescript": "^4.9.5"
+    "typescript": "^4.9.5",
+    "node-forge": "^1.3.2"
   }
 }