瀏覽代碼

Fix TypeScript errors caused by `axios dependency` upgrade

Signed-off-by: Mihaela Balutoiu <mbalutoiu@cloudbasesolutions.com>
Mihaela Balutoiu 1 年之前
父節點
當前提交
46e001a489
共有 4 個文件被更改,包括 34 次插入8 次删除
  1. 1 1
      package.json
  2. 2 4
      src/sources/UserSource.ts
  3. 1 1
      src/utils/ApiCaller.ts
  4. 30 2
      yarn.lock

+ 1 - 1
package.json

@@ -67,7 +67,7 @@
     "@babel/register": "^7.7.0",
     "ansi-to-html": "^0.6.14",
     "autobind-decorator": "^2.1.0",
-    "axios": "^0.21.2",
+    "axios": "^0.30.0",
     "babel-loader": "^8.0.6",
     "babel-plugin-styled-components": "^1.10.6",
     "body-parser": "^1.18.2",

+ 2 - 4
src/sources/UserSource.ts

@@ -62,8 +62,6 @@ class UserSource {
       },
     };
 
-    Api.setDefaultHeader("X-Auth-Token", null);
-
     const response = await Api.send({
       url: `${configLoader.config.servicesUrls.keystone}/auth/tokens`,
       method: "POST",
@@ -73,8 +71,8 @@ class UserSource {
       ? response.headers["X-Subject-Token"] ||
         response.headers["x-subject-token"]
       : "";
-    Api.setDefaultHeader("X-Auth-Token", token);
-    cookie.set("unscopedToken", token, { expires: 30 });
+    Api.setDefaultHeader("X-Auth-Token", token ?? null);
+    cookie.set("unscopedToken", token ?? "", { expires: 30 });
     return response.data;
   }
 

+ 1 - 1
src/utils/ApiCaller.ts

@@ -150,7 +150,7 @@ class ApiCaller {
   }
 
   setDefaultHeader(name: string, value: string | null) {
-    axios.defaults.headers.common[name] = value;
+    axios.defaults.headers.common[name] = value ?? undefined;
   }
 }
 

+ 30 - 2
yarn.lock

@@ -5561,7 +5561,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:^0.21.1, axios@npm:^0.21.2":
+"axios@npm:^0.21.1":
   version: 0.21.4
   resolution: "axios@npm:0.21.4"
   dependencies:
@@ -5570,6 +5570,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axios@npm:^0.30.0":
+  version: 0.30.0
+  resolution: "axios@npm:0.30.0"
+  dependencies:
+    follow-redirects: ^1.15.4
+    form-data: ^4.0.0
+    proxy-from-env: ^1.1.0
+  checksum: 5179e93f4d8a4f8fc6fce3d46b4087aff60d1f2aeb36fad289e506dfd327c3436aafe1a91b371f47ffc2ef1b0a3f7ea278a24f6b1af88216d691b1e6c262b32f
+  languageName: node
+  linkType: hard
+
 "babel-jest@npm:^27.5.1":
   version: 27.5.1
   resolution: "babel-jest@npm:27.5.1"
@@ -7196,7 +7207,7 @@ __metadata:
     "@typescript-eslint/parser": ^5.36.2
     ansi-to-html: ^0.6.14
     autobind-decorator: ^2.1.0
-    axios: ^0.21.2
+    axios: ^0.30.0
     babel-loader: ^8.0.6
     babel-plugin-styled-components: ^1.10.6
     body-parser: ^1.18.2
@@ -9432,6 +9443,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"follow-redirects@npm:^1.15.4":
+  version: 1.15.9
+  resolution: "follow-redirects@npm:1.15.9"
+  peerDependenciesMeta:
+    debug:
+      optional: true
+  checksum: 859e2bacc7a54506f2bf9aacb10d165df78c8c1b0ceb8023f966621b233717dab56e8d08baadc3ad3b9db58af290413d585c999694b7c146aaf2616340c3d2a6
+  languageName: node
+  linkType: hard
+
 "for-each@npm:^0.3.3":
   version: 0.3.3
   resolution: "for-each@npm:0.3.3"
@@ -14938,6 +14959,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"proxy-from-env@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "proxy-from-env@npm:1.1.0"
+  checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
+  languageName: node
+  linkType: hard
+
 "prr@npm:~1.0.1":
   version: 1.0.1
   resolution: "prr@npm:1.0.1"