fix: handling of headers

headers are set on the Headers object now

Author: KnisterPeter

src/extension.ts

@@ -26,7 +26,7 @@ class Extension {
     this.channel.appendLine('Visual Studio Code GitHub Extension');
 
     this.githubManager = new GitHubManager(this.cwd, this.channel);
-    this.statusBarManager = new StatusBarManager(context, this.githubManager);
+    this.statusBarManager = new StatusBarManager(context, this.githubManager, this.channel);
 
     const token = context.globalState.get<string|undefined>('token');
     if (token) {

src/github-manager.ts

@@ -66,11 +66,20 @@ export class GitHubManager {
     this.channel.appendLine('Create pull request:');
     this.channel.appendLine(JSON.stringify(body, undefined, ' '));
 
-    const result = await this.github.createPullRequest(owner, repository, body);
-    // TODO: Pretend should optionally redirect
-    const number = result.headers['location'][0]
-      .match(/https:\/\/api.github.com\/repos\/[^\/]+\/[^\/]+\/pulls\/([0-9]+)/) as RegExpMatchArray;
-    return (await this.github.getPullRequest(owner, repository, parseInt(number[1] as string, 10))).body;
+    try {
+      const result = await this.github.createPullRequest(owner, repository, body);
+      // TODO: Pretend should optionally redirect
+      const number = result.headers['location'][0]
+        .match(/https:\/\/api.github.com\/repos\/[^\/]+\/[^\/]+\/pulls\/([0-9]+)/) as RegExpMatchArray;
+      return (await this.github.getPullRequest(owner, repository, parseInt(number[1] as string, 10))).body;
+    } catch (e) {
+      if (e instanceof GitHubError) {
+        console.log(e);
+        this.channel.appendLine('Create pull request error:');
+        this.channel.appendLine(JSON.stringify(e.response, undefined, ' '));
+      }
+      throw e;
+    }
   }
 
   public async listPullRequests(): Promise<PullRequest[]> {

src/github.ts

@@ -118,10 +118,7 @@ namespace impl {
       const entry = cache.get(request.url);
       if (entry) {
         // When we have a cache hit, send etag
-        if (!request.options.headers) {
-          request.options.headers = {};
-        }
-        request.options.headers['If-None-Match'] = entry.etag;
+        (request.options.headers as any).set('If-None-Match', entry.etag);
       }
       const response = await chain(request);
       if (!entry || response.status !== 304) {
@@ -139,10 +136,7 @@ namespace impl {
 
   export function githubTokenAuthenticator(token: string): IPretendRequestInterceptor {
     return request => {
-      if (!request.options.headers) {
-        request.options.headers = {};
-      }
-      request.options.headers['Authorization'] = `token ${token}`;
+      (request.options.headers as any).set('Authorization', `token ${token}`);
       return request;
     };
   }

src/status-bar-manager.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import {PullRequest, PullRequestStatus} from './github';
+import {GitHubError, PullRequest, PullRequestStatus} from './github';
 import {GitHubManager} from './github-manager';
 
 const colors = {
@@ -15,8 +15,11 @@ export class StatusBarManager {
 
   private githubManager: GitHubManager;
 
-  constructor(context: vscode.ExtensionContext, githubManager: GitHubManager) {
+  private channel: vscode.OutputChannel;
+
+  constructor(context: vscode.ExtensionContext, githubManager: GitHubManager, channel: vscode.OutputChannel) {
     this.githubManager = githubManager;
+    this.channel = channel;
 
     this.statusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left);
     this.statusBar.command = '';
@@ -35,17 +38,26 @@ export class StatusBarManager {
   }
 
   public async updatePullRequestStatus(): Promise<void> {
-    const pullRequest = await this.githubManager.getPullRequestForCurrentBranch();
-    this.statusBar.show();
-    if (pullRequest) {
-      const status = await this.calculateMergableStatus(pullRequest);
-      this.statusBar.color = colors[status];
-      this.statusBar.tooltip = status === 'success' ? `Merge pull-request #${pullRequest.number}` : '';
-      this.statusBar.command = status === 'success' ? 'extension.mergePullRequest' : '';
-    } else {
-      this.statusBar.color = colors.none;
-      this.statusBar.tooltip = 'Create pull-request for current branch';
-      this.statusBar.command = 'extension.createPullRequest';
+    try {
+      const pullRequest = await this.githubManager.getPullRequestForCurrentBranch();
+      this.statusBar.show();
+      if (pullRequest) {
+        const status = await this.calculateMergableStatus(pullRequest);
+        this.statusBar.color = colors[status];
+        this.statusBar.tooltip = status === 'success' ? `Merge pull-request #${pullRequest.number}` : '';
+        this.statusBar.command = status === 'success' ? 'extension.mergePullRequest' : '';
+      } else {
+        this.statusBar.color = colors.none;
+        this.statusBar.tooltip = 'Create pull-request for current branch';
+        this.statusBar.command = 'extension.createPullRequest';
+      }
+    } catch (e) {
+      if (e instanceof GitHubError) {
+        console.log(e);
+        this.channel.appendLine('Update pull request status error:');
+        this.channel.appendLine(JSON.stringify(e.response, undefined, ' '));
+      }
+      throw e;
     }
   }