From cf45d6a27582615c9caa13775962a8db1a429deb Mon Sep 17 00:00:00 2001 From: Will Norris Date: Tue, 22 Aug 2023 16:08:07 -0700 Subject: [PATCH] client/web: remove old /redirect handler I thought this had something to do with Synology or QNAP support, since they both have specific authentication logic. But it turns out this was part of the original web client added in #1621, and then refactored as part of #2093. But with how we handle logging in now, it's never called. Updates tailscale/corp#13775 Signed-off-by: Will Norris --- client/web/auth-redirect.html | 57 ----------------------------------- client/web/web.go | 7 +---- 2 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 client/web/auth-redirect.html diff --git a/client/web/auth-redirect.html b/client/web/auth-redirect.html deleted file mode 100644 index 559d8fb4f..000000000 --- a/client/web/auth-redirect.html +++ /dev/null @@ -1,57 +0,0 @@ - - - Redirecting... - - -
-
Redirecting...
- \ No newline at end of file diff --git a/client/web/web.go b/client/web/web.go index 23382a4ef..27aa8bff4 100644 --- a/client/web/web.go +++ b/client/web/web.go @@ -45,7 +45,7 @@ import ( //go:embed yarn.lock index.html *.js *.json src/* var _ embed.FS -//go:embed web.html web.css auth-redirect.html +//go:embed web.html web.css var embeddedFS embed.FS var tmpls *template.Template @@ -302,11 +302,6 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) { } switch { - case r.URL.Path == "/redirect" || r.URL.Path == "/redirect/": - if err := tmpls.ExecuteTemplate(w, "auth-redirect.html", nil); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - } - return case r.Method == "POST": s.servePostNodeUpdate(w, r) return