Merge pull request #40 from hackclub/staging

ArcaEge · web-flow · commit 55d6715a96d5 · 2025-12-16T00:00:02.000Z
Add hackatime trust error failed to fetch fix
diff --git a/.env.example b/.env.example
@@ -5,6 +5,7 @@
 # DATABASE_URL=postgresql://postgres:password@db:5432/postgres
 # PUBLIC_ENV=production # or staging
 # PUBLIC_COMMIT=$SOURCE_COMMIT
+# RACK_ATTACK_BYPASS= # rate limit bypass
 
 PUBLIC_ENV=dev
 
diff --git a/src/routes/auth/callback/+server.ts b/src/routes/auth/callback/+server.ts
@@ -132,15 +132,22 @@ export async function GET(event) {
 	// Check Hackatime trust
 	const hackatimeTrust = (
 		await (
-			await fetch(`https://hackatime.hackclub.com/api/v1/users/${slack_id}/trust_factor`)
+			await fetch(`https://hackatime.hackclub.com/api/v1/users/${slack_id}/trust_factor`, {
+				headers: env.RACK_ATTACK_BYPASS
+					? {
+							RACK_ATTACK_BYPASS: env.RACK_ATTACK_BYPASS
+						}
+					: {}
+			})
 		).json()
 	)['trust_level'];
 
 	if (!hackatimeTrust) {
 		console.error();
-		return error(503, {
-			message: 'failed to fetch hackatime trust factor, please try again later'
-		});
+		return redirect(302, '/auth/create-hackatime-account');
+		// return error(503, {
+		// 	message: 'failed to fetch hackatime trust factor, please try again later'
+		// });
 	} else if (hackatimeTrust === 'red') {
 		// Prevent login
 		return redirect(302, 'https://fraud.land');
diff --git a/src/routes/auth/create-hackatime-account/+page.svelte b/src/routes/auth/create-hackatime-account/+page.svelte
@@ -0,0 +1,13 @@
+<script>
+	import Head from "$lib/components/Head.svelte";
+</script>
+
+<Head title="Auth failed" />
+
+<div class="text-center mt-10">
+    <h1 class="text-2xl">Hackatime account not found</h1>
+    
+    <p>Make sure you have a Hackatime account associated with your Hack Club Auth or Slack account.</p>
+    <a href="https://hackatime.hackclub.com/" class="underline mr-3">Make one?</a>
+    <a href="/auth/idv" class="underline">Try again</a>
+</div>
