Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit bad2254

Browse files
authored
app: set name of app updater route and add it to anon api routes (#52340)
The updater route was missing some "glue". This fixes it by: - adding it to anon api routes - naming the route ## Test plan tested locally #### No update ``` curl -o /dev/null -s -w "%{http_code}\n" "https://sourcegraph.test:3443/.api/app/check/update?target=aarch64&current_version=2023.8.1&arch=darwin" 204 ``` #### Update! ``` curl -s "https://sourcegraph.test:3443/.api/app/check/update?target=aarch64&current_version=2023.2.1&arch=darwin" | jq { "version": "2023.5.8+dev.123.shamd245", "notes": "Test version", "pub_date": "2023-05-07T12:25:57Z", "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVTWVByYmswNFZITlB3UDZaQUE1WnlrZEYxMzBZd1hNYVY5U2U0dGJmZzZNUm1aTDdoMzF3TFNoYlo5VFRiblI5NTQzV2NsS1J0TWZUSmFJQXVmejV1U1p2WXo5ZWhDMGc4PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNjgzNTQzMzgyCWZpbGU6U291cmNlZ3JhcGguQXBwXzEuMC4wLWRldl94NjQuZG1nCmdGM1NDODlWNmJFdEpyUGZNd3orYzdYT1pjOXFjMFJQZXBqNG00ZC9zTC9vajBrakVzSkV5OGRIUE4zak1aSlNVZDN5eXc2YVNRNWs3elovZ3Z1bkJnPT0K", "url": "https://github.com/sourcegraph/sourcegraph/releases/download/untagged-03042cee5585262192cf/Sourcegraph.App_1.0.0-dev_x64.dmg" } ``` <!-- All pull requests REQUIRE a test plan: https://docs.sourcegraph.com/dev/background-information/testing_principles -->
1 parent 6193922 commit bad2254

File tree

6 files changed

+8
-2
lines changed

6 files changed

+8
-2
lines changed

cmd/frontend/auth/non_public.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ var (
7373
router.ResetPasswordInit: {},
7474
router.ResetPasswordCode: {},
7575
router.CheckUsernameTaken: {},
76+
router.AppUpdateCheck: {},
7677
}
7778
anonymousAccessibleUIRoutes = map[string]struct{}{
7879
uirouter.RouteSignIn: {},

cmd/frontend/internal/app/router/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/frontend/internal/app/router/router.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package router
77
import (
88
"github.com/gorilla/mux"
99

10+
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/app/updatecheck"
1011
"github.com/sourcegraph/sourcegraph/cmd/frontend/internal/routevar"
1112
)
1213

@@ -54,6 +55,8 @@ const (
5455
GopherconLiveBlog = "gophercon.live.blog"
5556

5657
UI = "ui"
58+
59+
AppUpdateCheck = updatecheck.RouteAppUpdateCheck
5760
)
5861

5962
// Router returns the frontend app router.

cmd/frontend/internal/app/updatecheck/app_update_checker.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ func (checker *AppUpdateChecker) Handler() http.HandlerFunc {
141141
return func(w http.ResponseWriter, r *http.Request) {
142142
appClientVersion := readClientAppVersion(r.URL)
143143
if err := appClientVersion.validate(); err != nil {
144+
checker.logger.Error("app client version failed validation", log.Error(err))
144145
w.WriteHeader(http.StatusBadRequest)
145146
return
146147
}

cmd/frontend/internal/httpapi/httpapi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func NewHandler(
157157
m.Get(apirouter.CodeInsightsDataExport).Handler(trace.Route(handlers.CodeInsightsDataExportHandler))
158158

159159
if envvar.SourcegraphDotComMode() {
160-
m.Path("/app/check/update").Handler(trace.Route(updatecheck.AppUpdateHandler(logger)))
160+
m.Path("/app/check/update").Name(updatecheck.RouteAppUpdateCheck).Handler(trace.Route(updatecheck.AppUpdateHandler(logger)))
161161
m.Path("/updates").Methods("GET", "POST").Name("updatecheck").Handler(trace.Route(http.HandlerFunc(updatecheck.HandlerWithLog(logger))))
162162
}
163163

src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"updater": {
6868
"active": true,
6969
"endpoints": [
70-
"https://sourcegraph.com/.api/update/app?target={{target}}&current_version={{current_version}}&arch={{arch}}"
70+
"https://sourcegraph.com/.api/app/check/update?target={{target}}&current_version={{current_version}}&arch={{arch}}"
7171
],
7272
"dialog": true,
7373
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDhGNTY0NDBFMkYwN0NGMzUKUldRMXp3Y3ZEa1JXanllL3ozNVBFaGIyd1NQcEg1T3BucHRrWGJSYmFFZ1hYRWkwT24yM3NrWUcK"

0 commit comments

Comments
 (0)