evan/tank
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unify the user's status. fix #9.

Browse Source
This commit is contained in:
hxsherry
2018-01-18 17:59:40 +08:00
parent e38520c0b0
commit 2059280428
7 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rest/base_controller.go
View File

@ -50,7 +50,7 @@ func (this *BaseController) HandleRoutes(writer http.ResponseWriter, request *ht
}
//需要进行登录验证的wrap包装
func (this *BaseController) Wrap(f func(writer http.ResponseWriter, request *http.Request) *WebResult, role string) func(w http.ResponseWriter, r *http.Request) {
func (this *BaseController) Wrap(f func(writer http.ResponseWriter, request *http.Request) *WebResult, qualifiedRole string) func(w http.ResponseWriter, r *http.Request) {
return func(writer http.ResponseWriter, request *http.Request) {
@ -59,13 +59,20 @@ func (this *BaseController) Wrap(f func(writer http.ResponseWriter, request *htt
var webResult *WebResult = nil
//只有游客接口不需要登录
if role != USER_ROLE_GUEST {
if qualifiedRole != USER_ROLE_GUEST {
user := this.checkUser(writer, request)
if role == USER_ROLE_ADMINISTRATOR && user.Role != USER_ROLE_ADMINISTRATOR {
webResult = ConstWebResult(RESULT_CODE_UNAUTHORIZED)
if user.Status == USER_STATUS_DISABLED {
//判断用户是否被禁用。
webResult = ConstWebResult(RESULT_CODE_LOGIN_INVALID)
} else {
webResult = f(writer, request)
if qualifiedRole == USER_ROLE_ADMINISTRATOR && user.Role != USER_ROLE_ADMINISTRATOR {
webResult = ConstWebResult(RESULT_CODE_UNAUTHORIZED)
} else {
webResult = f(writer, request)
}
}
} else {
webResult = f(writer, request)
}