7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-08 13:51:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.9.X'

Browse Source 
# Conflicts:
#	server/server.js
This commit is contained in:
Louis
2021-10-30 10:05:08 +08:00
parent d4c9431142 cf548df15f
commit ba93129b18
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/server.js
View File

@@ -291,9 +291,8 @@ exports.entryPage = "dashboard";
let user = await login(data.username, data.password);
if (user) {
afterLogin(socket, user);
if (user.twofa_status == 0) {
afterLogin(socket, user);
callback({
ok: true,
token: jwt.sign({
@@ -312,6 +311,7 @@ exports.entryPage = "dashboard";
let verify = notp.totp.verify(data.token, user.twofa_secret, twofa_verification_opts);
if (user.twofa_last_token !== data.token && verify) {
afterLogin(socket, user);
await R.exec("UPDATE `user` SET twofa_last_token = ? WHERE id = ? ", [
data.token,