Fix auth support for Github OAuth Access token Closes #431 (#432)

turbot · May 6, 2024 · 257960a · 257960a
1 parent 41b3f5f
commit 257960a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/github/utils.go b/github/utils.go
@@ -75,8 +75,8 @@ func connect(ctx context.Context, d *plugin.QueryData) *github.Client {
 
 	// Return error for unsupported token by prefix
 	// https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/about-authentication-to-github#githubs-token-formats
-	if token != "" && !strings.HasPrefix(token, "ghs_") && !strings.HasPrefix(token, "ghp_") {
-		panic("Supported token formats are 'ghs_' and 'ghp_'")
+	if token != "" && !strings.HasPrefix(token, "ghs_") && !strings.HasPrefix(token, "ghp_") && !strings.HasPrefix(token, "gho_") {
+		panic("Supported token formats are 'ghs_', 'gho_', and 'ghp_'")
 	}
 
 	var client *github.Client
@@ -90,8 +90,8 @@ func connect(ctx context.Context, d *plugin.QueryData) *github.Client {
 		client = github.NewClient(tc)
 	}
 
-	// Authentication Using App Installation Access Token
-	if token != "" && strings.HasPrefix(token, "ghs_") {
+	// Authentication Using App Installation Access Token or OAuth Access token
+	if token != "" && (strings.HasPrefix(token, "ghs_") || strings.HasPrefix(token, "gho_")) {
 		client = github.NewClient(&http.Client{Transport: &oauth2Transport{
 			Token: token,
 		}})
@@ -191,14 +191,14 @@ func connectV4(ctx context.Context, d *plugin.QueryData) *githubv4.Client {
 
 	// Return error for unsupported token by prefix
 	// https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/about-authentication-to-github#githubs-token-formats
-	if token != "" && !strings.HasPrefix(token, "ghs_") && !strings.HasPrefix(token, "ghp_") {
-		panic("Supported token formats are 'ghs_' and 'ghp_'")
+	if token != "" && !strings.HasPrefix(token, "ghs_") && !strings.HasPrefix(token, "ghp_") && !strings.HasPrefix(token, "gho_") {
+		panic("Supported token formats are 'ghs_', 'gho_', and 'ghp_'")
 	}
 
 	var client *githubv4.Client
 
-	// Authentication Using App Installation Access Token
-	if token != "" && strings.HasPrefix(token, "ghs_") {
+	// Authentication Using App Installation Access Token or OAuth Access token
+	if token != "" && (strings.HasPrefix(token, "ghs_") || strings.HasPrefix(token, "gho_")) {
 		return githubv4.NewClient(&http.Client{Transport: &oauth2Transport{
 			Token: token,
 		}})