oauth2: scopes should be separated by %20 and not +, to ensure javasc…

…ript compatibility (#278) * herodot: improve error logging * oauth2: scopes should be separated by %20 and not +, to ensure javascript compatibility - closes #277
ory · Oct 3, 2016 · e33df89 · e33df89
1 parent 16209f6
commit e33df89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/herodot/error.go b/herodot/error.go
@@ -54,7 +54,9 @@ func ToError(err error) *Error {
 
 func LogError(err error, id string, code int) {
  logrus.WithError(err).WithField("request_id", id).WithField("status", code).Errorln("An error occurred")
- if e, ok := errors.Cause(err).(stackTracer); ok {
+ if e, ok := err.(stackTracer); ok {
+ logrus.Debugf("Stack trace: %+v", e.StackTrace())
+ } else if e, ok := errors.Cause(err).(stackTracer); ok {
  logrus.Debugf("Stack trace: %+v", e.StackTrace())
  } else if e, ok := err.(*Error); ok {
  LogError(e.OriginalError, id, code)

diff --git a/herodot/json.go b/herodot/json.go
@@ -46,7 +46,7 @@ func (h *JSON) WriteCode(ctx context.Context, w http.ResponseWriter, r *http.Req
 
 func (h *JSON) WriteError(ctx context.Context, w http.ResponseWriter, r *http.Request, err error) {
  e := ToError(err)
- h.WriteErrorCode(ctx, w, r, e.StatusCode, e)
+ h.WriteErrorCode(ctx, w, r, e.StatusCode, err)
  return
 }
 
@@ -59,9 +59,9 @@ func (h *JSON) WriteErrorCode(ctx context.Context, w http.ResponseWriter, r *htt
  code = http.StatusInternalServerError
  }
 
+ LogError(err, id, code)
  je := ToError(err)
  je.StatusCode = code
- LogError(je, id, code)
  h.WriteCode(ctx, w, r, je.StatusCode, &jsonError{
  RequestID: id,
  Error: ToError(err),