From 37b4bf6b58732b989eada0f69190803791a032cd Mon Sep 17 00:00:00 2001
From: chesspro13 <chesspro13@gmail.com>
Date: Sat, 7 Sep 2024 11:47:29 -0700
Subject: [PATCH] Fixed login errors

---
 src/services/totp.ts |  1 -
 src/views/login.ejs  | 13 ++++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/services/totp.ts b/src/services/totp.ts
index dddff71ab..71580fb92 100644
--- a/src/services/totp.ts
+++ b/src/services/totp.ts
@@ -3,7 +3,6 @@
 import {Totp} from 'time2fa';
 
 function isTotpEnabled() {
-    console.log("Reading ENV: " + process.env.TOTP_ENABLED );
     if (process.env.TOTP_ENABLED === undefined) {
         return false;
     }
diff --git a/src/views/login.ejs b/src/views/login.ejs
index 4dcb49fc6..87fccf4f2 100644
--- a/src/views/login.ejs
+++ b/src/views/login.ejs
@@ -13,10 +13,17 @@
         <h1>Trilium login</h1>
 
         <% if (failedAuth) { %>
-            <div class="alert alert-warning">
-                Password is incorrect. Please try again.
-            </div>
+            <% if( totpEnabled ) { %>
+                <div class="alert alert-warning">
+                    Password or TOTP is incorrect. Please try again.
+                </div>
+            <% }else{ %>
+                <div class="alert alert-warning">
+                    Password is incorrect. Please try again.
+                </div>
+            <% } %>
         <% } %>
+            
 
         <form action="login" method="POST">
             <div class="form-group">