Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-30 03:32:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed login errors

Browse Source
This commit is contained in:
chesspro13 2024-09-07 11:47:29 -07:00
parent e232c6634e
commit 37b4bf6b58
No known key found for this signature in database
GPG Key ID: 5FEAE94D298066E5
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/services/totp.ts
View File

@ -3,7 +3,6 @@
import {Totp} from 'time2fa'; import {Totp} from 'time2fa';
function isTotpEnabled() { function isTotpEnabled() {
console.log("Reading ENV: " + process.env.TOTP_ENABLED );
if (process.env.TOTP_ENABLED === undefined) { if (process.env.TOTP_ENABLED === undefined) {
return false; return false;
} }

13
src/views/login.ejs
View File

@ -13,10 +13,17 @@
<h1>Trilium login</h1> <h1>Trilium login</h1>
<% if (failedAuth) { %> <% if (failedAuth) { %>
<div class="alert alert-warning"> <% if( totpEnabled ) { %>
Password is incorrect. Please try again. <div class="alert alert-warning">
</div> 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"> <form action="login" method="POST">
<div class="form-group"> <div class="form-group">