完成白名单接口

web/handlers/login.go

@@ -18,9 +18,10 @@ type LoginReq struct {
 }
 
 type LoginResp struct {
-	Token   string               `json:"token"`
-	Expires int64                `json:"expires"`
-	Auth    services.AuthContext `json:"auth"`
+	AccessToken  string               `json:"access_token"`
+	RefreshToken string               `json:"refresh_token"`
+	Expires      int64                `json:"expires"`
+	Auth         services.AuthContext `json:"auth"`
 }
 
 func Login(c *fiber.Ctx) error {
@@ -105,8 +106,9 @@ func loginByPhone(c *fiber.Ctx, req *LoginReq) error {
 	}
 
 	return c.JSON(LoginResp{
-		Token:   token.AccessToken,
-		Expires: token.AccessTokenExpires.Unix(),
-		Auth:    auth,
+		AccessToken:  token.AccessToken,
+		RefreshToken: token.RefreshToken,
+		Expires:      token.AccessTokenExpires.Unix(),
+		Auth:         auth,
 	})
 }

web/handlers/oauth.go

@@ -126,7 +126,10 @@ func refreshToken(c *fiber.Ctx, req *TokenReq) error {
 	scope := strings.Split(req.Scope, ",")
 	token, err := services.Auth.OauthRefreshToken(c.Context(), client, req.RefreshToken, scope)
 	if err != nil {
-		return sendError(c, err.(services.AuthServiceOauthError))
+		if errors.Is(err, services.ErrInvalidToken) {
+			return sendError(c, services.ErrOauthInvalidGrant)
+		}
+		return sendError(c, err)
 	}
 
 	return sendSuccess(c, token)

web/handlers/whitelist.go

@@ -0,0 +1,187 @@
+package handlers
+
+import (
+	"platform/web/auth"
+	m "platform/web/models"
+	q "platform/web/queries"
+	"platform/web/services"
+	"time"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+type ListWhitelistReq struct {
+	Page int `json:"page" validate:"required"`
+	Size int `json:"size" validate:"required"`
+}
+
+type ListWhitelistResp struct {
+	Total int64          `json:"total"`
+	List  []*m.Whitelist `json:"list"`
+	Page  int            `json:"page"`
+	Size  int            `json:"size"`
+}
+
+func ListWhitelist(c *fiber.Ctx) error {
+
+	// 检查权限
+	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	req := new(ListWhitelistReq)
+	if err := c.BodyParser(req); err != nil {
+		return err
+	}
+	var page = req.Page
+	if page < 1 {
+		page = 1
+	}
+	var size = req.Size
+	if size < 1 {
+		size = 10
+	}
+
+	// 获取用户信息
+	list, err := q.Whitelist.
+		Where(q.Whitelist.UserID.Eq(authContext.Payload.Id)).
+		Offset((page - 1) * size).
+		Limit(size).
+		Order(q.Whitelist.CreatedAt.Desc()).
+		Find()
+	if err != nil {
+		return err
+	}
+	count, err := q.Whitelist.
+		Where(q.Whitelist.UserID.Eq(authContext.Payload.Id)).
+		Count()
+	if err != nil {
+		return err
+	}
+
+	// 返回结果
+	return c.Status(fiber.StatusOK).JSON(ListWhitelistResp{
+		Total: count,
+		List:  list,
+		Page:  page,
+		Size:  size,
+	})
+}
+
+type CreateWhitelistReq struct {
+	Host   string `json:"host" validate:"required"`
+	Remark string `json:"remark"`
+}
+
+func CreateWhitelist(c *fiber.Ctx) error {
+
+	// 检查权限
+	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	req := new(CreateWhitelistReq)
+	if err := c.BodyParser(req); err != nil {
+		return err
+	}
+	if req.Host == "" {
+		return fiber.NewError(fiber.StatusBadRequest, "host is required")
+	}
+
+	// 创建白名单
+	whitelist := &m.Whitelist{
+		UserID: authContext.Payload.Id,
+		Host:   req.Host,
+		Remark: req.Remark,
+	}
+
+	err = q.Whitelist.Create(whitelist)
+	return nil
+}
+
+type UpdateWhitelistReq struct {
+	ID     int32  `json:"id" validate:"required"`
+	Host   string `json:"host"`
+	Remark string `json:"remark"`
+}
+
+func UpdateWhitelist(c *fiber.Ctx) error {
+	// 检查权限
+	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	req := new(UpdateWhitelistReq)
+	if err := c.BodyParser(req); err != nil {
+		return err
+	}
+	if req.ID == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "id is required")
+	}
+
+	// 更新白名单
+	_, err = q.Whitelist.
+		Where(
+			q.Whitelist.ID.Eq(req.ID),
+			q.Whitelist.UserID.Eq(authContext.Payload.Id),
+		).
+		Updates(&m.Whitelist{
+			ID:     req.ID,
+			Host:   req.Host,
+			Remark: req.Remark,
+		})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+type RemoveWhitelistReq struct {
+	ID int32 `json:"id" validate:"required"`
+}
+
+func RemoveWhitelist(c *fiber.Ctx) error {
+
+	// 检查权限
+	authContext, err := auth.Protect(c, []services.PayloadType{services.PayloadUser}, []string{})
+	if err != nil {
+		return err
+	}
+
+	// 解析请求参数
+	var req []RemoveWhitelistReq
+	if err := c.BodyParser(&req); err != nil {
+		return err
+	}
+	if len(req) == 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "id is required")
+	}
+
+	var ids = make([]int32, len(req))
+	for i, item := range req {
+		if item.ID == 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "id is required")
+		}
+		ids[i] = item.ID
+	}
+
+	// 删除白名单
+	_, err = q.Whitelist.
+		Where(
+			q.Whitelist.ID.In(ids...),
+			q.Whitelist.UserID.Eq(authContext.Payload.Id),
+		).
+		Update(
+			q.Whitelist.DeletedAt, time.Now(),
+		)
+	if err != nil {
+		return err
+	}
+	return nil
+}