登录检查user空的情况

This commit is contained in:
TsMask
2023-09-01 10:29:52 +08:00
parent 582a97673d
commit 95591c1753

View File

@@ -90,7 +90,7 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
*/
validUser, user, err := dborm.XormCheckLoginUser(oAuthBody.UserName,
oAuthBody.Value, config.GetYamlConfig().Auth.Crypt)
if !validUser && err != nil {
if !validUser || err != nil {
// response 400-4
log.Error("Authentication failed, mismatch user or password")
services.ResponseErrorWithJson(w, 400, err.Error())
@@ -112,13 +112,17 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
return
}
// 缓存用户信息
account.CacheLoginUser(user)
// 角色权限集合,管理员拥有所有权限
userId := fmt.Sprint(user.Id)
isAdmin := conf.IsAdmin(userId)
roles, perms := service.NewServiceAccount.RoleAndMenuPerms(userId, isAdmin)
services.ResponseStatusOK200LoginWhitRP(w, token, user, roles, perms)
if user != nil {
// 缓存用户信息
account.CacheLoginUser(user)
// 角色权限集合,管理员拥有所有权限
userId := fmt.Sprint(user.Id)
isAdmin := conf.IsAdmin(userId)
roles, perms := service.NewServiceAccount.RoleAndMenuPerms(userId, isAdmin)
services.ResponseStatusOK200LoginWhitRP(w, token, user, roles, perms)
return
}
services.ResponseBadRequest400IncorrectLogin(w)
}
func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {