Add InDevelopment flag and improve conditional rendering

In the register.go file, an InDevelopment boolean field was added to the HomePageData struct. Utilized this flag to conditionally render parts of the login.html and home.html files based on the application's development status. Also, corrected the missing element error message in main.js. Signed-off-by: Christian Roessner <c@roessner.co>
croessner · May 7, 2024 · 48a84ad · 48a84ad
1 parent 1f52aec
commit 48a84ad
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/server/core/register.go b/server/core/register.go
@@ -50,6 +50,7 @@ type TOTPPageData struct {
 }
 
 type HomePageData struct {
+	InDevelopment       bool
 	WantWelcome         bool
 	WantPolicy          bool
 	WantTos             bool
@@ -555,6 +556,7 @@ func register2FAHomeHandler(ctx *gin.Context) {
 		LanguageTag:         session.Get(global.CookieLang).(string),
 		LanguageCurrentName: languageCurrentName,
 		LanguagePassive:     languagePassive,
+		InDevelopment:       tags.IsDevelopment,
 	}
 
 	ctx.HTML(http.StatusOK, "home.html", homeData)

diff --git a/static/home.html b/static/home.html
@@ -35,11 +35,17 @@ <h1 class="center">{{ .Welcome }}</h1>
                 <button type="submit" id="register_totp" name="totp" value="totp" data-endpointtotp="{{ .EndpointTOTP }}" data-havetotp="{{ .HaveTOTP }}">
                     {{ .RegisterTOTP }}
                 </button>
+                {{ if .InDevelopment }}
                 <p class="text center vs-5">{{ .Or }}</p>
                 <div class="vs-15"></div>
+                <!--suppress XmlDuplicatedId -->
                 <button type="submit" id="register_device" name="device" value="device">
                     {{ .RegisterWebAuthn }}
                 </button>
+                {{ else }}
+                <!--suppress XmlDuplicatedId -->
+                <div id="register_device" style="display: none;"></div>
+                {{ end }}
             </article>
         </section>
     </main>

diff --git a/static/js/home/main.js b/static/js/home/main.js
@@ -25,7 +25,7 @@ if (have_totp === "true") {
 
 const device = document.getElementById("register_device");
 if (device === null) {
-    throw new Error("Missing element 'device'");
+    throw new Error("Missing element 'register_device'");
 }
 
 const register_totp = (event) => {

diff --git a/static/login.html b/static/login.html
@@ -58,10 +58,12 @@ <h2 class="center">{{ .ApplicationName }}</h2>
                     {{ if .InDevelopment }}
                     <p class="text center vs-5">{{ .Or }}</p>
                     <div class="vs-15"></div>
+                    <!--suppress XmlDuplicatedId -->
                     <button class="device" type="submit" id="device" name="device" value="{{ .Device }}" data-deviceurl="{{ .DeviceLoginEndpoint }}">
                         {{ .Device }}
                     </button>
                     {{ else }}
+                    <!--suppress XmlDuplicatedId -->
                     <div id="device" style="display: none;"></div>
                     {{ end }}
                     {{ if .WantRemember }}