@devkong/cli 0.0.67-2 → 0.0.67-3

package/index.js

@@ -86932,9 +86932,7 @@ var KONG_CONFIG_PATH = import_path3.default.join(KONG_CONFIG_DIR, "config");
 function createEmptyProfile() {
   return {
     kongBaseUrl: urlText(""),
-    userName: "",
-    authType: "local",
-    idpHint: "azure"
+    userName: ""
   };
 }
 function loadProfiles() {
@@ -86955,14 +86953,12 @@ function getProfile(name) {
   const availableProfiles = loadProfiles();
   const profile = availableProfiles[name] || createEmptyProfile();
   profile.kongBaseUrl = profile.kongBaseUrl || urlText(optionalEnv("KONG_BASE_URL") || "");
-  profile.authType = profile.authType || "local";
-  profile.idpHint = profile.idpHint || "azure";
   return profile;
 }
 function printProfile(name) {
   const profileData = getProfile(name);
   console.info(
-    `Current profile=${name}, baseUrl=${profileData.kongBaseUrl}, username=${profileData.userName}, authType=${profileData.authType}`
+    `Current profile=${name}, baseUrl=${profileData.kongBaseUrl}, username=${profileData.userName}`
   );
 }
 
@@ -87029,7 +87025,7 @@ function jwtDecode(token, options) {
 // packages/kong-cli/src/services/browserLogin.ts
 var import_node_http = __toESM(require("node:http"));
 var import_url3 = require("url");
-async function loginWithBrowser(kongBaseUrl, verbose = false) {
+async function loginWithBrowser(kongBaseUrl) {
   const state = import_crypto2.default.randomUUID();
   const baseUrl = normalizeBaseUrl(kongBaseUrl);
   return new Promise((resolve2, reject) => {
@@ -87045,9 +87041,6 @@ async function loginWithBrowser(kongBaseUrl, verbose = false) {
       authUrl.searchParams.set("scope", "openid profile email offline_access");
       authUrl.searchParams.set("state", state);
       const authUrlString = authUrl.toString();
-      if (verbose) {
-        console.log(`Redirect URI: ${redirectUri}`);
-      }
       console.log("Signing in with the browser...");
       await openBrowser(authUrlString);
       console.log("If your browser didn't open, click this link to log in:\n");
@@ -87131,9 +87124,6 @@ async function openBrowser(url2) {
 
 // packages/kong-cli/src/commands/configureCommand.ts
 var ConfigureCommand = class {
-  constructor(verbose = false) {
-    this.verbose = verbose;
-  }
   async execute() {
     const availableProfiles = loadProfiles();
     const [name, profile] = await this.selectProfile(availableProfiles);
@@ -87166,7 +87156,7 @@ var ConfigureCommand = class {
       message: `Enter URL for profile "${name}":`,
       default: profile.kongBaseUrl
     });
-    const tokens = await loginWithBrowser(urlText(answerUrl.kongUrl), this.verbose);
+    const tokens = await loginWithBrowser(urlText(answerUrl.kongUrl));
     const tokenUserName = tokens.preferredUsername || tokens.email || profile.userName;
     if (isEmpty(tokenUserName)) {
       throw new Error("Unable to determine domain user name from the token");
@@ -87174,8 +87164,7 @@ var ConfigureCommand = class {
     const updated = {
       ...profile,
       kongBaseUrl: urlText(answerUrl.kongUrl),
-      userName: tokenUserName,
-      authType: "domain"
+      userName: tokenUserName
     };
     const keyringEntry = new import_keyring.Entry(updated.kongBaseUrl, updated.userName);
     keyringEntry.setPassword(
@@ -89279,51 +89268,24 @@ function requestConfigProvider(profile) {
       "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 = buildTokenParams(profile, password);
+    const refreshToken = entry.getPassword();
+    if (!refreshToken) {
+      throw new Error("No refreshToken found in keyring for user: " + profile.userName);
+    }
+    const params = new URLSearchParams({
+      grant_type: "refresh_token",
+      client_id: "kong-web",
+      refresh_token: refreshToken
+    });
     const response = await axios_default.post(url2, params, {
       headers: {
         "Content-Type": "application/x-www-form-urlencoded"
       }
     });
     cached.headers["Authorization"] = `Bearer ${response.data.access_token}`;
-    if (profile.authType === "domain" && response.data.refresh_token) {
-      entry.setPassword(
-        JSON.stringify({
-          mode: "domain",
-          refreshToken: response.data.refresh_token
-        })
-      );
-    }
     return cached;
   };
 }
-function buildTokenParams(profile, secret) {
-  if (profile.authType === "domain") {
-    try {
-      const saved = JSON.parse(secret);
-      if (saved.mode === "domain" && saved.refreshToken) {
-        return new URLSearchParams({
-          grant_type: "refresh_token",
-          client_id: "kong-web",
-          refresh_token: saved.refreshToken
-        });
-      }
-    } catch {
-      throw new Error("Domain login requires refresh token in keyring. Re-run `kong configure`.");
-    }
-    throw new Error("Domain login requires refresh token in keyring. Re-run `kong configure`.");
-  }
-  return new URLSearchParams({
-    grant_type: "password",
-    client_id: "kong-web",
-    username: profile.userName,
-    password: secret
-  });
-}
 
 // packages/kong-cli/src/services/managementClient.ts
 var ManagementClient = class {
@@ -89806,8 +89768,8 @@ async function main() {
       printError("generate command failed", ex);
     }
   });
-  const configureCommand = new Command("configure").description("Configure access to kong environments").addOption(new Option("--verbose", "Show full logs during command execution")).action(async (options) => {
-    await new ConfigureCommand(options.verbose).execute();
+  const configureCommand = new Command("configure").description("Configure access to kong environments").action(async () => {
+    await new ConfigureCommand().execute();
   });
   const installCommand = new Command("install").description("Setup virtual environment and install dependencies").addOption(new Option("--verbose", "Show full logs during command execution")).action(async (options) => {
     try {

package/package.json

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

package/packages/kong-cli/src/commands/configureCommand.d.ts

@@ -1,6 +1,4 @@
 export declare class ConfigureCommand {
-    private readonly verbose;
-    constructor(verbose?: boolean);
     execute(): Promise<void>;
     private selectProfile;
     private configureProfile;

package/packages/kong-cli/src/common/profile.d.ts

@@ -2,8 +2,6 @@ import { UrlText } from "@kong/ts";
 export interface Profile {
     kongBaseUrl: UrlText;
     userName: string;
-    authType?: "local" | "domain";
-    idpHint?: string;
 }
 export type ProfileName = "default" | string;
 export type ProfileMap = Record<ProfileName, Profile>;

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

@@ -5,4 +5,4 @@ export interface DomainLoginTokens {
     preferredUsername?: string;
     email?: string;
 }
-export declare function loginWithBrowser(kongBaseUrl: string, verbose?: boolean): Promise<DomainLoginTokens>;
+export declare function loginWithBrowser(kongBaseUrl: string): Promise<DomainLoginTokens>;