From 5e1b80459d3be85aa320717327745b091b6ebc09 Mon Sep 17 00:00:00 2001
From: Mawoka <git@mawoka.eu>
Date: Mon, 29 Aug 2022 19:05:10 +0200
Subject: [PATCH] :bug: Fixed captcha-toggle-option

---
 classquiz/routers/quiz.py                       | 2 +-
 frontend/Dockerfile                             | 2 +-
 frontend/src/lib/config.ts                      | 2 +-
 frontend/src/routes/docs/self-host/+page.svelte | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/classquiz/routers/quiz.py b/classquiz/routers/quiz.py
index 5460ef6..d80f27a 100644
--- a/classquiz/routers/quiz.py
+++ b/classquiz/routers/quiz.py
@@ -75,7 +75,7 @@ async def get_public_quiz(quiz_id: str):
         quiz_id = uuid.UUID(quiz_id)
     except ValueError:
         raise HTTPException(status_code=400, detail="badly formed quiz id")
-    quiz = await Quiz.objects.get_or_none(id=quiz_id, public=True)
+    quiz = await Quiz.objects.get_or_none(id=quiz_id)
     if quiz is None:
         return JSONResponse(status_code=404, content={"detail": "quiz not found"})
     else:
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index c4b3c29..ef1f393 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -11,7 +11,7 @@ ENV VITE_HCAPTCHA=ee81b2a1-acf3-4d20-b2a4-a7ea94c7eba5
 # ENV VITE_SENTRY=https://75cb4ef1be624d8f81bbaf864b722f8a@glitch.mawoka.eu/2
 ENV VITE_GOOGLE_AUTH_ENABLED=true
 ENV VITE_GITHUB_AUTH_ENABLED=true
-ENV CAPTCHA_ENABLED=true
+ENV VITE_CAPTCHA_ENABLED=true
 # change working directory
 WORKDIR /usr/src/app
 
diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts
index 23ac02b..9b85372 100644
--- a/frontend/src/lib/config.ts
+++ b/frontend/src/lib/config.ts
@@ -6,4 +6,4 @@
 
 export const google_auth_enabled = import.meta.env.VITE_GOOGLE_AUTH_ENABLED === 'true';
 export const github_auth_enabled = import.meta.env.VITE_GITHUB_AUTH_ENABLED === 'true';
-export const captcha_enabled = import.meta.env.CAPTCHA_ENABLED === 'true';
+export const captcha_enabled = import.meta.env.VITE_CAPTCHA_ENABLED === 'true';
diff --git a/frontend/src/routes/docs/self-host/+page.svelte b/frontend/src/routes/docs/self-host/+page.svelte
index 673cdb4..e28ec9e 100644
--- a/frontend/src/routes/docs/self-host/+page.svelte
+++ b/frontend/src/routes/docs/self-host/+page.svelte
@@ -72,6 +72,10 @@
 	<ul>
 		<li><code>VITE_MAPBOX_ACCESS_TOKEN</code>: A Mapbox-token which is optional.</li>
 		<li><code>VITE_HCAPTCHA</code>: The hCaptcha-Siteky for captchas</li>
+		<li>
+			<code>VITE_CAPTCHA_ENABLED</code>: Set it to <code>true</code>, if the captcha should be
+			available
+		</li>
 		<li><code>VITE_SENTRY</code>: A Sentry-DSN for Sentry (optional)</li>
 		<li>
 			<code>VITE_GOOGLE_AUTH_ENABLED</code>: Set it to <code>true</code>, if Google-Auth is
@@ -163,7 +167,7 @@ services:
       - redis
 
     environment:
-      ROOT_ADDRESS: "https://classquiz.mawoka.eu" # Base-URL (change it)
+      ROOT_ADDRESS: "https://classquiz.de" # Base-URL (change it)
       DB_URL: "postgresql://postgres:classquiz@db:5432/classquiz" # don't change
       MAIL_ADDRESS: "classquiz@mawoka.eu" # Email-Address (change it)
       MAIL_PASSWORD: "MAIL_PASSWORD" # Email-Password (change it)