Skip to content

Commit 9fa12d4

Browse files
committed
fix: only show 2fa when available
1 parent 6e325fa commit 9fa12d4

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/backend/src/routers/whoami.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ const WHOAMI_GET = eggspress('/whoami', {
4747
uuid: req.user.uuid,
4848
email: req.user.email,
4949
unconfirmed_email: req.user.email,
50-
email_confirmed: req.user.email_confirmed,
50+
email_confirmed: req.user.email_confirmed
51+
|| req.user.username === 'admin',
5152
requires_email_confirmation: req.user.requires_email_confirmation,
5253
desktop_bg_url: req.user.desktop_bg_url,
5354
desktop_bg_color: req.user.desktop_bg_color,
@@ -168,7 +169,8 @@ WHOAMI_POST.post('/whoami', auth, fs, express.json(), async (req, response, next
168169
username: req.user.username,
169170
uuid: req.user.uuid,
170171
email: req.user.email,
171-
email_confirmed: req.user.email_confirmed,
172+
email_confirmed: req.user.email_confirmed
173+
|| req.user.username === 'admin',
172174
requires_email_confirmation: req.user.requires_email_confirmation,
173175
desktop_bg_url: req.user.desktop_bg_url,
174176
desktop_bg_color: req.user.desktop_bg_color,

src/gui/src/UI/Settings/UITabSecurity.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export default {
5353
h += `</div>`;
5454

5555
// configure 2FA
56-
if(!user.is_temp){
56+
if(!user.is_temp && user.email_confirmed){
5757
h += `<div class="settings-card settings-card-security ${user.otp ? 'settings-card-success' : 'settings-card-warning'}">`;
5858
h += `<div>`;
5959
h += `<strong style="display:block;">${i18n('two_factor')}</strong>`;

0 commit comments

Comments
 (0)