🎨 update
This commit is contained in:
@@ -38,8 +38,7 @@ func (l *AdminLoginLogic) AdminLogin(r *http.Request, req *types.AdminLoginReque
|
||||
authUser := l.svcCtx.DB.ScaAuthUser
|
||||
permissionRule := l.svcCtx.DB.ScaAuthPermissionRule
|
||||
adminUser, err := authUser.
|
||||
LeftJoin(permissionRule, authUser.UID.EqCol(permissionRule.V0)).
|
||||
Where(authUser.Username.Eq(req.Account), authUser.Password.Eq(req.Password), permissionRule.V1.Eq(constant.Admin)).
|
||||
Where(authUser.Username.Eq(req.Account)).
|
||||
Group(authUser.UID).First()
|
||||
if err != nil && err != gorm.ErrRecordNotFound {
|
||||
return nil, err
|
||||
@@ -50,6 +49,13 @@ func (l *AdminLoginLogic) AdminLogin(r *http.Request, req *types.AdminLoginReque
|
||||
if !utils.Verify(adminUser.Password, req.Password) {
|
||||
return nil, errors.New(http.StatusInternalServerError, i18n.FormatText(l.ctx, "login.invalidPassword"))
|
||||
}
|
||||
first, err := permissionRule.Where(permissionRule.Ptype.Eq("g"), permissionRule.V0.Eq(adminUser.UID), permissionRule.V1.Eq(constant.Admin)).First()
|
||||
if err != nil && err != gorm.ErrRecordNotFound {
|
||||
return nil, err
|
||||
}
|
||||
if first == nil {
|
||||
return nil, errors.New(http.StatusInternalServerError, i18n.FormatText(l.ctx, "login.notPermission"))
|
||||
}
|
||||
data, err := HandleLoginJWT(adminUser, l.svcCtx, true, r, l.ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
Reference in New Issue
Block a user