From 178c8ccce6576e20d04d764ed87233db3a36f79b Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.treibig@gmail.com>
Date: Thu, 3 Feb 2022 11:00:59 +0100
Subject: [PATCH] Fix key clash for username

---
 routes.go           | 4 ++--
 server.go           | 5 +++--
 templates/base.tmpl | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/routes.go b/routes.go
index 4467253..31b646f 100644
--- a/routes.go
+++ b/routes.go
@@ -35,10 +35,10 @@ func setupRoutes(router *mux.Router, routes []Route) {
 			}
 
 			if user := auth.GetUser(r.Context()); user != nil {
-				infos["username"] = user.Username
+				infos["loginId"] = user.Username
 				infos["admin"] = user.HasRole(auth.RoleAdmin)
 			} else {
-				infos["username"] = false
+				infos["loginId"] = false
 				infos["admin"] = false
 			}
 
diff --git a/server.go b/server.go
index cf6c745..f6e18cb 100644
--- a/server.go
+++ b/server.go
@@ -133,6 +133,7 @@ func setupJobRoute(i InfoType, r *http.Request) InfoType {
 
 func setupUserRoute(i InfoType, r *http.Request) InfoType {
 	i["id"] = mux.Vars(r)["id"]
+	i["username"] = mux.Vars(r)["id"]
 	return i
 }
 
@@ -359,10 +360,10 @@ func main() {
 		}
 
 		if user := auth.GetUser(r.Context()); user != nil {
-			infos["username"] = user.Username
+			infos["loginId"] = user.Username
 			infos["admin"] = user.HasRole(auth.RoleAdmin)
 		} else {
-			infos["username"] = false
+			infos["loginId"] = false
 			infos["admin"] = false
 		}
 
diff --git a/templates/base.tmpl b/templates/base.tmpl
index 738a42f..b244a1f 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -69,13 +69,13 @@
                                 {{end}}
                             {{end}}
                         </ul>
-                        {{if .Infos.username }}
+                        {{if .Infos.loginId }}
                             <div class="d-flex align-items-end">
                                 <ul class="navbar-nav ml-auto">
                                     <li class="nav-item">
                                         <form method="post" action="/logout">
                                             <button type="submit" class="btn btn-link nav-link fs-5">
-                                                <span class="cc-nav-text">{{ .Infos.username }} Logout</span>
+                                                <span class="cc-nav-text">{{ .Infos.loginId }} Logout</span>
                                                 <i class="bi-box-arrow-right"></i>
                                             </button>
                                         </form>