fix: user wechat auth
This commit is contained in:
@@ -3,6 +3,8 @@ package users
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"backend/providers/event"
|
||||
|
||||
"git.ipao.vip/rogeecn/atom/container"
|
||||
"git.ipao.vip/rogeecn/atom/utils/opt"
|
||||
)
|
||||
@@ -24,9 +26,11 @@ func Provide(opts ...opt.Option) error {
|
||||
}
|
||||
if err := container.Container.Provide(func(
|
||||
db *sql.DB,
|
||||
event *event.PubSub,
|
||||
) (*Service, error) {
|
||||
obj := &Service{
|
||||
db: db,
|
||||
db: db,
|
||||
event: event,
|
||||
}
|
||||
if err := obj.Prepare(); err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
"database/sql"
|
||||
"time"
|
||||
|
||||
"backend/app/events"
|
||||
"backend/app/events/publishers"
|
||||
"backend/database/fields"
|
||||
"backend/database/models/qvyun_v2/public/model"
|
||||
"backend/database/models/qvyun_v2/public/table"
|
||||
@@ -14,6 +14,7 @@ import (
|
||||
"backend/providers/otel"
|
||||
|
||||
. "github.com/go-jet/jet/v2/postgres"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/samber/lo"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"go.opentelemetry.io/otel/attribute"
|
||||
@@ -35,7 +36,7 @@ func (svc *Service) Prepare() error {
|
||||
}
|
||||
|
||||
// GetUsersByOpenID Get user by open id
|
||||
func (svc *Service) GetUserByOpenID(ctx context.Context, channel fields.AuthChannel, openID string) (*model.Users, error) {
|
||||
func (svc *Service) GetUserByOpenIDOfChannel(ctx context.Context, channel fields.AuthChannel, openID string) (*model.Users, error) {
|
||||
_, span := otel.Start(ctx, "users.service.GetUsersByOpenID")
|
||||
defer span.End()
|
||||
|
||||
@@ -106,7 +107,7 @@ func (svc *Service) CreateUser(ctx context.Context, user *model.Users) (*model.U
|
||||
user.UpdatedAt = time.Now()
|
||||
}
|
||||
|
||||
user.Status = int16(fields.UserStatusPending)
|
||||
user.Status = fields.UserStatusPending
|
||||
|
||||
// use bcrypt to hash password
|
||||
pwd, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
|
||||
@@ -126,9 +127,11 @@ func (svc *Service) CreateUser(ctx context.Context, user *model.Users) (*model.U
|
||||
|
||||
// if user created successfully, trigger event
|
||||
span.AddEvent("user created")
|
||||
svc.event.Publish(&events.UserRegister{ID: m.ID})
|
||||
if err := svc.event.Publish(&publishers.UserRegister{ID: m.ID}); err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to publish user register event %d", m.ID)
|
||||
}
|
||||
|
||||
return &m, err
|
||||
return &m, nil
|
||||
}
|
||||
|
||||
// GetUserByID
|
||||
@@ -199,3 +202,29 @@ func (svc *Service) AttachUserOAuth(ctx context.Context, user *model.Users, chan
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetUserStatusByID
|
||||
func (svc *Service) SetUserStatusByID(ctx context.Context, userID int64, status fields.UserStatus) error {
|
||||
_, span := otel.Start(ctx, "users.service.SetUserStatusByID")
|
||||
defer span.End()
|
||||
span.SetAttributes(
|
||||
attribute.Int64("user.id", userID),
|
||||
attribute.String("user.status", status.String()),
|
||||
)
|
||||
|
||||
tbl := table.Users
|
||||
stmt := tbl.
|
||||
UPDATE().
|
||||
SET(
|
||||
tbl.Status.SET(Int16(int16(status))),
|
||||
).
|
||||
WHERE(
|
||||
tbl.ID.EQ(Int64(userID)),
|
||||
)
|
||||
span.SetAttributes(semconv.DBStatementKey.String(stmt.DebugSql()))
|
||||
|
||||
if _, err := stmt.ExecContext(ctx, svc.db); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user