Fix app authentication for enterprise GitHub (#835)

Flo · Florian Sander · web-flow · commit 6ae8ab7ff3d3 · 2021-06-30T09:46:04.000-04:00
Insert api/v3/ if base URL is not github.com for App Authentication.

Co-authored-by: Florian Sander &lt;florian.sander@conti.de&gt;
diff --git a/github/apps.go b/github/apps.go
@@ -31,6 +31,10 @@ func GenerateOAuthTokenFromApp(baseURL, appID, appInstallationID, pemData string
 }
 
 func getInstallationAccessToken(baseURL string, jwt string, installationID string) (string, error) {
+	if baseURL != "https://api.github.com/" {
+		baseURL += "api/v3/"
+	}
+
 	url := fmt.Sprintf("%sapp/installations/%s/access_tokens", baseURL, installationID)
 
 	req, err := http.NewRequest(http.MethodPost, url, nil)
diff --git a/github/apps_test.go b/github/apps_test.go
@@ -145,7 +145,7 @@ func TestGetInstallationAccessToken(t *testing.T) {
 
 	ts := githubApiMock([]*mockResponse{
 		{
-			ExpectedUri: fmt.Sprintf("/app/installations/%s/access_tokens", testGitHubAppInstallationID),
+			ExpectedUri: fmt.Sprintf("/api/v3/app/installations/%s/access_tokens", testGitHubAppInstallationID),
 			ExpectedHeaders: map[string]string{
 				"Accept":        "application/vnd.github.v3+json",
 				"Authorization": fmt.Sprintf("Bearer %s", fakeJWT),

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ func GenerateOAuthTokenFromApp(baseURL, appID, appInstallationID, pemData string`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func getInstallationAccessToken(baseURL string, jwt string, installationID string) (string, error) {`
	`34`	`+ if baseURL != "https://api.github.com/" {`
	`35`	`+ baseURL += "api/v3/"`
	`36`	`+ }`
	`37`	`+`
`34`	`38`	`url := fmt.Sprintf("%sapp/installations/%s/access_tokens", baseURL, installationID)`
`35`	`39`
`36`	`40`	`req, err := http.NewRequest(http.MethodPost, url, nil)`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func TestGetInstallationAccessToken(t *testing.T) {`
`145`	`145`
`146`	`146`	`ts := githubApiMock([]*mockResponse{`
`147`	`147`	`{`
`148`		`- ExpectedUri: fmt.Sprintf("/app/installations/%s/access_tokens", testGitHubAppInstallationID),`
	`148`	`+ ExpectedUri: fmt.Sprintf("/api/v3/app/installations/%s/access_tokens", testGitHubAppInstallationID),`
`149`	`149`	`ExpectedHeaders: map[string]string{`
`150`	`150`	`"Accept": "application/vnd.github.v3+json",`
`151`	`151`	`"Authorization": fmt.Sprintf("Bearer %s", fakeJWT),`