Upgrade axios version

Author: sugendran

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordermentum/asap",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "main": "build/index.js",
   "license": "MIT",
   "devDependencies": {

packages/asap-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordermentum/asap-core",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "main": "build/index.js",
   "files": [
     "build/*"
@@ -33,7 +33,7 @@
     "typecheck": "yarn tsc --noEmit"
   },
   "dependencies": {
-    "axios": "^0.26.1",
+    "axios": "^1.6.7",
     "express": "^4.17.3",
     "jsonwebtoken": "^8.5.1",
     "node-cache": "^5.1.2"

packages/asap-core/test/file_test.ts

@@ -1,7 +1,10 @@
 import { describe, afterEach, beforeEach } from 'mocha';
 import { expect } from 'chai';
 import sinon from 'sinon';
-import { createPublicKeyFetcher, createTestPublicKeyFetcher } from '../src/fetchers/file';
+import {
+  createPublicKeyFetcher,
+  createTestPublicKeyFetcher,
+} from '../src/fetchers/file';
 
 describe('file', () => {
   let time;
@@ -39,6 +42,6 @@ describe('file', () => {
         const key2 = await fetcher('test/service_2');
         expect(key1).to.eqls(key2);
       });
-    })
+    });
   });
 });

packages/axios-asap/package.json

@@ -34,7 +34,7 @@
     "typecheck": "yarn tsc --noEmit"
   },
   "dependencies": {
-    "@ordermentum/asap-core": "*",
-    "axios": "^0.26.1"
+    "@ordermentum/asap-core": "0.2.0",
+    "axios": "^1.6.7"
   }
 }

packages/axios-asap/src/index.ts

@@ -2,15 +2,19 @@ import {
   createAuthHeaderGenerator,
   AuthHeaderConfig,
 } from '@ordermentum/asap-core';
-import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios, {
+  AxiosInstance,
+  AxiosRequestConfig,
+  InternalAxiosRequestConfig,
+} from 'axios';
 import http from 'http';
 import https from 'https';
 
 export const createAsapInterceptor = (authConfig: AuthHeaderConfig) => {
   const headerGenerator = createAuthHeaderGenerator({
     ...authConfig,
   });
-  return (config: AxiosRequestConfig) => {
+  return (config: InternalAxiosRequestConfig): InternalAxiosRequestConfig => {
     const header = headerGenerator();
     const headers = config.headers ?? {};
     headers.Authorization = header;
@@ -67,7 +71,6 @@ export const createClient = (
   });
 
   const client = axios.create(axiosCreateOpts);
-  // @ts-ignore
   client.interceptors.request.use(asapInterceptor);
   serviceToClientMap.set(issuerServiceKey, client);
 

packages/express-asap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordermentum/express-asap",
-  "version": "0.2.0-beta1",
+  "version": "0.3.0",
   "main": "build/index.js",
   "license": "MIT",
   "files": [
@@ -34,8 +34,8 @@
     "typecheck": "yarn tsc --noEmit"
   },
   "dependencies": {
-    "@ordermentum/asap-core": "*",
-    "axios": "^0.26.1",
+    "@ordermentum/asap-core": "0.2.0",
+    "axios": "^1.6.7",
     "express": "^4.17.3",
     "jsonwebtoken": "^8.5.1"
   }

packages/hapi-asap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordermentum/hapi-asap",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "main": "build/index.js",
   "license": "MIT",
   "files": [
@@ -36,8 +36,8 @@
   "dependencies": {
     "@hapi/boom": "^10.0.0",
     "@hapi/hapi": "^20.2.2",
-    "@ordermentum/asap-core": "*",
-    "axios": "^0.26.1",
+    "@ordermentum/asap-core": "0.2.0",
+    "axios": "^1.6.7",
     "express": "^4.17.3",
     "jsonwebtoken": "^8.5.1"
   }

packages/hapi-asap/src/middleware.ts

@@ -47,10 +47,7 @@ const implementation = (_server: Hapi.Server, options?: any) => {
  * @param opts AuthenticatorOptions
  *
  */
-const register = (
-  server: Hapi.Server,
-  options: AuthenticatorOptions
-) => {
+const register = (server: Hapi.Server, options: AuthenticatorOptions) => {
   server.auth.scheme('hapi-asap', implementation);
   server.auth.strategy('hapi-asap', 'hapi-asap', options);
 };
@@ -60,10 +57,6 @@ const plugin: Hapi.Plugin<AuthenticatorOptions> = {
   pkg: { name: 'ASAP Authentication', version: '0.1.0' },
 };
 
-export {
-  register, 
-  AuthenticatorOptions,
-  plugin
-}
+export { register, AuthenticatorOptions, plugin };
 
 export default plugin;

yarn.lock

@@ -1140,13 +1140,22 @@ axe-core@^4.0.2:
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413"
   integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==
 
-axios@>=0.13.0, axios@^0.26.1:
+axios@>=0.13.0:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
   integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
   dependencies:
     follow-redirects "^1.14.8"
 
+axios@^1.6.7:
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7"
+  integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==
+  dependencies:
+    follow-redirects "^1.15.4"
+    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
+
 axobject-query@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
@@ -2167,6 +2176,11 @@ follow-redirects@^1.14.8:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
   integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
 
+follow-redirects@^1.15.4:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
+
 form-data@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
@@ -3445,6 +3459,11 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
+
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"