From 6156b84019387547e41fbd9ccfa5e9b283b0e882 Mon Sep 17 00:00:00 2001
From: Nirmal Arya <hello@nirmalarya.com>
Date: Sun, 22 Jun 2025 23:53:04 -0400
Subject: [PATCH] Fix starter template import failure by adding required
 User-Agent headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add User-Agent header to GitHub API requests (required by GitHub)
- Fix Cloudflare Workers environment context handling
- Add comprehensive logging for template import debugging
- Improve error handling with detailed error messages
- Verify fix works for all 13 starter templates

Resolves template import 500 errors where users saw "Failed to import starter template"

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 app/routes/api.github-template.ts | 37 +++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/app/routes/api.github-template.ts b/app/routes/api.github-template.ts
index 7a7fa8ec..a9eeaf75 100644
--- a/app/routes/api.github-template.ts
+++ b/app/routes/api.github-template.ts
@@ -1,7 +1,7 @@
 import { json } from '@remix-run/cloudflare';
 import JSZip from 'jszip';
 
-export async function loader({ request }: { request: Request }) {
+export async function loader({ request, context }: { request: Request; context?: any }) {
   const url = new URL(request.url);
   const repo = url.searchParams.get('repo');
 
@@ -12,39 +12,60 @@ export async function loader({ request }: { request: Request }) {
   try {
     const baseUrl = 'https://api.github.com';
 
+    // Get GitHub token from Cloudflare context env or fallback to process.env
+    const env = context?.cloudflare?.env || context?.env || process.env || {};
+    const githubToken = env.GITHUB_TOKEN;
+
+    console.log(`Processing GitHub template for repo: ${repo}`);
+
     // Get the latest release
     const releaseResponse = await fetch(`${baseUrl}/repos/${repo}/releases/latest`, {
       headers: {
         Accept: 'application/vnd.github.v3+json',
-
-        // Add GitHub token if available in environment variables
-        ...(process.env.GITHUB_TOKEN ? { Authorization: `Bearer ${process.env.GITHUB_TOKEN}` } : {}),
+        'User-Agent': 'Buildify-App/1.0',
+        // Add GitHub token if available
+        ...(githubToken ? { Authorization: `Bearer ${githubToken}` } : {}),
       },
     });
 
     if (!releaseResponse.ok) {
-      throw new Error(`GitHub API error: ${releaseResponse.status}`);
+      const errorText = await releaseResponse.text();
+      console.error(`GitHub API error for repo ${repo}: ${releaseResponse.status} ${releaseResponse.statusText}`);
+      console.error(`Error details: ${errorText}`);
+      throw new Error(`GitHub API error: ${releaseResponse.status} - ${errorText}`);
     }
 
     const releaseData = (await releaseResponse.json()) as any;
     const zipballUrl = releaseData.zipball_url;
 
+    if (!zipballUrl) {
+      throw new Error('No zipball URL found in release data');
+    }
+
+    console.log(`Fetching zipball from: ${zipballUrl}`);
+
     // Fetch the zipball
     const zipResponse = await fetch(zipballUrl, {
       headers: {
-        ...(process.env.GITHUB_TOKEN ? { Authorization: `Bearer ${process.env.GITHUB_TOKEN}` } : {}),
+        'User-Agent': 'Buildify-App/1.0',
+        ...(githubToken ? { Authorization: `Bearer ${githubToken}` } : {}),
       },
     });
 
     if (!zipResponse.ok) {
-      throw new Error(`Failed to fetch release zipball: ${zipResponse.status}`);
+      const errorText = await zipResponse.text();
+      console.error(`Failed to fetch zipball: ${zipResponse.status} ${zipResponse.statusText}`);
+      console.error(`Error details: ${errorText}`);
+      throw new Error(`Failed to fetch release zipball: ${zipResponse.status} - ${errorText}`);
     }
 
     // Get the zip content as ArrayBuffer
     const zipArrayBuffer = await zipResponse.arrayBuffer();
+    console.log(`Zip ArrayBuffer size: ${zipArrayBuffer.byteLength} bytes`);
 
     // Use JSZip to extract the contents
     const zip = await JSZip.loadAsync(zipArrayBuffer);
+    console.log('JSZip loaded successfully');
 
     // Find the root folder name
     let rootFolderName = '';
@@ -88,6 +109,8 @@ export async function loader({ request }: { request: Request }) {
     const results = await Promise.all(promises);
     const fileList = results.filter(Boolean) as { name: string; path: string; content: string }[];
 
+    console.log(`Successfully extracted ${fileList.length} files from ${repo}`);
+    
     return json(fileList);
   } catch (error) {
     console.error('Error processing GitHub template:', error);