Merge remote-tracking branch 'upstream/master'

CATcher-org · Jan 18, 2023 · 922e6f8 · 922e6f8
2 parents c293881 + b039a08
commit 922e6f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/electron-utils/oauth.ts b/electron-utils/oauth.ts
@@ -2,8 +2,8 @@ import { BrowserWindow, shell } from 'electron';
 import { v4 as uuid } from 'uuid';
 
 const nodeUrl = require('url');
-const fetch = require('node-fetch');
 const Logger = require('electron-log');
+const fetch = require('node-fetch');
 
 const CLIENT_ID = '6750652c0c9001314434';
 const BASE_URL = 'https://github.com';
@@ -24,7 +24,7 @@ export function getAccessToken(window: BrowserWindow, repoPermissionLevel: strin
       const accessTokenUrl = `${ACCESS_TOKEN_URL}/${code}`;
       return fetch(accessTokenUrl)
         .then((res) => res.json())
-        .then((data) => {
+        .then((data: { error }) => {
           if (data.error) {
             throw new Error(data.error);
           }

diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "moment": "^2.24.0",
     "ngx-markdown": "^9.1.1",
     "ngx-mat-select-search": "^3.3.3",
-    "node-fetch": "^3.3.0",
+    "node-fetch": "^2.6.8",
     "rxjs": "6.6.7",
     "tslib": "^1.10.0",
     "uuid": "7.0.3",