Skip to content

fixed server error handling #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2016
Merged

fixed server error handling #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,16 @@ func (s *Server) GetAuthorizeData(rt oauth2.ResponseType, ti oauth2.TokenInfo) (
}

// HandleAuthorizeRequest the authorization request handling
func (s *Server) HandleAuthorizeRequest(w http.ResponseWriter, r *http.Request) (uerr error) {
req, err := s.ValidationAuthorizeRequest(r)
if err != nil {
uerr = s.resRedirectError(w, req, err)
func (s *Server) HandleAuthorizeRequest(w http.ResponseWriter, r *http.Request) (err error) {
req, verr := s.ValidationAuthorizeRequest(r)
if verr != nil {
err = s.resRedirectError(w, req, verr)
return
}
// user authorization
userID, err := s.UserAuthorizationHandler(w, r)
if err != nil {
uerr = s.resRedirectError(w, req, err)
userID, verr := s.UserAuthorizationHandler(w, r)
if verr != nil {
err = s.resRedirectError(w, req, verr)
return
} else if userID == "" {
return
Expand All @@ -254,12 +254,12 @@ func (s *Server) HandleAuthorizeRequest(w http.ResponseWriter, r *http.Request)
req.AccessTokenExp = exp
}
}
ti, err := s.GetAuthorizeToken(req)
if err != nil {
uerr = s.resRedirectError(w, req, err)
ti, verr := s.GetAuthorizeToken(req)
if verr != nil {
err = s.resRedirectError(w, req, verr)
return
}
uerr = s.resRedirect(w, req, s.GetAuthorizeData(req.ResponseType, ti))
err = s.resRedirect(w, req, s.GetAuthorizeData(req.ResponseType, ti))
return
}

Expand Down Expand Up @@ -430,15 +430,15 @@ func (s *Server) GetTokenData(ti oauth2.TokenInfo) (data map[string]interface{})
}

// HandleTokenRequest token request handling
func (s *Server) HandleTokenRequest(w http.ResponseWriter, r *http.Request) (uerr error) {
gt, tgr, err := s.ValidationTokenRequest(r)
if err != nil {
err = s.resTokenError(w, err)
func (s *Server) HandleTokenRequest(w http.ResponseWriter, r *http.Request) (err error) {
gt, tgr, verr := s.ValidationTokenRequest(r)
if verr != nil {
err = s.resTokenError(w, verr)
return
}
ti, err := s.GetAccessToken(gt, tgr)
if err != nil {
err = s.resTokenError(w, err)
ti, verr := s.GetAccessToken(gt, tgr)
if verr != nil {
err = s.resTokenError(w, verr)
return
}
err = s.resToken(w, s.GetTokenData(ti))
Expand Down