fix: some api bug
This commit is contained in:
@@ -2,6 +2,8 @@ package logic
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"juwan-backend/app/users/rpc/internal/models/users"
|
||||
|
||||
"juwan-backend/app/users/rpc/internal/svc"
|
||||
@@ -33,15 +35,24 @@ func (l *ValidateTokenLogic) ValidateToken(in *pb.ValidateTokenReq) (*pb.Validat
|
||||
return nil, err
|
||||
}
|
||||
//users, err := l.svcCtx.UsersModelRO.FindOne(l.ctx, in.UserId)
|
||||
user, err := l.svcCtx.UsersModelRO.Query().Where(users.IDEQ(in.UserId)).First(l.ctx)
|
||||
user, err := l.svcCtx.UsersModelRO.Users.Query().
|
||||
Where(users.IDEQ(in.UserId)).
|
||||
Select(users.FieldCurrentRole).
|
||||
First(l.ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
userJson, err := json.Marshal(user.CurrentRole)
|
||||
if err != nil {
|
||||
logx.Errorf("json marshal err: %v", err)
|
||||
return nil, errors.New("internal error")
|
||||
}
|
||||
|
||||
return &pb.ValidateTokenResp{
|
||||
Valid: true,
|
||||
Message: "OK",
|
||||
UserId: in.UserId,
|
||||
RoleType: user.CurrentRole,
|
||||
RoleType: string(userJson),
|
||||
}, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user