allow viewing battles without logging in

2 files changed, 11 insertions, 6 deletions

diff --git a/src/battle.go b/src/battle.go
index 7aa949a..ccac7e1 100644
--- a/src/battle.go
+++ b/src/battle.go
@@ -350,14 +350,19 @@ func battlesHandler(w http.ResponseWriter, r *http.Request) {
 
 		// sessions
 		session, _ := globalState.sessions.Get(r, "session")
-		username := session.Values["username"].(string)
+		username := session.Values["username"]
 
-		// get the user
-		user, err := UserGetUserFromUsername(username)
-		if err != nil {
+		if username == nil {
 			http.Redirect(w, r, "/login", http.StatusSeeOther)
 			return
 		} else {
+			// get the user
+			user, err := UserGetUserFromUsername(username.(string))
+			if err != nil {
+				http.Redirect(w, r, "/login", http.StatusSeeOther)
+				return
+			}
+
 			data["user"] = user
 		}
 
diff --git a/src/main.go b/src/main.go
index 65a3212..189468a 100644
--- a/src/main.go
+++ b/src/main.go
@@ -86,9 +86,9 @@ func main() {
 	auth_needed.HandleFunc("/user/{id}", userHandler)
 	auth_needed.HandleFunc("/user/{id}/profile", profileHandler)
 
-	auth_needed.HandleFunc("/battle", battlesHandler)
+	r.HandleFunc("/battle", battlesHandler)
 	auth_needed.HandleFunc("/battle/new", battleNewHandler)
-	auth_needed.HandleFunc("/battle/{id}", battleSingleHandler)
+	r.HandleFunc("/battle/{id}", battleSingleHandler)
 	auth_needed.HandleFunc("/battle/{id}/submit", battleSubmitHandler)
 
 	log.Printf("[i] HTTP Server running on %s:%d\n", host, port)