diff --git a/app/oauth.go b/app/oauth.go
index 3202ac5ed3..1cce5a3a01 100644
--- a/app/oauth.go
+++ b/app/oauth.go
@@ -564,7 +564,7 @@ func generateOAuthStateTokenExtra(email, action, cookie string) string {
func (a *App) GetAuthorizationCode(w http.ResponseWriter, r *http.Request, service string, props map[string]string, loginHint string) (string, *model.AppError) {
sso := a.Config().GetSSOService(service)
- if sso != nil && !sso.Enable {
+ if sso == nil || !sso.Enable {
return "", model.NewAppError("GetAuthorizationCode", "api.user.get_authorization_code.unsupported.app_error", nil, "service="+service, http.StatusNotImplemented)
}
diff --git a/utils/api.go b/utils/api.go
index 48382d1fe1..005c3284bf 100644
--- a/utils/api.go
+++ b/utils/api.go
@@ -4,6 +4,8 @@
package utils
import (
+ "fmt"
+ "html/template"
"net/http"
"net/url"
"strings"
@@ -31,18 +33,21 @@ func OriginChecker(allowedOrigins string) func(*http.Request) bool {
}
func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request) {
- message := err.Message
- details := err.DetailedError
-
status := http.StatusTemporaryRedirect
if err.StatusCode != http.StatusInternalServerError {
status = err.StatusCode
}
- http.Redirect(
- w,
- r,
- "/error?message="+url.QueryEscape(message)+
- "&details="+url.QueryEscape(details),
- status)
+ destination := strings.TrimRight(GetSiteURL(), "/") + "/error?message=" + url.QueryEscape(err.Message)
+ if status >= 300 && status < 400 {
+ http.Redirect(w, r, destination, status)
+ return
+ }
+
+ w.WriteHeader(status)
+ fmt.Fprintln(w, ``)
+ fmt.Fprintln(w, ``)
+ fmt.Fprintln(w, ``)
+ fmt.Fprintln(w, `...`)
+ fmt.Fprintln(w, ``)
}