Adds support for falling back to GITHUB_TOKEN if available

danger · Oct 2, 2018 · aed6295 · aed6295
1 parent 1132886
commit aed6295
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,11 @@
 
 ## Master
 
+# 4.2.1
+
+- Adds a fallback to `GITHUB_TOKEN` if it's in the ENV - orta
+- There was some versioning faffing going on
+
 # 4.1.0
 
 - Adds the ability to send a PR from a Dangerfile easily.

diff --git a/source/api/fetch.ts b/source/api/fetch.ts
@@ -31,7 +31,7 @@ export function api(
     }
 
     const showToken = process.env["DANGER_VERBOSE_SHOW_TOKEN"]
-    const token = process.env["DANGER_GITHUB_API_TOKEN"]
+    const token = process.env["DANGER_GITHUB_API_TOKEN"] || process.env["GITHUB_TOKEN"]
 
     if (init.headers) {
       for (const prop in init.headers) {

diff --git a/source/ci_source/ci_source_helpers.ts b/source/ci_source/ci_source_helpers.ts
@@ -62,7 +62,7 @@ export async function getPullRequestIDForBranch(metadata: RepoMetaData, env: Env
     return 0
   }
 
-  const token = env["DANGER_GITHUB_API_TOKEN"]
+  const token = env["DANGER_GITHUB_API_TOKEN"] || env["GITHUB_TOKEN"]
   if (!token) {
     return 0
   }

diff --git a/source/platforms/github/GitHubGit.ts b/source/platforms/github/GitHubGit.ts
@@ -43,7 +43,7 @@ export const gitHubGitDSL = (github: GitHubDSL, json: GitJSONDSL, githubAPI?: Gi
     githubAPI ||
     new GitHubAPI(
       { repoSlug: github.pr.base.repo.full_name, pullRequestID: String(github.pr.number) },
-      process.env["DANGER_GITHUB_API_TOKEN"]
+      process.env["DANGER_GITHUB_API_TOKEN"] || process.env["GITHUB_TOKEN"]
     )
 
   if (!githubAPI) {

diff --git a/source/platforms/platform.ts b/source/platforms/platform.ts
@@ -96,7 +96,7 @@ export function getPlatformForEnv(env: Env, source: CISource, requireAuth = true
   }
 
   // GitHub
-  const ghToken = env["DANGER_GITHUB_API_TOKEN"]
+  const ghToken = env["DANGER_GITHUB_API_TOKEN"] || env["GITHUB_TOKEN"]
   if (ghToken || !requireAuth) {
     if (!ghToken) {
       console.log("You don't have a DANGER_GITHUB_API_TOKEN set up, this is optional, but TBH, you want to do this")

diff --git a/source/runner/dslGenerator.ts b/source/runner/dslGenerator.ts
@@ -11,7 +11,7 @@ export const jsonDSLGenerator = async (platform: Platform): Promise<DangerDSLJSO
     [platform.name === "BitBucketServer" ? "bitbucket_server" : "github"]: platformDSL,
     settings: {
       github: {
-        accessToken: process.env["DANGER_GITHUB_API_TOKEN"] || "NO_TOKEN",
+        accessToken: process.env["DANGER_GITHUB_API_TOKEN"] || process.env["GITHUB_TOKEN"] || "NO_TOKEN",
         additionalHeaders: {},
         baseURL: process.env["DANGER_GITHUB_API_BASE_URL"] || undefined,
       },