From 0c60a9404e9ebe4336ba1303f2a2e9dfc59e01ff Mon Sep 17 00:00:00 2001
From: bobby <1544881+desimone@users.noreply.github.com>
Date: Tue, 22 Sep 2020 07:53:53 -0700
Subject: [PATCH] httputil: remove retry button (#1438)

Signed-off-by: Bobby DeSimone <bobbydesimone@gmail.com>
---
 internal/frontend/assets/html/error.go.html |  7 ----
 internal/httputil/errors.go                 | 37 ++++++++-------------
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/internal/frontend/assets/html/error.go.html b/internal/frontend/assets/html/error.go.html
index 25ed903a5..05a35e050 100644
--- a/internal/frontend/assets/html/error.go.html
+++ b/internal/frontend/assets/html/error.go.html
@@ -28,12 +28,6 @@
               them with your
               <a href="/.pomerium/">request details</a>.
             </div>
-
-            {{end}} {{if.RetryURL}}
-            <div class="message">
-              If you believe the error is temporary, you can
-              <a href="{{.RetryURL}}">retry</a> the request.
-            </div>
             {{end}}
           </section>
           <div class="card-footer">
@@ -44,7 +38,6 @@
                 class="icon"
               />
             </a>
-
             <div class="text-right text-muted small">
               {{.RequestID}} <br />
               Pomerium {{.Version}}
diff --git a/internal/httputil/errors.go b/internal/httputil/errors.go
index a0fdc4e0c..e99b5b48d 100644
--- a/internal/httputil/errors.go
+++ b/internal/httputil/errors.go
@@ -8,7 +8,6 @@ import (
 	"github.com/pomerium/pomerium/internal/frontend"
 	"github.com/pomerium/pomerium/internal/log"
 	"github.com/pomerium/pomerium/internal/telemetry/requestid"
-	"github.com/pomerium/pomerium/internal/urlutil"
 	"github.com/pomerium/pomerium/internal/version"
 )
 
@@ -41,22 +40,6 @@ func (e *HTTPError) Debugable() bool {
 	return e.Status == http.StatusUnauthorized || e.Status == http.StatusForbidden
 }
 
-// RetryURL returns the requests intended destination, if any.
-func (e *HTTPError) RetryURL(r *http.Request) string {
-	return r.FormValue(urlutil.QueryRedirectURI)
-}
-
-type errResponse struct {
-	Status int
-	Error  string
-
-	StatusText string `json:"-"`
-	RequestID  string `json:",omitempty"`
-	CanDebug   bool   `json:"-"`
-	RetryURL   string `json:"-"`
-	Version    string `json:"-"`
-}
-
 // ErrorResponse replies to the request with the specified error message and HTTP code.
 // It does not otherwise end the request; the caller should ensure no further
 // writes are done to w.
@@ -67,24 +50,30 @@ func (e *HTTPError) ErrorResponse(w http.ResponseWriter, r *http.Request) {
 
 	log.FromRequest(r).Info().Err(e).Msg("httputil: ErrorResponse")
 	requestID := requestid.FromContext(r.Context())
-	response := errResponse{
+
+	response := struct {
+		Status     int
+		Error      string
+		StatusText string `json:"-"`
+		RequestID  string `json:",omitempty"`
+		CanDebug   bool   `json:"-"`
+		Version    string `json:"-"`
+	}{
 		Status:     e.Status,
 		StatusText: http.StatusText(e.Status),
 		Error:      e.Error(),
 		RequestID:  requestID,
 		CanDebug:   e.Debugable(),
-		RetryURL:   e.RetryURL(r),
 		Version:    fullVersion,
 	}
 
 	if r.Header.Get("Accept") == "application/json" {
 		w.Header().Set("Content-Type", "application/json")
-		err := json.NewEncoder(w).Encode(response)
-		if err != nil {
+		if err := json.NewEncoder(w).Encode(response); err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 		}
-	} else {
-		w.Header().Set("Content-Type", "text/html; charset=UTF-8")
-		errorTemplate.ExecuteTemplate(w, "error.html", response)
+		return
 	}
+	w.Header().Set("Content-Type", "text/html; charset=UTF-8")
+	errorTemplate.ExecuteTemplate(w, "error.html", response)
 }