diff --git a/api/user/otp.go b/api/user/otp.go index 7ba75a43..f7c23644 100644 --- a/api/user/otp.go +++ b/api/user/otp.go @@ -9,6 +9,7 @@ import ( "github.com/0xJacky/Nginx-UI/api" "github.com/0xJacky/Nginx-UI/internal/crypto" "github.com/0xJacky/Nginx-UI/internal/user" + "github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/query" "github.com/0xJacky/Nginx-UI/settings" "github.com/gin-gonic/gin" @@ -165,14 +166,19 @@ func ResetOTP(c *gin.Context) { } func OTPStatus(c *gin.Context) { + status := false + u, ok := c.Get("user") + if ok { + status = u.(*model.Auth).EnabledOTP() + } c.JSON(http.StatusOK, gin.H{ - "status": len(api.CurrentUser(c).OTPSecret) > 0, + "status": status, }) } func SecureSessionStatus(c *gin.Context) { - cUser := api.CurrentUser(c) - if !cUser.EnabledOTP() { + u, ok := c.Get("user") + if !ok || !u.(*model.Auth).EnabledOTP() { c.JSON(http.StatusOK, gin.H{ "status": false, }) @@ -189,12 +195,13 @@ func SecureSessionStatus(c *gin.Context) { return } - if user.VerifySecureSessionID(ssid, cUser.ID) { + if user.VerifySecureSessionID(ssid, u.(*model.Auth).ID) { c.JSON(http.StatusOK, gin.H{ "status": true, }) return } + c.JSON(http.StatusOK, gin.H{ "status": false, }) diff --git a/app/components.d.ts b/app/components.d.ts index 0257329d..55eaaa22 100644 --- a/app/components.d.ts +++ b/app/components.d.ts @@ -1,10 +1,10 @@ /* eslint-disable */ -/* prettier-ignore */ // @ts-nocheck // Generated by unplugin-vue-components // Read more: https://github.com/vuejs/core/pull/3399 export {} +/* prettier-ignore */ declare module 'vue' { export interface GlobalComponents { AAlert: typeof import('ant-design-vue/es')['Alert']