重构代码结构与认证体系，集成异步任务消费者

web/handlers/channel.go

@@ -24,7 +24,7 @@ type ListChannelsReq struct {
 
 func ListChannels(c *fiber.Ctx) error {
 	// 检查权限
-	authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
+	authContext, err := auth.GetAuthCtx(c).PermitUser()
 	if err != nil {
 		return err
 	}
@@ -37,7 +37,7 @@ func ListChannels(c *fiber.Ctx) error {
 
 	// 构造查询条件
 	cond := q.Channel.
-		Where(q.Channel.UserID.Eq(authContext.Payload.Id))
+		Where(q.Channel.UserID.Eq(authContext.User.ID))
 	switch req.AuthType {
 	case s.ChannelAuthTypeIp:
 		cond.Where(q.Channel.AuthIP.Is(true))
@@ -110,24 +110,19 @@ type CreateChannelRespItem struct {
 func CreateChannel(c *fiber.Ctx) error {
 
 	// 检查权限
-	authContext, err := auth.Protect(c, []auth.PayloadType{auth.PayloadUser}, []string{})
+	authCtx, err := auth.GetAuthCtx(c).PermitUser()
 	if err != nil {
 		return err
 	}
 
 	// 检查用户其他权限
-	user, err := q.User.
-		Where(q.User.ID.Eq(authContext.Payload.Id)).
-		Take()
-	if err != nil {
-		return err
-	}
+	user := authCtx.User
 	if user.IDToken == nil || *user.IDToken == "" {
 		return fiber.NewError(fiber.StatusForbidden, "账号未实名")
 	}
 
 	count, err := q.Whitelist.Where(
-		q.Whitelist.UserID.Eq(authContext.Payload.Id),
+		q.Whitelist.UserID.Eq(user.ID),
 		q.Whitelist.Host.Eq(c.IP()),
 	).Count()
 	if err != nil {
@@ -155,7 +150,7 @@ func CreateChannel(c *fiber.Ctx) error {
 	// 创建通道
 	result, err := s.Channel.CreateChannel(
 		c,
-		authContext.Payload.Id,
+		user.ID,
 		req.ResourceId,
 		req.Protocol,
 		req.AuthType,
@@ -198,7 +193,7 @@ type RemoveChannelsReq struct {
 
 func RemoveChannels(c *fiber.Ctx) error {
 	// 检查权限
-	authCtx, err := auth.NewProtect(c).Payload(auth.PayloadUser).Do()
+	authCtx, err := auth.GetAuthCtx(c).PermitUser()
 	if err != nil {
 		return err
 	}
@@ -210,31 +205,7 @@ func RemoveChannels(c *fiber.Ctx) error {
 	}
 
 	// 删除通道
-	err = s.Channel.RemoveChannels(req.ByIds, authCtx.Payload.Id)
-	if err != nil {
-		return err
-	}
-
-	return c.SendStatus(fiber.StatusOK)
-}
-
-type RemoveChannelByTaskReq []int32
-
-func RemoveChannelByTask(c *fiber.Ctx) error {
-	// 检查权限
-	_, err := auth.NewProtect(c).Payload(auth.PayloadInternalServer).Do()
-	if err != nil {
-		return err
-	}
-
-	// 解析请求参数
-	var req RemoveChannelByTaskReq
-	if err := c.BodyParser(&req); err != nil {
-		return err
-	}
-
-	// 删除通道
-	err = s.Channel.RemoveChannels(req)
+	err = s.Channel.RemoveChannels(req.ByIds, authCtx.User.ID)
 	if err != nil {
 		return err
 	}