Projekte/web-base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.4.3: Minor frontend bugfix for MFA

Browse Source
This commit is contained in:
Roman 2024-05-16 17:07:22 +02:00
parent df4582c7e5
commit b96d0d053c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/core.php
View File

@ -10,7 +10,7 @@ if (is_file($autoLoad)) {
require_once $autoLoad; require_once $autoLoad;
} }
const WEBBASE_VERSION = "2.4.2"; const WEBBASE_VERSION = "2.4.3";
spl_autoload_extensions(".php"); spl_autoload_extensions(".php");
spl_autoload_register(function ($class) { spl_autoload_register(function ($class) {

9
react/admin-panel/src/views/profile/mfa-box.js
View File

@ -8,9 +8,8 @@ import MfaFido from "./mfa-fido";
import CollapseBox from "./collapse-box"; import CollapseBox from "./collapse-box";
const MfaStatusBox = styled(Box)((props) => ({ const MfaStatusBox = styled(Box)((props) => ({
"& > svg": { display: "grid",
marginRight: props.theme.spacing(1), gridTemplateColumns: "30px auto",
},
})); }));
const MFAOptions = styled(Box)((props) => ({ const MFAOptions = styled(Box)((props) => ({
@ -69,7 +68,7 @@ export default function MultiFactorBox(props) {
<Box> <Box>
<MfaStatusBox mb={2}> <MfaStatusBox mb={2}>
<CheckCircle color="info" title={L("account.two_factor_confirmed")} /> <CheckCircle color="info" title={L("account.two_factor_confirmed")} />
{L("account.2fa_type_" + profile.twoFactorToken.type)} <span>{L("account.2fa_type_" + profile.twoFactorToken.type)}</span>
</MfaStatusBox> </MfaStatusBox>
<SpacedFormGroup> <SpacedFormGroup>
<FormLabel>{L("account.password")}</FormLabel> <FormLabel>{L("account.password")}</FormLabel>
@ -82,7 +81,7 @@ export default function MultiFactorBox(props) {
</FormControl> </FormControl>
</SpacedFormGroup> </SpacedFormGroup>
<Button startIcon={is2FARemoving ? <CircularProgress size={12} /> : <Remove />} <Button startIcon={is2FARemoving ? <CircularProgress size={12} /> : <Remove />}
color="danger" onClick={onRemove2FA} color="error" onClick={onRemove2FA}
variant="outlined" size="small" variant="outlined" size="small"
disabled={is2FARemoving || !api.hasPermission("tfa/remove")}> disabled={is2FARemoving || !api.hasPermission("tfa/remove")}>
{is2FARemoving ? L("general.removing") + "…" : L("general.remove")} {is2FARemoving ? L("general.removing") + "…" : L("general.remove")}