From 650a04c11da40e63e783809ff3a66fd47ff0b966 Mon Sep 17 00:00:00 2001
From: William Bezuidenhout <william.bezuidenhout@sourcegraph.com>
Date: Wed, 24 May 2023 00:09:52 +0200
Subject: [PATCH 1/2] app: set name of app updater route and add it to anon api
 routes

---
 cmd/frontend/auth/non_public.go                             | 1 +
 cmd/frontend/internal/app/router/router.go                  | 3 +++
 cmd/frontend/internal/app/updatecheck/app_update_checker.go | 1 +
 cmd/frontend/internal/httpapi/httpapi.go                    | 2 +-
 src-tauri/tauri.conf.json                                   | 2 +-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmd/frontend/auth/non_public.go b/cmd/frontend/auth/non_public.go
index 3b3e8bcc19dd..1d9b32760967 100644
--- a/cmd/frontend/auth/non_public.go
+++ b/cmd/frontend/auth/non_public.go
@@ -73,6 +73,7 @@ var (
 		router.ResetPasswordInit:  {},
 		router.ResetPasswordCode:  {},
 		router.CheckUsernameTaken: {},
+		router.AppUpdateCheck:     {},
 	}
 	anonymousAccessibleUIRoutes = map[string]struct{}{
 		uirouter.RouteSignIn:             {},
diff --git a/cmd/frontend/internal/app/router/router.go b/cmd/frontend/internal/app/router/router.go
index b1106944058a..d419b85317b5 100644
--- a/cmd/frontend/internal/app/router/router.go
+++ b/cmd/frontend/internal/app/router/router.go
@@ -7,6 +7,7 @@ package router
 import (
 	"github.com/gorilla/mux"
 
+	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/updatecheck"
 	"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/routevar"
 )
 
@@ -54,6 +55,8 @@ const (
 	GopherconLiveBlog = "gophercon.live.blog"
 
 	UI = "ui"
+
+	AppUpdateCheck = updatecheck.RouteAppUpdateCheck
 )
 
 // Router returns the frontend app router.
diff --git a/cmd/frontend/internal/app/updatecheck/app_update_checker.go b/cmd/frontend/internal/app/updatecheck/app_update_checker.go
index ffd8969ff300..5f34df3982bf 100644
--- a/cmd/frontend/internal/app/updatecheck/app_update_checker.go
+++ b/cmd/frontend/internal/app/updatecheck/app_update_checker.go
@@ -141,6 +141,7 @@ func (checker *AppUpdateChecker) Handler() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		appClientVersion := readClientAppVersion(r.URL)
 		if err := appClientVersion.validate(); err != nil {
+			checker.logger.Error("app client version failed validation", log.Error(err))
 			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
diff --git a/cmd/frontend/internal/httpapi/httpapi.go b/cmd/frontend/internal/httpapi/httpapi.go
index 0c4ac25f363a..d20d23b9d283 100644
--- a/cmd/frontend/internal/httpapi/httpapi.go
+++ b/cmd/frontend/internal/httpapi/httpapi.go
@@ -157,7 +157,7 @@ func NewHandler(
 	m.Get(apirouter.CodeInsightsDataExport).Handler(trace.Route(handlers.CodeInsightsDataExportHandler))
 
 	if envvar.SourcegraphDotComMode() {
-		m.Path("/app/check/update").Handler(trace.Route(updatecheck.AppUpdateHandler(logger)))
+		m.Path("/app/check/update").Name(updatecheck.RouteAppUpdateCheck).Handler(trace.Route(updatecheck.AppUpdateHandler(logger)))
 		m.Path("/updates").Methods("GET", "POST").Name("updatecheck").Handler(trace.Route(http.HandlerFunc(updatecheck.HandlerWithLog(logger))))
 	}
 
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index ba7257e3cd65..8cdd9afb23af 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -67,7 +67,7 @@
     "updater": {
       "active": true,
       "endpoints": [
-        "https://sourcegraph.com/.api/update/app?target={{target}}&current_version={{current_version}}&arch={{arch}}"
+        "https://sourcegraph.com/.api/app/check/update?target={{target}}&current_version={{current_version}}&arch={{arch}}"
       ],
       "dialog": true,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDhGNTY0NDBFMkYwN0NGMzUKUldRMXp3Y3ZEa1JXanllL3ozNVBFaGIyd1NQcEg1T3BucHRrWGJSYmFFZ1hYRWkwT24yM3NrWUcK"

From 3fb65ae590b0275de465d027d08ae14549047c08 Mon Sep 17 00:00:00 2001
From: William Bezuidenhout <william.bezuidenhout@sourcegraph.com>
Date: Wed, 24 May 2023 00:18:49 +0200
Subject: [PATCH 2/2] bazel configure

---
 cmd/frontend/internal/app/router/BUILD.bazel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/frontend/internal/app/router/BUILD.bazel b/cmd/frontend/internal/app/router/BUILD.bazel
index 0bce426b0de5..88242a6fb3f1 100644
--- a/cmd/frontend/internal/app/router/BUILD.bazel
+++ b/cmd/frontend/internal/app/router/BUILD.bazel
@@ -10,6 +10,7 @@ go_library(
     importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/router",
     visibility = ["//cmd/frontend:__subpackages__"],
     deps = [
+        "//cmd/frontend/internal/app/updatecheck",
         "//cmd/frontend/internal/routevar",
         "//internal/api",
         "@com_github_gorilla_mux//:mux",