fix: user wechat auth

backend/app/http/auth/controller_wechat.go

@@ -3,11 +3,11 @@ package auth
 import (
 	"fmt"
 	"net/url"
-	"strings"
 	"time"
 
 	"backend/app/consts"
 	"backend/app/http/users"
+	"backend/database/fields"
 	"backend/providers/jwt"
 	"backend/providers/otel"
 	"backend/providers/wechat"
@@ -33,8 +33,7 @@ func (ctl *Controller) Prepare() error {
 	return nil
 }
 
-// @Router			/v1/auth/wechat/jump/:tenant [get]
-// @Bind tenant path
+// @Router			/v1/auth/wechat/jump [get]
 // @Bind redirectUri query
 func (ctl *Controller) JumpToAuth(ctx fiber.Ctx, tenant, redirectUri string) error {
 	_, span := otel.Start(ctx.Context(), "auth.controller.wechat")
@@ -68,21 +67,13 @@ func (ctl *Controller) JumpToAuth(ctx fiber.Ctx, tenant, redirectUri string) err
 	return ctx.Redirect().To(to.String())
 }
 
-// @Router			/v1/auth/login/:tenant [get]
-// @Bind tenant path
+// @Router			/v1/auth/login [get]
 // @Bind code query
 // @Bind state query
 // @Bind redirectUri query
 func (ctl *Controller) Login(ctx fiber.Ctx, code, state, tenant, redirectUri string) error {
 	ctl.log.Debugf("code: %s, state: %s", code, state)
 
-	ctx.Cookie(&fiber.Cookie{
-		Name:     consts.TokenTypeUser.String(),
-		Value:    "",
-		Expires:  time.Now().Add(12 * time.Hour),
-		HTTPOnly: true,
-	})
-
 	// get the openid
 	token, err := ctl.wechat.AuthorizeCode2Token(code)
 	if err != nil {
@@ -90,31 +81,22 @@ func (ctl *Controller) Login(ctx fiber.Ctx, code, state, tenant, redirectUri str
 	}
 	ctl.log.Debugf("tokenInfo %+v", token)
 
-	user, err := ctl.userSvc.GetOrNewFromChannel(ctx.Context(), consts.AuthChannelWeChat, token.OpenID, tenant)
+	userID, err := ctl.userSvc.GetUserIDByOpenID(ctx.Context(), fields.AuthChannelWeChat, token.GetOpenID())
 	if err != nil {
 		return errors.Wrap(err, "failed to get user")
 	}
 
-	claim := c.jwt.CreateClaims(jwt.BaseClaims{
-		OpenID:   user.OpenID,
-		Tenant:   tenantSlug,
-		UserID:   user.ID,
-		TenantID: tenant.ID,
-	})
-	jwtToken, err = c.jwt.CreateToken(claim)
+	jwtToken, err := ctl.jwt.CreateToken(ctl.jwt.CreateClaims(jwt.BaseClaims{UserID: userID}))
 	if err != nil {
 		return errors.Wrap(err, "failed to create token")
 	}
 
 	ctx.Cookie(&fiber.Cookie{
-		Name:     "token",
+		Name:     consts.TokenTypeUser.String(),
 		Value:    jwtToken,
 		Expires:  time.Now().Add(6 * time.Hour),
 		HTTPOnly: true,
 	})
 
-	html := strings.ReplaceAll(string(b), "{{JWT}}", jwtToken)
-	return ctx.SendString(html)
-
-	return ctx.Redirect().To(paramRedirect)
+	return ctx.Redirect().To(redirectUri)
 }

backend/app/http/auth/provider.gen.go

@@ -7,7 +7,9 @@ import (
 	"backend/providers/jwt"
 	"backend/providers/wechat"
 
+	"git.ipao.vip/rogeecn/atom"
 	"git.ipao.vip/rogeecn/atom/container"
+	"git.ipao.vip/rogeecn/atom/contracts"
 	"git.ipao.vip/rogeecn/atom/utils/opt"
 )
 
@@ -32,6 +34,20 @@ func Provide(opts ...opt.Option) error {
 	}); err != nil {
 		return err
 	}
+	if err := container.Container.Provide(func(
+		controller *Controller,
+	) (contracts.HttpRoute, error) {
+		obj := &Routes{
+			controller: controller,
+		}
+		if err := obj.Prepare(); err != nil {
+			return nil, err
+		}
+
+		return obj, nil
+	}, atom.GroupRoutes); err != nil {
+		return err
+	}
 	if err := container.Container.Provide(func(
 		db *sql.DB,
 	) (*Service, error) {

backend/app/http/auth/routes.gen.go

@@ -0,0 +1,45 @@
+// Code generated by the atomctl ; DO NOT EDIT.
+
+package auth
+
+import (
+	. "backend/pkg/f"
+
+	_ "git.ipao.vip/rogeecn/atom"
+	_ "git.ipao.vip/rogeecn/atom/contracts"
+	"github.com/gofiber/fiber/v3"
+	log "github.com/sirupsen/logrus"
+)
+
+// @provider contracts.HttpRoute atom.GroupRoutes
+type Routes struct {
+	log        *log.Entry `inject:"false"`
+	controller *Controller
+}
+
+func (r *Routes) Prepare() error {
+	r.log = log.WithField("module", "routes.auth")
+	return nil
+}
+
+func (r *Routes) Name() string {
+	return "auth"
+}
+
+func (r *Routes) Register(router fiber.Router) {
+	// 注册路由组: Controller
+	router.Get("/v1/auth/wechat/jump/:tenant", Func2(
+		r.controller.JumpToAuth,
+		Path[string]("tenant"),
+		QueryParam[string]("redirectUri"),
+	))
+
+	router.Get("/v1/auth/login/:tenant", Func4(
+		r.controller.Login,
+		Path[string]("tenant"),
+		QueryParam[string]("code"),
+		QueryParam[string]("state"),
+		QueryParam[string]("redirectUri"),
+	))
+
+}