fix: 升级 axios 版本

Author: lixueping

package.json

@@ -12,7 +12,7 @@
   "author": "Willin Wang <[email protected]> (https://willin.wang/)",
   "license": "MIT",
   "dependencies": {
-    "axios": "^0.26.1",
+    "axios": "^1.7.7",
     "base64url": "^3.0.1",
     "buffer": "^6.0.3",
     "crypto-js": "^4.1.1",

src/AutherticationHttpClient.ts

@@ -1,8 +1,4 @@
-import Axios, {
-  AxiosInstance,
-  AxiosRequestConfig,
-  AxiosRequestHeaders,
-} from "axios";
+import Axios, { AxiosHeaders, AxiosInstance, AxiosRequestConfig } from "axios";
 import { AuthenticationClientInitOptions } from "./AuthenticationClientOptions";
 import https from "https";
 
@@ -18,10 +14,10 @@ export class AuthenticationHttpClient {
   }
 
   async request(config: AxiosRequestConfig) {
-    const headers: AxiosRequestHeaders = {
+    const headers = new AxiosHeaders({
       ...config.headers,
       "x-authing-app-id": this.options.appId,
-    };
+    });
 
     // 如果设置的 tokenEndPointAuthMethod 为 client_secret_basic 并且调用的是 /oidc 相关接口：
     // 1. 获取 token: /oidc(oauth)/token
@@ -37,16 +33,22 @@ export class AuthenticationHttpClient {
       "/oauth/token/introspection",
       "/api/v3/signin",
       "/api/v3/signin-by-mobile",
-      "/api/v3/exchange-tokenset-with-qrcode-ticket"
+      "/api/v3/exchange-tokenset-with-qrcode-ticket",
     ];
-    if (this.options.tokenEndPointAuthMethod === "client_secret_basic" && endpointsToSendBasicHeader.includes(config.url!)) {
-      headers["authorization"] =
-      "Basic " +
-      Buffer.from(
-        this.options.appId + ":" + this.options.appSecret
-      ).toString("base64");
+    if (
+      this.options.tokenEndPointAuthMethod === "client_secret_basic" &&
+      endpointsToSendBasicHeader.includes(config.url!)
+    ) {
+      headers.set(
+        "authorization",
+        "Basic " +
+          Buffer.from(
+            this.options.appId + ":" + this.options.appSecret
+          ).toString("base64"),
+        true
+      );
     } else if (this.options.accessToken) {
-      headers["authorization"] = this.options.accessToken;
+      headers.set("authorization", this.options.accessToken, true);
     }
 
     const { data } = await this.axios.request({

src/ManagementHttpClient.ts

@@ -1,4 +1,4 @@
-import Axios, { AxiosInstance, AxiosRequestConfig } from "axios";
+import Axios, { AxiosHeaders, AxiosInstance, AxiosRequestConfig } from "axios";
 
 import { ManagementClientOptions } from "./ManagementClientOptions";
 import { pickBy } from "./utils";
@@ -22,25 +22,27 @@ export class ManagementHttpClient {
 
   async request(config: AxiosRequestConfig) {
     // 此次请求的请求头
-    let headers: any = {};
+    let headers = new AxiosHeaders(DEFAULT_HEADERS());
     if (this.options.tenantId) {
-      headers["x-authing-tenant-id"] = this.options.tenantId;
+      headers.set("x-authing-app-id", this.options.tenantId, true);
     }
-    headers["x-authing-lang"] = this.options.lang || "zh-CN";
-    headers["date"] = new Date().toUTCString();
-    headers = Object.assign(DEFAULT_HEADERS(), headers);
+    headers.set("x-authing-lang", this.options.lang || "zh-CN");
+    headers.set("date", new Date().toUTCString());
 
     // 计算签名
     const stringToSign = buildStringToSign(
       config.method!,
       config.url!,
       headers,
-      config.method === 'GET' ? config.params || {} : config.data || {},
+      config.method === "GET" ? config.params || {} : config.data || {}
     );
-    headers["authorization"] = buildAuthorization(
-      this.options.accessKeyId,
-      this.options.accessKeySecret,
-      stringToSign
+    headers.set(
+      "authorization",
+      buildAuthorization(
+        this.options.accessKeyId,
+        this.options.accessKeySecret,
+        stringToSign
+      )
     );
 
     config.headers = headers;
@@ -51,11 +53,11 @@ export class ManagementHttpClient {
         ...pickBy(config.headers, (i) => !!i),
       },
       httpsAgent:
-      this.options.rejectUnauthorized === false
-        ? new https.Agent({
-            rejectUnauthorized: false,
-          })
-        : undefined,
+        this.options.rejectUnauthorized === false
+          ? new https.Agent({
+              rejectUnauthorized: false,
+            })
+          : undefined,
     });
     return data;
   }

yarn.lock

@@ -699,12 +699,14 @@ asynckit@^0.4.0:
   resolved "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-axios@^0.26.1:
-  version "0.26.1"
-  resolved "https://registry.npmmirror.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
-  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
+axios@^1.7.7:
+  version "1.7.7"
+  resolved "https://registry.npmmirror.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
+  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
   dependencies:
-    follow-redirects "^1.14.8"
+    follow-redirects "^1.15.6"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
 babel-jest@^27.5.1:
   version "27.5.1"
@@ -1174,10 +1176,10 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-follow-redirects@^1.14.8:
-  version "1.14.9"
-  resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
-  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+follow-redirects@^1.15.6:
+  version "1.15.9"
+  resolved "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
 
 form-data@^3.0.0:
   version "3.0.1"
@@ -1188,6 +1190,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
+  integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -2158,6 +2169,11 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 psl@^1.1.33:
   version "1.8.0"
   resolved "https://registry.npmmirror.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"