Merge pull request #442 from shapehq/develop

Deploy to production

Author: simonbs

package-lock.json

@@ -25,7 +25,7 @@
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@mui/icons-material": "^6.1.6",
     "@mui/material": "^6.0.1",
-    "@octokit/auth-app": "^7.1.1",
+    "@octokit/auth-app": "^7.1.2",
     "@octokit/core": "^6.1.2",
     "@octokit/webhooks": "^13.3.0",
     "@stoplight/elements": "^8.4.5",
@@ -43,7 +43,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "redis-semaphore": "^5.6.0",
-    "redoc": "^2.1.5",
+    "redoc": "^2.2.0",
     "sharp": "^0.33.5",
     "styled-components": "^6.1.13",
     "swagger-ui-react": "^5.17.14",
@@ -55,14 +55,14 @@
   "devDependencies": {
     "@auth/pg-adapter": "^1.7.2",
     "@types/jest": "^29.5.12",
-    "@types/node": "^22.8.7",
+    "@types/node": "^22.9.0",
     "@types/nprogress": "^0.2.3",
     "@types/pg": "^8.11.10",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.0",
     "@types/swagger-ui-react": "^4.18.3",
-    "@typescript-eslint/eslint-plugin": "^8.12.2",
-    "@typescript-eslint/parser": "^8.12.2",
+    "@typescript-eslint/eslint-plugin": "^8.13.0",
+    "@typescript-eslint/parser": "^8.13.0",
     "autoprefixer": "^10.4.20",
     "eslint": "^8.57.1",
     "eslint-config-next": "^14.2.14",

package.json

@@ -55,7 +55,20 @@ async function downloadFile(params: {
   const { url, maxBytes, timeoutInSeconds } = params
   const abortController = new AbortController()
   const timeoutSignal = AbortSignal.timeout(timeoutInSeconds * 1000)
-  const response = await fetch(url, {
+  const headers: {[key: string]: string} = {}
+  // Extract basic auth from URL and construct an Authorization header instead.
+  if ((url.username && url.username.length > 0) || (url.password && url.password.length > 0)) {
+    const username = decodeURIComponent(url.username)
+    const password = decodeURIComponent(url.password)
+    headers["Authorization"] = "Basic " + btoa(`${username}:${password}`)
+  }
+  // Make sure basic auth is removed from URL.
+  const urlWithoutAuth = url
+  urlWithoutAuth.username = ""
+  urlWithoutAuth.password = ""
+  const response = await fetch(urlWithoutAuth, {
+    method: "GET",
+    headers,
     signal: AbortSignal.any([abortController.signal, timeoutSignal])
   })
   if (!response.body) {

src/app/api/proxy/route.ts

@@ -17,7 +17,7 @@ const PrimaryContainer = ({
 }) => {
   return (
     <>
-      <_PrimaryContainer 
+      <InnerPrimaryContainer 
         variant="temporary"
         width={width}
         isOpen={isOpen}
@@ -26,23 +26,23 @@ const PrimaryContainer = ({
         sx={{ display: { xs: "block", sm: "none" } }}
       >
         {children}
-      </_PrimaryContainer>
-      <_PrimaryContainer 
+      </InnerPrimaryContainer>
+      <InnerPrimaryContainer 
         variant="persistent"
         width={width}
         isOpen={isOpen}
         keepMounted={false}
         sx={{ display: { xs: "none", sm: "block" } }}
         >
           {children}
-        </_PrimaryContainer>
+        </InnerPrimaryContainer>
     </>
   )
 }
 
 export default PrimaryContainer
 
-const _PrimaryContainer = ({
+const InnerPrimaryContainer = ({
   variant,
   width,
   isOpen,

src/features/sidebar/view/internal/primary/Container.tsx

@@ -17,13 +17,15 @@ const SecondaryContainer = ({
   const sx = { overflow: "hidden" }
   return (
     <>
-      <_SecondaryContainer
+      <InnerSecondaryContainer
+    
         sidebarWidth={isSM ? sidebarWidth : 0}
         isSidebarOpen={isSM ? offsetContent:  false}
         sx={{ ...sx }}
       >
         {children}
-      </_SecondaryContainer>
+      </InnerSecondaryContainer
+    >
     </>
   )
 }
@@ -52,7 +54,7 @@ const WrapperStack = styled(Stack, {
   })
 }))
 
-const _SecondaryContainer = ({
+const InnerSecondaryContainer = ({
   sidebarWidth,
   isSidebarOpen,
   children,