Fixed SMS/Email button on login page.
Ylian Saint-Hilaire committed
Apr 29, 2020 at 11:28 UTC
5fc40f0194ba9692cb67ade9d760f02406cc09b8
1 file changed
+5
-2
webserver.js
+5
-2
@@ -959,6 +959,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
959
delete req.session.tokenusername;
960
delete req.session.tokenpassword;
961
delete req.session.tokenemail;
962
+ delete req.session.tokensms;
963
delete req.session.messageid;
964
delete req.session.passhint;
965
delete req.session.cuserid;
@@ -1118,6 +1119,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1119
delete req.session.resettokenusername;
1120
delete req.session.resettokenpassword;
1121
delete req.session.tokenemail;
1122
+ delete req.session.tokensms;
1123
delete req.session.messageid;
1124
delete req.session.passhint;
1125
delete req.session.cuserid;
@@ -1180,6 +1182,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1182
delete req.session.resettokenusername;
1183
delete req.session.resettokenpassword;
1184
delete req.session.tokenemail;
1185
+ delete req.session.tokensms;
1186
delete req.session.messageid;
1187
delete req.session.passhint;
1188
delete req.session.cuserid;
@@ -1969,9 +1972,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
1972
if (hardwareKeyChallenge) { hwstate = obj.parent.encodeCookie({ u: req.session.tokenusername, p: req.session.tokenpassword, c: req.session.u2fchallenge }, obj.parent.loginCookieEncryptionKey) }
1973
1974
// Check if we can use OTP tokens with email
1972
- var otpemail = (parent.mailserver != null) && (req.session != null) && (req.session.tokenemail != null);
1975
+ var otpemail = (parent.mailserver != null) && (req.session != null) && (req.session.tokenemail == true);
1976
if ((typeof domain.passwordrequirements == 'object') && (domain.passwordrequirements.email2factor == false)) { otpemail = false; }
1974
- var otpsms = (parent.smsserver != null) && (req.session != null) && (req.session.tokensms != null);
1977
+ var otpsms = (parent.smsserver != null) && (req.session != null) && (req.session.tokensms == true);
1978
if ((typeof domain.passwordrequirements == 'object') && (domain.passwordrequirements.sms2factor == false)) { otpsms = false; }
1979
1980
// Render the login page