Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot] 2ef26210bc
chore(deps): bump marked from 10.0.0 to 14.1.2 in /app
Bumps [marked](https://github.com/markedjs/marked) from 10.0.0 to 14.1.2.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v10.0.0...v14.1.2)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2 years ago

@ -1,6 +1,6 @@
{
"name": "nginx-ui-app-next",
"version": "2.0.0-beta.35",
"version": "2.0.0-beta.34",
"type": "module",
"scripts": {
"dev": "vite --host",
@ -29,7 +29,7 @@
"dayjs": "^1.11.13",
"highlight.js": "^11.10.0",
"lodash": "^4.17.21",
"marked": "^10.0.0",
"marked": "^14.1.2",
"nprogress": "^0.2.0",
"pinia": "^2.2.2",
"pinia-plugin-persistedstate": "^3.2.3",

@ -63,8 +63,8 @@ importers:
specifier: ^4.17.21
version: 4.17.21
marked:
specifier: ^10.0.0
version: 10.0.0
specifier: ^14.1.2
version: 14.1.2
nprogress:
specifier: ^0.2.0
version: 0.2.0
@ -2203,8 +2203,8 @@ packages:
resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
engines: {node: '>=6'}
marked@10.0.0:
resolution: {integrity: sha512-YiGcYcWj50YrwBgNzFoYhQ1hT6GmQbFG8SksnYJX1z4BXTHSOrz1GB5/Jm2yQvMg4nN1FHP4M6r03R10KrVUiA==}
marked@14.1.2:
resolution: {integrity: sha512-f3r0yqpz31VXiDB/wj9GaOB0a2PRLQl6vJmXiFrniNwjkKdvakqJRULhjFKJpxOchlCRiG5fcacoUZY5Xa6PEQ==}
engines: {node: '>= 18'}
hasBin: true
@ -5443,7 +5443,7 @@ snapshots:
semver: 5.7.2
optional: true
marked@10.0.0: {}
marked@14.1.2: {}
mdast-util-from-markdown@0.8.5:
dependencies:

@ -1 +1 @@
{"version":"2.0.0-beta.35","build_id":160,"total_build":364}
{"version":"2.0.0-beta.34","build_id":159,"total_build":363}

@ -42,19 +42,13 @@ function batchUpgrade() {
<BatchUpgrader ref="refUpgrader" />
<FooterToolBar>
<ATooltip
:title="$gettext('Please select at least one node to upgrade')"
placement="topLeft"
<FooterToolBar v-if="selectedNodes?.length > 0">
<AButton
type="primary"
@click="batchUpgrade"
>
<AButton
:disabled="selectedNodeIds.length === 0"
type="primary"
@click="batchUpgrade"
>
{{ $gettext('Upgrade') }}
</AButton>
</ATooltip>
{{ $gettext('Upgrade') }}
</AButton>
</FooterToolBar>
</div>
</template>

@ -229,7 +229,7 @@ async function handlePasskeyLogin() {
:two-f-a-status="{
enabled: true,
otp_status: true,
passkey_status: false,
passkey_status: true,
}"
@submit-o-t-p="handleOTPSubmit"
/>

@ -60,13 +60,6 @@ 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,17 +3,15 @@ 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"`
EnabledTwoFA bool `json:"enabled_2fa" gorm:"-"`
Name string `json:"name"`
Password string `json:"-"`
Status bool `json:"status" gorm:"default:1"`
OTPSecret []byte `json:"-" gorm:"type:blob"`
}
type AuthToken struct {
@ -26,11 +24,6 @@ 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…
Cancel
Save