@devkong/cli 0.0.57 → 0.0.58

package/index.js

@@ -50234,7 +50234,7 @@ var require_axios = __commonJS({
       clarifyTimeoutError: false,
       legacyInterceptorReqResOrdering: true
     };
-    var URLSearchParams = url__default["default"].URLSearchParams;
+    var URLSearchParams2 = url__default["default"].URLSearchParams;
     var ALPHA2 = "abcdefghijklmnopqrstuvwxyz";
     var DIGIT2 = "0123456789";
     var ALPHABET2 = {
@@ -50255,7 +50255,7 @@ var require_axios = __commonJS({
     var platform$1 = {
       isNode: true,
       classes: {
-        URLSearchParams,
+        URLSearchParams: URLSearchParams2,
         FormData: FormData__default["default"],
         Blob: typeof Blob !== "undefined" && Blob || null
       },
@@ -87505,45 +87505,54 @@ function jwtDecode(token, options) {
 }
 
 // packages/kong-cli/src/services/api.ts
-async function provideRequestConfig(profile, cachedConfig) {
-  if ("Authorization" in cachedConfig.headers) {
-    const auth = cachedConfig.headers.Authorization;
-    const accessToken = auth.split("Bearer ")[1].trim();
-    const decoded = jwtDecode(accessToken);
-    if (decoded.exp !== void 0) {
-      const nowSeconds = Date.now() / 1e3;
-      if (decoded.exp < nowSeconds - 30) {
-        return cachedConfig;
-      }
-    }
-  }
-  const url2 = joinUrlAndPath(
-    profile.kongBaseUrl,
-    "api/keycloak/realms/kong/protocol/openid-connect/token"
-  );
-  const entry = new import_keyring2.Entry(profile.kongBaseUrl, profile.userName);
-  const params = {
-    grant_type: "password",
-    client_id: "kong-web",
-    username: profile.userName,
-    password: entry.getPassword()
-  };
-  const token = (await axios_default.post(url2, params, {
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    }
-  })).data;
-  cachedConfig.headers["Authorization"] = `Bearer ${token.access_token}`;
-  cachedConfig.headers["X-App-Tenant"] = parseTenant(profile.kongBaseUrl);
-  return cachedConfig;
-}
 function requestConfigProvider(profile) {
   const cached = {
     headers: {
-      "Content-Type": "application/json"
+      "Content-Type": "application/json",
+      "X-App-Tenant": parseTenant(profile.kongBaseUrl)
+    }
+  };
+  return async () => {
+    if (cached.headers.Authorization) {
+      try {
+        const auth = cached.headers.Authorization;
+        const accessToken = auth.split("Bearer ")[1]?.trim();
+        if (accessToken) {
+          const decoded = jwtDecode(accessToken);
+          if (decoded.exp !== void 0) {
+            const nowSeconds = Date.now() / 1e3;
+            if (decoded.exp > nowSeconds + 60) {
+              return cached;
+            }
+          }
+        }
+      } catch (ex) {
+        console.warn("Invalid cached token, fetching new one", ex);
+      }
     }
+    const url2 = joinUrlAndPath(
+      profile.kongBaseUrl,
+      "api/keycloak/realms/kong/protocol/openid-connect/token"
+    );
+    const entry = new import_keyring2.Entry(profile.kongBaseUrl, profile.userName);
+    const password = entry.getPassword();
+    if (!password) {
+      throw new Error("No password found in keyring for user: " + profile.userName);
+    }
+    const params = new URLSearchParams({
+      grant_type: "password",
+      client_id: "kong-web",
+      username: profile.userName,
+      password
+    });
+    const response = await axios_default.post(url2, params, {
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      }
+    });
+    cached.headers["Authorization"] = `Bearer ${response.data.access_token}`;
+    return cached;
   };
-  return async () => await provideRequestConfig(profile, cached);
 }
 
 // packages/kong-cli/src/services/managementClient.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devkong/cli",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "type": "commonjs",
   "main": "./index.js",
   "typings": "./index.d.ts",

package/packages/kong-cli/src/services/api.d.ts

@@ -1,5 +1,4 @@
 import { AxiosRequestConfig } from "axios";
 import { Profile } from "../common/profile";
 export type RequestConfigProvider = () => Promise<AxiosRequestConfig>;
-export declare function provideRequestConfig(profile: Profile, cachedConfig: AxiosRequestConfig): Promise<AxiosRequestConfig>;
-export declare function requestConfigProvider(profile: Profile): () => Promise<AxiosRequestConfig>;
+export declare function requestConfigProvider(profile: Profile): RequestConfigProvider;