fix: move UpsertBranch after auth and input validation in handlers

Prevents unauthenticated requests from creating branches as a side-effect.
Also adds missing return after http.Error for auth failures and invalid
platform, removes dead expoAccount nil check, fixes wrong error variable
in RollbackHandler log, and handles UploadFileIntoUpdate error.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: axelmarciano

internal/handlers/republish_handler.go

@@ -40,12 +40,6 @@ func RepublishHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "No expo account found", http.StatusUnauthorized)
 		return
 	}
-	err = branch.UpsertBranch(branchName)
-	if err != nil {
-		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, err)
-		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
-		return
-	}
 	runtimeVersion := r.URL.Query().Get("runtimeVersion")
 	if runtimeVersion == "" {
 		log.Printf("[RequestID: %s] No runtime version provided", requestID)
@@ -59,6 +53,12 @@ func RepublishHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "No updateId provided", http.StatusBadRequest)
 		return
 	}
+	err = branch.UpsertBranch(branchName)
+	if err != nil {
+		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, err)
+		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
+		return
+	}
 	update, err := update2.GetUpdate(branchName, runtimeVersion, updateId)
 	if err != nil {
 		log.Printf("[RequestID: %s] Error getting update: %v", requestID, err)

internal/handlers/rollback_handler.go

@@ -39,18 +39,18 @@ func RollbackHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "No expo account found", http.StatusUnauthorized)
 		return
 	}
-	errUpsert := branch.UpsertBranch(branchName)
-	if errUpsert != nil {
-		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, err)
-		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
-		return
-	}
 	runtimeVersion := r.URL.Query().Get("runtimeVersion")
 	if runtimeVersion == "" {
 		log.Printf("[RequestID: %s] No runtime version provided", requestID)
 		http.Error(w, "No runtime version provided", http.StatusBadRequest)
 		return
 	}
+	errUpsert := branch.UpsertBranch(branchName)
+	if errUpsert != nil {
+		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, errUpsert)
+		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
+		return
+	}
 	commitHash := r.URL.Query().Get("commitHash")
 	rollback, err := update.CreateRollback(platform, commitHash, runtimeVersion, branchName)
 	if err != nil {

internal/handlers/upload_handler.go

@@ -11,12 +11,13 @@ import (
 	"expo-open-ota/internal/types"
 	"expo-open-ota/internal/update"
 	"fmt"
-	"github.com/google/uuid"
-	"github.com/gorilla/mux"
 	"log"
 	"net/http"
 	"path/filepath"
 	"time"
+
+	"github.com/google/uuid"
+	"github.com/gorilla/mux"
 )
 
 type FileNamesRequest struct {
@@ -38,17 +39,12 @@ func MarkUpdateAsUploadedHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "No branch provided", http.StatusBadRequest)
 		return
 	}
-	err := branch.UpsertBranch(branchName)
-	if err != nil {
-		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, err)
-		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
-		return
-	}
 	expoAuth := helpers.GetExpoAuth(r)
 	expoAccount, err := services.ValidateExpoAuth(expoAuth)
 	if err != nil {
 		log.Printf("[RequestID: %s] Error validating expo auth: %v", requestID, err)
 		http.Error(w, "Error validating expo auth", http.StatusUnauthorized)
+		return
 	}
 	if expoAccount == nil {
 		log.Printf("[RequestID: %s] No expo account found", requestID)
@@ -67,6 +63,12 @@ func MarkUpdateAsUploadedHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "No update id provided", http.StatusBadRequest)
 		return
 	}
+	err = branch.UpsertBranch(branchName)
+	if err != nil {
+		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, err)
+		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
+		return
+	}
 	currentUpdate, err := update.GetUpdate(branchName, runtimeVersion, updateId)
 	if err != nil {
 		log.Printf("[RequestID: %s] Error getting update: %v", requestID, err)
@@ -149,6 +151,7 @@ func RequestUploadLocalFileHandler(w http.ResponseWriter, r *http.Request) {
 	if err != nil || expoAccount == nil {
 		log.Printf("[RequestID: %s] Error validating expo auth: %v", requestID, err)
 		http.Error(w, "Error validating expo auth", http.StatusUnauthorized)
+		return
 	}
 	token := r.URL.Query().Get("token")
 	if token == "" {
@@ -207,25 +210,14 @@ func RequestUploadUrlHandler(w http.ResponseWriter, r *http.Request) {
 	if err != nil || expoAccount == nil {
 		log.Printf("[RequestID: %s] Error validating expo auth: %v", requestID, err)
 		http.Error(w, "Error validating expo auth", http.StatusUnauthorized)
-	}
-
-	err = branch.UpsertBranch(branchName)
-	if err != nil {
-		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, err)
-		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
-		return
-	}
-
-	if expoAccount == nil {
-		log.Printf("[RequestID: %s] No expo account found", requestID)
-		http.Error(w, "No expo account found", http.StatusUnauthorized)
 		return
 	}
 
 	platform := r.URL.Query().Get("platform")
 	if platform != "" && (platform != "ios" && platform != "android") {
 		log.Printf("[RequestID: %s] Invalid platform: %s", requestID, platform)
 		http.Error(w, "Invalid platform", http.StatusBadRequest)
+		return
 	}
 	commitHash := r.URL.Query().Get("commitHash")
 	runtimeVersion := r.URL.Query().Get("runtimeVersion")
@@ -248,6 +240,13 @@ func RequestUploadUrlHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	err = branch.UpsertBranch(branchName)
+	if err != nil {
+		log.Printf("[RequestID: %s] Error upserting branch: %v", requestID, err)
+		http.Error(w, "Error upserting branch", http.StatusInternalServerError)
+		return
+	}
+
 	updateId := update.GenerateUpdateTimestamp()
 	updateRequests, err := bucket.RequestUploadUrlsForFileUpdates(branchName, runtimeVersion, update.ConvertUpdateTimestampToString(updateId), request.FileNames)
 	if err != nil {
@@ -274,6 +273,12 @@ func RequestUploadUrlHandler(w http.ResponseWriter, r *http.Request) {
 		CreatedAt:      time.Duration(updateId) * time.Millisecond,
 	}, "update-metadata.json", metadataReader)
 
+	if err != nil {
+		log.Printf("[RequestID: %s] Error uploading file update metadata: %v", requestID, err)
+		http.Error(w, "Error uploading file update metadata", http.StatusInternalServerError)
+		return
+	}
+
 	cache := cache2.GetCache()
 	cacheKey := update.ComputeLastUpdateCacheKey(branchName, runtimeVersion, platform)
 	cache.Delete(cacheKey)

test/requestUpload_test.go

@@ -163,7 +163,7 @@ func TestRequestUploadUrlWithoutBearer(t *testing.T) {
 	w, _, _, r := createUploadRequest(t, projectRoot, "DO_NOT_USE", "1", sampleUpdatePath, "Authorization", "Bearer expo_alternative_token", "ios")
 	handlers.RequestUploadUrlHandler(w, r)
 	assert.Equal(t, 401, w.Code, "Expected status code 401")
-	assert.Equal(t, "Error validating expo auth\nNo expo account found\n", w.Body.String(), "Expected error message")
+	assert.Equal(t, "Error validating expo auth\n", w.Body.String(), "Expected error message")
 }
 
 func TestRequestUploadUrlWithBadBearer(t *testing.T) {
@@ -178,7 +178,7 @@ func TestRequestUploadUrlWithBadBearer(t *testing.T) {
 	w, _, _, r := createUploadRequest(t, projectRoot, "DO_NOT_USE", "1", sampleUpdatePath, "Authorization", "Bearer expo_bad_token", "ios")
 	handlers.RequestUploadUrlHandler(w, r)
 	assert.Equal(t, 401, w.Code, "Expected status code 401")
-	assert.Equal(t, "Error validating expo auth\nNo expo account found\n", w.Body.String(), "Expected error message")
+	assert.Equal(t, "Error validating expo auth\n", w.Body.String(), "Expected error message")
 }
 
 func TestRequestUploadUrlWithoutRuntimeVersion(t *testing.T) {
@@ -480,7 +480,7 @@ func TestRequestUploadUrlWithInvalidExpoSession(t *testing.T) {
 	r.Body = io.NopCloser(bytes.NewReader(uploadRequestsInputJSON))
 	handlers.RequestUploadUrlHandler(w, r)
 	assert.Equal(t, 401, w.Code, "Expected status code 401")
-	assert.Equal(t, "Error validating expo auth\nNo expo account found\n", w.Body.String(), "Expected error message")
+	assert.Equal(t, "Error validating expo auth\n", w.Body.String(), "Expected error message")
 }
 
 func TestIdenticalUpload(t *testing.T) {