databox: fix allowedType [ci skip]

alchemy-fr · Jul 6, 2023 · 067b05a · 067b05a
1 parent afd4710
commit 067b05a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/bin/setup.sh b/bin/setup.sh
@@ -10,7 +10,6 @@ bin/create-config.sh
 
 set -ex
 
-export COMPOSE_PROFILES=setup,db,uploader,auth,databox,expose,notify,dashboard,tools
 export AUTH_API_BASE_URL=https://api-auth.${PHRASEA_DOMAIN}
 export UPLOADER_CLIENT_BASE_URL=https://uploader.${PHRASEA_DOMAIN}
 export DATABOX_CLIENT_BASE_URL=https://databox.${PHRASEA_DOMAIN}
@@ -58,7 +57,7 @@ exec_container auth-api-php "bin/console alchemy:oauth:create-client ${UPLOADER_
     --scope group:list \
     --redirect-uri ${UPLOADER_API_BASE_URL}"
 ## Create minio bucket
-docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
+COMPOSE_PROFILES="${COMPOSE_PROFILES},setup" docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
   while ! nc -z minio 9000; do echo 'Wait minio to startup...' && sleep 0.1; done; \
   sleep 5 && \
   mc config host add minio http://minio:9000 \$MINIO_ACCESS_KEY \$MINIO_SECRET_KEY && \
@@ -85,7 +84,7 @@ exec_container auth-api-php "bin/console alchemy:oauth:create-client ${EXPOSE_AD
     --scope group:list \
     --redirect-uri ${EXPOSE_API_BASE_URL}"
 ## Create minio bucket
-docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
+COMPOSE_PROFILES="${COMPOSE_PROFILES},setup" docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
   i=0
   while ! nc -z minio 9000; do \
     echo 'Wait for minio to startup...'; \
@@ -135,7 +134,7 @@ exec_container auth-api-php "bin/console alchemy:oauth:create-client ${DATABOX_C
     --grant-type authorization_code \
     --redirect-uri ${DATABOX_CLIENT_BASE_URL}"
 ## Create minio bucket
-docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
+COMPOSE_PROFILES="${COMPOSE_PROFILES},setup" docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
   while ! nc -z minio 9000; do echo 'Wait minio to startup...' && sleep 0.1; done; \
   sleep 5 && \
   mc config host add minio http://minio:9000 \$MINIO_ACCESS_KEY \$MINIO_SECRET_KEY && \
@@ -157,7 +156,7 @@ exec_container auth-api-php "bin/console app:user:create \
 
 ## Setup indexer
 ## Create Databox OAuth client for indexer
-docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
+COMPOSE_PROFILES="${COMPOSE_PROFILES},setup" docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
   while ! nc -z minio 9000; do echo 'Wait minio to startup...' && sleep 0.1; done; \
   sleep 5 && \
   mc config host add minio http://minio:9000 \$MINIO_ACCESS_KEY \$MINIO_SECRET_KEY && \
@@ -174,7 +173,7 @@ exec_container rabbitmq "\
   rabbitmqadmin declare exchange --vhost=s3events name=s3events type=direct durable='true' -u ${RABBITMQ_USER} -p ${RABBITMQ_PASSWORD} \
   && rabbitmqadmin declare queue --vhost=s3events name=s3events auto_delete=false durable='true' -u ${RABBITMQ_USER} -p ${RABBITMQ_PASSWORD} \
   && rabbitmqadmin declare binding --vhost=s3events source=s3events destination=s3events routing_key='' -u ${RABBITMQ_USER} -p ${RABBITMQ_PASSWORD}"
-docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
+COMPOSE_PROFILES="${COMPOSE_PROFILES},setup" docker compose run --rm -T --entrypoint "sh -c" minio-mc "\
   set -x; \
   while ! nc -z minio 9000; do echo 'Wait minio to startup...' && sleep 0.1; done; \
     mc config host add minio http://minio:9000 \$MINIO_ACCESS_KEY \$MINIO_SECRET_KEY \

diff --git a/databox/client/src/components/Upload/UploadDropzone.tsx b/databox/client/src/components/Upload/UploadDropzone.tsx
@@ -4,14 +4,27 @@ import {Box, Typography} from "@mui/material";
 import {grey} from "@mui/material/colors";
 import config from "../../config";
 
-export function useAccept() {
+export function useAccept(): Accept | undefined {
     return React.useMemo<Accept | undefined>(() => {
-        const list = [
-            ...(config.get('allowedTypes') as string[]),
-            ...(config.get('allowedExtensions') as string[]).map(e => `.${e}`),
-        ];
+        const a = config.get('allowedTypes') as Accept | undefined;
+        if (!a) {
+            return;
+        }
 
-        return list.length > 0 ? {'image/*': list} : undefined;
+        const n = {...a};
+        try {
+            Object.keys(n).forEach(k => {
+                n[k] = n[k].map(e => `.${e.replace(/^\./, '')}`);
+                if (n[k].length === 0) {
+                    throw new Error(`Missing extension list for MIME type ${k}`);
+                }
+            });
+        } catch (e: any) {
+            console.error(e.toString());
+            return;
+        }
+
+        return n;
     }, []);
 }