mirror of
https://github.com/0xJacky/nginx-ui.git
synced 2025-05-11 02:15:48 +02:00
fix: incorrect status of enabled 2fa of user #577
This commit is contained in:
parent
f2a586ca78
commit
2f7070377f
4 changed files with 31 additions and 11 deletions
|
@ -42,13 +42,19 @@ function batchUpgrade() {
|
|||
|
||||
<BatchUpgrader ref="refUpgrader" />
|
||||
|
||||
<FooterToolBar v-if="selectedNodes?.length > 0">
|
||||
<AButton
|
||||
type="primary"
|
||||
@click="batchUpgrade"
|
||||
<FooterToolBar>
|
||||
<ATooltip
|
||||
:title="$gettext('Please select at least one node to upgrade')"
|
||||
placement="topLeft"
|
||||
>
|
||||
{{ $gettext('Upgrade') }}
|
||||
</AButton>
|
||||
<AButton
|
||||
:disabled="selectedNodeIds.length === 0"
|
||||
type="primary"
|
||||
@click="batchUpgrade"
|
||||
>
|
||||
{{ $gettext('Upgrade') }}
|
||||
</AButton>
|
||||
</ATooltip>
|
||||
</FooterToolBar>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -229,7 +229,7 @@ async function handlePasskeyLogin() {
|
|||
:two-f-a-status="{
|
||||
enabled: true,
|
||||
otp_status: true,
|
||||
passkey_status: true,
|
||||
passkey_status: false,
|
||||
}"
|
||||
@submit-o-t-p="handleOTPSubmit"
|
||||
/>
|
||||
|
|
|
@ -60,6 +60,13 @@ func (c *ConfigPayload) mkCertificateDir() (err error) {
|
|||
}
|
||||
}
|
||||
|
||||
if _, err = os.Stat(c.CertificateDir); os.IsNotExist(err) {
|
||||
err = os.MkdirAll(c.CertificateDir, 0755)
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// For windows, replace * with # (issue #403)
|
||||
c.CertificateDir = strings.ReplaceAll(c.CertificateDir, "*", "#")
|
||||
if _, err = os.Stat(c.CertificateDir); os.IsNotExist(err) {
|
||||
|
|
|
@ -3,15 +3,17 @@ package model
|
|||
import (
|
||||
"github.com/go-webauthn/webauthn/webauthn"
|
||||
"github.com/spf13/cast"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
Model
|
||||
|
||||
Name string `json:"name"`
|
||||
Password string `json:"-"`
|
||||
Status bool `json:"status" gorm:"default:1"`
|
||||
OTPSecret []byte `json:"-" gorm:"type:blob"`
|
||||
Name string `json:"name"`
|
||||
Password string `json:"-"`
|
||||
Status bool `json:"status" gorm:"default:1"`
|
||||
OTPSecret []byte `json:"-" gorm:"type:blob"`
|
||||
EnabledTwoFA bool `json:"enabled_2fa" gorm:"-"`
|
||||
}
|
||||
|
||||
type AuthToken struct {
|
||||
|
@ -24,6 +26,11 @@ func (u *User) TableName() string {
|
|||
return "auths"
|
||||
}
|
||||
|
||||
func (u *User) AfterFind(_ *gorm.DB) error {
|
||||
u.EnabledTwoFA = u.Enabled2FA()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (u *User) EnabledOTP() bool {
|
||||
return len(u.OTPSecret) != 0
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue