fix: issues

backend/modules/middlewares/m_wechat_auth_userinfo.go

@@ -19,6 +19,7 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 		return c.Next()
 	}
 
+	log.WithField("module", "middleware.AuthUserInfo").Debugf("query: %v", c.Queries())
 	state := c.Query("state")
 	code := c.Query("code")
 
@@ -29,13 +30,14 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 	if state != "sns_basic_auth" {
 		return c.Next()
 	}
-	log.WithField("module", "middleware.AuthUserInfo").Debug("code", code)
+	log.WithField("module", "middleware.AuthUserInfo").Debugf("code: %s, state: %s", code, state)
 
 	// get the openid
 	token, err := f.client.AuthorizeCode2Token(code)
 	if err != nil {
 		return errors.Wrap(err, "failed to get openid")
 	}
+	log.Debugf("tokenInfo %+v", token)
 
 	paths := lo.Filter(strings.Split(c.Path(), "/"), func(s string, _ int) bool {
 		return s != ""
@@ -58,20 +60,24 @@ func (f *Middlewares) WeChatAuthUserInfo(c fiber.Ctx) error {
 	if err := copier.Copy(&oauthInfo, token); err != nil {
 		return errors.Wrap(err, "failed to copy oauth info")
 	}
+	log.Debugf("oauthInfo %+v", oauthInfo)
 
 	user, err := f.userSvc.GetOrNew(c.Context(), tenant.ID, token.Openid, oauthInfo)
 	if err != nil {
 		return errors.Wrap(err, "failed to get user")
 	}
 
-	claim := f.jwt.CreateClaims(jwt.BaseClaims{OpenID: user.OpenID})
-	claim.ID = user.OpenID
+	claim := f.jwt.CreateClaims(jwt.BaseClaims{
+		OpenID:   user.OpenID,
+		Tenant:   tenantSlug,
+		UserID:   user.ID,
+		TenantID: tenant.ID,
+	})
 	jwtToken, err := f.jwt.CreateToken(claim)
 	if err != nil {
 		return errors.Wrap(err, "failed to create token")
 	}
-	_ = jwtToken
 
 	// TODO: send html with jwt token
-	return c.SendString("Tenant: " + tenantSlug)
+	return c.SendString(jwtToken)
 }

backend/modules/users/controller.go

@@ -9,6 +9,6 @@ type Controller struct {
 
 // List
 func (c *Controller) List(ctx fiber.Ctx) error {
-	return ctx.SendString(ctx.Params("tenant", "no tenant"))
+	return ctx.SendString(ctx.Params("tenant", "no user"))
 	return ctx.JSON(nil)
 }

backend/modules/users/service.go

@@ -161,7 +161,7 @@ func (svc *Service) TenantHasUser(ctx context.Context, userID, tenantID int64) (
 
 	tbl := table.UsersTenants
 	stmt := tbl.
-		SELECT(COUNT(tbl.ID)).
+		SELECT(COUNT(tbl.ID).AS("cnt")).
 		WHERE(
 			tbl.UserID.EQ(Int64(userID)).AND(
 				tbl.TenantID.EQ(Int64(tenantID)),
@@ -169,12 +169,14 @@ func (svc *Service) TenantHasUser(ctx context.Context, userID, tenantID int64) (
 		)
 	log.Debug(stmt.DebugSql())
 
-	var cnt int
-	if err := stmt.QueryContext(ctx, db.FromContext(ctx, svc.db), &cnt); err != nil {
+	var result struct {
+		cnt int64
+	}
+	if err := stmt.QueryContext(ctx, db.FromContext(ctx, svc.db), &result); err != nil {
 		return false, errors.Wrap(err, "failed to query user-tenant relation")
 	}
 
-	return cnt > 0, nil
+	return result.cnt > 0, nil
 }
 
 // CreateTenantUser