From d01958a6bf3768228db0a11f6417c9c4ecf2b0f6 Mon Sep 17 00:00:00 2001
From: Noah Hsu <i@nn.ci>
Date: Sat, 6 Aug 2022 17:21:32 +0800
Subject: [PATCH] chore: and otp to current user resp

---
 server/handles/auth.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/server/handles/auth.go b/server/handles/auth.go
index a7807627..3b295aae 100644
--- a/server/handles/auth.go
+++ b/server/handles/auth.go
@@ -23,7 +23,7 @@ var (
 type LoginReq struct {
 	Username string `json:"username" binding:"required"`
 	Password string `json:"password"`
-	OTPCode  string `json:"otp_code"`
+	OtpCode  string `json:"otp_code"`
 }
 
 func Login(c *gin.Context) {
@@ -55,7 +55,7 @@ func Login(c *gin.Context) {
 	}
 	// check 2FA
 	if user.OtpSecret != "" {
-		if !totp.Validate(req.OTPCode, user.OtpSecret) {
+		if !totp.Validate(req.OtpCode, user.OtpSecret) {
 			common.ErrorStrResp(c, "Invalid 2FA code", 402)
 			loginCache.Set(ip, count+1)
 			return
@@ -71,12 +71,22 @@ func Login(c *gin.Context) {
 	loginCache.Del(ip)
 }
 
+type UserResp struct {
+	model.User
+	Otp bool `json:"otp"`
+}
+
 // CurrentUser get current user by token
 // if token is empty, return guest user
 func CurrentUser(c *gin.Context) {
 	user := c.MustGet("user").(*model.User)
-	userResp := *user
+	userResp := UserResp{
+		User: *user,
+	}
 	userResp.Password = ""
+	if userResp.OtpSecret != "" {
+		userResp.Otp = true
+	}
 	common.SuccessResp(c, userResp)
 }