Add missing CleanedBasePath to GithubSetupData created by GithubAppCo…

…ntroller (#2142)
runatlantis · May 13, 2022 · 4c0a449 · 4c0a449
1 parent a491542
commit 4c0a449
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/server/controllers/github_app_controller.go b/server/controllers/github_app_controller.go
@@ -70,12 +70,13 @@ func (g *GithubAppController) ExchangeCode(w http.ResponseWriter, r *http.Reques
 	g.Logger.Debug("Found credentials for GitHub app %q with id %d", app.Name, app.ID)
 
 	err = templates.GithubAppSetupTemplate.Execute(w, templates.GithubSetupData{
-		Target:        "",
-		Manifest:      "",
-		ID:            app.ID,
-		Key:           app.Key,
-		WebhookSecret: app.WebhookSecret,
-		URL:           app.URL,
+		Target:          "",
+		Manifest:        "",
+		ID:              app.ID,
+		Key:             app.Key,
+		WebhookSecret:   app.WebhookSecret,
+		URL:             app.URL,
+		CleanedBasePath: g.AtlantisURL.Path,
 	})
 	if err != nil {
 		g.Logger.Err(err.Error())

diff --git a/server/controllers/templates/web_templates.go b/server/controllers/templates/web_templates.go
@@ -501,12 +501,13 @@ var ProjectJobsErrorTemplate = template.Must(template.New("blank.html.tmpl").Par
 
 // GithubSetupData holds the data for rendering the github app setup page
 type GithubSetupData struct {
-	Target        string
-	Manifest      string
-	ID            int64
-	Key           string
-	WebhookSecret string
-	URL           string
+	Target          string
+	Manifest        string
+	ID              int64
+	Key             string
+	WebhookSecret   string
+	URL             string
+	CleanedBasePath string
 }
 
 var GithubAppSetupTemplate = template.Must(template.New("github-app.html.tmpl").Parse(`