Merge pull request #107 from contributor-assistant/error-handling-for…

…k-fix Bug fix: Fail gracefully when Pr is created from fork
contributor-assistant · Jul 20, 2022 · 58b464b · 58b464b
2 parents adf5016 + 60a7215
commit 58b464b
Show file tree

Hide file tree

Showing 5 changed files with 150 additions and 7 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/lib/main.js b/lib/main.js
diff --git a/src/main.ts b/src/main.ts
@@ -1,6 +1,7 @@
 import { context } from '@actions/github'
 import { setupClaCheck } from './setupClaCheck'
 import { lockPullRequest } from './pullrequest/pullRequestLock'
+import { octokit } from './octokit'
 
 import * as core from '@actions/core'
 import * as input from './shared/getInputs'

diff --git a/src/octokit.ts b/src/octokit.ts
@@ -1,13 +1,12 @@
 import { getOctokit } from '@actions/github'
 
 const githubActionsDefaultToken = process.env.GITHUB_TOKEN
-const personalAcessToken = process.env.PERSONAL_ACCESS_TOKEN as string
+const personalAccessToken = process.env.PERSONAL_ACCESS_TOKEN as string
 
 export const octokit = getOctokit(githubActionsDefaultToken as string)
-export const octokitUsingPAT = isPersonalAccessTokenPresent() ? getOctokit(personalAcessToken as string) : octokit
+export const octokitUsingPAT = isPersonalAccessTokenPresent() ? getOctokit(personalAccessToken as string) : octokit
 
 export function isPersonalAccessTokenPresent(): boolean {
-
-    return (typeof personalAcessToken !== "undefined")
+    return personalAccessToken !== ""
 }
 
diff --git a/src/setupClaCheck.ts b/src/setupClaCheck.ts
@@ -14,7 +14,7 @@ export async function setupClaCheck() {
 
   let committerMap = getInitialCommittersMap()
   if (!isPersonalAccessTokenPresent()) {
-    core.setFailed('Please enter a personal access token as a environment variable in the CLA workflow file as described in the https://github.com/cla-assistant/github-action documentation')
+    core.setFailed('Please enter a personal access token as a environment variable in the CLA workflow file as described in the https://github.com/contributor-assistant/github-action documentation')
     return
   }
 
@@ -104,4 +104,4 @@ const getInitialCommittersMap = (): CommitterMap => ({
   signed: [],
   notSigned: [],
   unknown: []
-})
+})