OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 补充登录用户状态错误提示

Browse Source
This commit is contained in:
TsMask
2023-08-14 21:13:55 +08:00
parent 5ac2e981ea
commit a039a664f1
2 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
features/security/account.go
View File

@@ -75,12 +75,12 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
services.ResponseBadRequest400IncorrectLogin(w)
}
*/
validUser, user, _ := dborm.XormCheckLoginUser(oAuthBody.UserName,
validUser, user, err := dborm.XormCheckLoginUser(oAuthBody.UserName,
oAuthBody.Value, config.GetYamlConfig().Auth.Crypt)
if !validUser {
if !validUser && err != nil {
// response 400-4
log.Error("Authentication failed, mismatch user or password")
services.ResponseBadRequest400IncorrectLogin(w)
services.ResponseErrorWithJson(w, 400, err.Error())
return
}
@@ -98,15 +98,15 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) {
return
}
services.ResponseStatusOK200Login(w, token, user)
return
}
func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
log.Info("LogoutFromOMC processing... ")
// check media type(content type) only support "application/json"
if services.IsVallidContentType(r, config.GetYamlConfig().OMC.CheckContentType) == false {
if services.IsVallidContentType(r, !config.GetYamlConfig().OMC.CheckContentType) {
log.Error("Invalid Content-Type")
services.ResponseUnsupportedMediaType415(w)
return
@@ -122,7 +122,7 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
// error processing ...
// 401-1 response
token, ret := oauth.IsCarriedToken(r)
if ret == false {
if !ret {
log.Error("AccessToken is not carried")
services.ResponseUnauthorized401AccessTokenNotCarried(w)
return
@@ -135,7 +135,6 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) {
return
}
services.ResponseStatusOK200Null(w)
return
}
func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) {
@@ -158,7 +157,7 @@ func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) {
// error processing ...
// 401-1 response
token, ret := oauth.IsCarriedToken(r)
if ret == false {
if !ret {
log.Error("AccessToken is not carried")
services.ResponseUnauthorized401AccessTokenNotCarried(w)
return
@@ -171,5 +170,4 @@ func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) {
return
}
services.ResponseStatusOK200Null(w)
return
}