diff options
| author | cpanato <ctadeu@gmail.com> | 2018-06-14 18:46:19 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-06-14 18:46:19 +0200 |
| commit | 8883f487886f8ad6b1529372fa467aaa7aeed5ec (patch) | |
| tree | 1e967b0621b1130cadc08cb47f63658f193f0932 /web/handlers.go | |
| parent | f106417103b036e8c349531f25487e526252d084 (diff) | |
| parent | 695c5d6bf82f5a5c58aa0a22b4911439f08a80fb (diff) | |
| download | chat-8883f487886f8ad6b1529372fa467aaa7aeed5ec.tar.gz chat-8883f487886f8ad6b1529372fa467aaa7aeed5ec.tar.bz2 chat-8883f487886f8ad6b1529372fa467aaa7aeed5ec.zip | |
Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180614-1
Diffstat (limited to 'web/handlers.go')
| -rw-r--r-- | web/handlers.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/web/handlers.go b/web/handlers.go index aac88aa3a..fe77241e3 100644 --- a/web/handlers.go +++ b/web/handlers.go @@ -157,8 +157,12 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { c.Err.IsOAuth = false } - w.WriteHeader(c.Err.StatusCode) - w.Write([]byte(c.Err.ToJson())) + if IsApiCall(r) || len(r.Header.Get("X-Mobile-App")) > 0 { + w.WriteHeader(c.Err.StatusCode) + w.Write([]byte(c.Err.ToJson())) + } else { + utils.RenderWebAppError(w, r, c.Err, c.App.AsymmetricSigningKey()) + } if c.App.Metrics != nil { c.App.Metrics.IncrementHttpError() |