better logic around the getIssue code

danger · Mar 3, 2017 · 96a02e8 · 96a02e8
1 parent 341a346
commit 96a02e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/source/platforms/GitHub.ts b/source/platforms/GitHub.ts
@@ -64,6 +64,9 @@ export class GitHub {
 
   async getIssue(): Promise<GitHubIssue> {
     const issue = await this.api.getIssue()
+    if (!issue) {
+      return { labels: [] }
+    }
     const labels = issue.labels.map((label: any): GitHubIssueLabel => ({
       id: label.id,
       url: label.url,

diff --git a/source/platforms/github/GitHubAPI.ts b/source/platforms/github/GitHubAPI.ts
@@ -125,10 +125,14 @@ export class GitHubAPI {
     return []
   }
 
-  getIssue(): Promise<any> {
+  async getIssue(): Promise<any> {
     const repo = this.ciSource.repoSlug
     const prID = this.ciSource.pullRequestID
-    return this.get(`repos/${repo}/issues/${prID}`)
+    const res = await this.get(`repos/${repo}/issues/${prID}`)
+    if (res.ok) {
+      return res.json()
+    }
+    return {}
   }
 
   private api(path: string, headers: any = {}, body: any = {}, method: string): Promise<any> {