From 550841e882ab770b4dd1ae2e1adaee01caf19b86 Mon Sep 17 00:00:00 2001
From: efim <efim666@bk.ru>
Date: Thu, 23 Nov 2023 06:14:54 +0000
Subject: [PATCH] fix: display correct button on unauthed room page

---
 routes/login_page.go | 6 +++---
 routes/room_page.go  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/routes/login_page.go b/routes/login_page.go
index b3368e2..433d31c 100644
--- a/routes/login_page.go
+++ b/routes/login_page.go
@@ -34,7 +34,7 @@ func registerLoginRoutes(
 ) {
 	// login page
 	http.HandleFunc(loginPath, func(w http.ResponseWriter, r *http.Request) {
-		renderLoginPage(w, "")
+		renderLoginPage(w, "", false)
 	})
 	http.HandleFunc("/login/join", joinRoomHandler(templateFs, sessionSM, roomsM))
 	http.HandleFunc("/login/create", createRoomHandler(templateFs, sessionSM, roomsM))
@@ -107,7 +107,7 @@ func authedPageMiddleware(
 	})
 }
 
-func renderLoginPage(w http.ResponseWriter, roomName string) {
+func renderLoginPage(w http.ResponseWriter, roomName string, isRoomExisting bool) {
 	baseFile := "templates/base.gohtml"
 	pageTempl := "templates/login.gohtml"
 	loginSecion := "templates/login-section.gohtml"
@@ -123,7 +123,7 @@ func renderLoginPage(w http.ResponseWriter, roomName string) {
 		},
 		Content: loginPageData{
 			LoginSection: LoginSectionData{
-				IsRoomExisting: false,
+				IsRoomExisting: isRoomExisting,
 				RoomName:  roomName,
 			},
 		},
diff --git a/routes/room_page.go b/routes/room_page.go
index 9992f07..1e2e6dd 100644
--- a/routes/room_page.go
+++ b/routes/room_page.go
@@ -177,13 +177,13 @@ func roomPageRoute(
 
 		// check session,
 		session, err := getRequestSession(r, sessionSM)
+		room, found, err := roomsM.Get(roomName)
 		if err != nil || session.RoomId != roomName {
 			log.Printf("not authed with session %+v | error %s, but for wrong room, trying to access %s", session, err, roomName)
-			renderLoginPage(w, roomName)
+			renderLoginPage(w, roomName, found)
 			return
 		}
 
-		room, found, err := roomsM.Get(roomName)
 		if err != nil || !found {
 			log.Printf("/room room for name %s not found or err: %s / found %t", roomName, err, found)
 			// TODO here should be append to error place