@flowcore/cli 2.0.1 → 2.1.1

package/CHANGELOG.md

@@ -10,6 +10,22 @@
 
 * added description to start that includes week ([58687a7](https://github.com/flowcore-io/flowcore-cli/commit/58687a7bbb66aaa5d6da26af88e555cbb1e72467))
 
+## [2.1.1](https://github.com/flowcore-io/flowcore-cli/compare/v2.1.0...v2.1.1) (2024-02-15)
+
+
+### Bug Fixes
+
+* removed whoami from cli and moved to config plugin, bumped config plugin version ([784ace4](https://github.com/flowcore-io/flowcore-cli/commit/784ace4cfe386f2ead98ccc8bed5d2ec25b01767))
+
+## [2.1.0](https://github.com/flowcore-io/flowcore-cli/compare/v2.0.1...v2.1.0) (2024-02-15)
+
+
+### Features
+
+* added config as a separate plugin ([4098793](https://github.com/flowcore-io/flowcore-cli/commit/40987938a60470b1c8082e813cb96baba089c5b6))
+* removed login from cli, moved to config plugin ([3789e06](https://github.com/flowcore-io/flowcore-cli/commit/3789e06b4938bc1b7429d3133ea8fe1054f7418f))
+* switch login profile automatically when providing a stream url ([8172d2d](https://github.com/flowcore-io/flowcore-cli/commit/8172d2dd765dc44f714a82c4a53f7c6c258000b9))
+
 ## [2.0.1](https://github.com/flowcore-io/flowcore-cli/compare/v2.0.0...v2.0.1) (2024-01-15)
 
 

package/README.md

@@ -3,6 +3,7 @@ Flowcore CLI
 
 Flowcore CLI is a command line interface for interacting with the Flowcore Platform.
 
+[![Version](https://img.shields.io/npm/v/@flowcore/cli-plugin-config)](https://npmjs.org/package/@flowcore/cli-plugin-config)
 [![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
 [![Build and Release](https://github.com/flowcore-io/flowcore-cli/actions/workflows/build.yml/badge.svg)](https://github.com/flowcore-io/flowcore-cli/actions/workflows/build.yml)
 
@@ -17,7 +18,7 @@ $ npm install -g @flowcore/cli
 $ flowcore COMMAND
 running command...
 $ flowcore (--version)
-@flowcore/cli/2.0.1 linux-x64 node-v20.10.0
+@flowcore/cli/2.1.1 linux-x64 node-v20.11.0
 $ flowcore --help [COMMAND]
 USAGE
   $ flowcore COMMAND
@@ -74,7 +75,7 @@ EXAMPLES
   $ flowcore autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.0.3/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v3.0.8/src/commands/autocomplete/index.ts)_
 
 ## `flowcore config set`
 
@@ -82,9 +83,10 @@ Configure the cli
 
 ```
 USAGE
-  $ flowcore config set [--profile <value>] [-c <value>] [-n <value>] [-l <value>] [-p] [-u <value>]
+  $ flowcore config set [--profile <value>] [-b <value>] [-c <value>] [-n <value>] [-l <value>] [-p] [-u <value>]
 
 FLAGS
+  -b, --baseUrl=<value>       base url to the flowcore platform
   -c, --clientId=<value>      client id to use for the login
   -l, --loginUrl=<value>      url to discover the openid configuration
   -n, --clientSecret=<value>  name to print
@@ -103,7 +105,7 @@ EXAMPLES
   $ flowcore config set -l https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration -c my-client-id -p
 ```
 
-_See code: [src/commands/config/set.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/config/set.ts)_
+_See code: [@flowcore/cli-plugin-config](https://github.com/flowcore/flowcore-cli-plugin-config/blob/v1.0.5/src/commands/config/set.ts)_
 
 ## `flowcore config show`
 
@@ -123,7 +125,7 @@ EXAMPLES
   $ flowcore config show
 ```
 
-_See code: [src/commands/config/show.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/config/show.ts)_
+_See code: [@flowcore/cli-plugin-config](https://github.com/flowcore/flowcore-cli-plugin-config/blob/v1.0.5/src/commands/config/show.ts)_
 
 ## `flowcore help [COMMANDS]`
 
@@ -166,7 +168,7 @@ EXAMPLES
   $ flowcore login --port 8080
 ```
 
-_See code: [src/commands/login.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/login.ts)_
+_See code: [@flowcore/cli-plugin-config](https://github.com/flowcore/flowcore-cli-plugin-config/blob/v1.0.5/src/commands/login.ts)_
 
 ## `flowcore plugins`
 
@@ -189,7 +191,7 @@ EXAMPLES
   $ flowcore plugins
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/index.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.2.2/src/commands/plugins/index.ts)_
 
 ## `flowcore plugins:install PLUGIN...`
 
@@ -258,7 +260,7 @@ EXAMPLES
   $ flowcore plugins inspect myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/inspect.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.2.2/src/commands/plugins/inspect.ts)_
 
 ## `flowcore plugins:install PLUGIN...`
 
@@ -302,7 +304,7 @@ EXAMPLES
   $ flowcore plugins install someuser/someplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/install.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.2.2/src/commands/plugins/install.ts)_
 
 ## `flowcore plugins:link PLUGIN`
 
@@ -332,7 +334,7 @@ EXAMPLES
   $ flowcore plugins link myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/link.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.2.2/src/commands/plugins/link.ts)_
 
 ## `flowcore plugins:uninstall PLUGIN...`
 
@@ -366,10 +368,14 @@ Remove all user-installed and linked plugins.
 
 ```
 USAGE
-  $ flowcore plugins reset
+  $ flowcore plugins reset [--hard] [--reinstall]
+
+FLAGS
+  --hard       Delete node_modules and package manager related files in addition to uninstalling plugins.
+  --reinstall  Reinstall all plugins after uninstalling.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/reset.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.2.2/src/commands/plugins/reset.ts)_
 
 ## `flowcore plugins:uninstall PLUGIN...`
 
@@ -397,7 +403,7 @@ EXAMPLES
   $ flowcore plugins uninstall myplugin
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/uninstall.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.2.2/src/commands/plugins/uninstall.ts)_
 
 ## `flowcore plugins:uninstall PLUGIN...`
 
@@ -441,7 +447,7 @@ DESCRIPTION
   Update installed plugins.
 ```
 
-_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.1.10/src/commands/plugins/update.ts)_
+_See code: [@oclif/plugin-plugins](https://github.com/oclif/plugin-plugins/blob/v4.2.2/src/commands/plugins/update.ts)_
 
 ## `flowcore stream STREAM`
 
@@ -479,7 +485,7 @@ EXAMPLES
   $ flowcore stream https://flowcore.io/<org>/<data core>/<flow type>/[<event type1>,<event type2>,<event type3>].stream -o log -s 3m
 ```
 
-_See code: [src/commands/stream.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/stream.ts)_
+_See code: [src/commands/stream.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.1.1/src/commands/stream.ts)_
 
 ## `flowcore version`
 
@@ -499,7 +505,7 @@ FLAG DESCRIPTIONS
     Additionally shows the architecture, node version, operating system, and versions of plugins that the CLI is using.
 ```
 
-_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v2.0.9/src/commands/version.ts)_
+_See code: [@oclif/plugin-version](https://github.com/oclif/plugin-version/blob/v2.0.12/src/commands/version.ts)_
 
 ## `flowcore whoami`
 
@@ -516,5 +522,5 @@ DESCRIPTION
   Check what user you are logged in as
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/whoami.ts)_
+_See code: [@flowcore/cli-plugin-config](https://github.com/flowcore/flowcore-cli-plugin-config/blob/v1.0.5/src/commands/whoami.ts)_
 <!-- commandsstop -->

package/dist/commands/stream.d.ts

@@ -1,4 +1,4 @@
-import { BaseCommand } from "../base-command.js";
+import { BaseCommand } from "@flowcore/cli-plugin-config";
 export default class Stream extends BaseCommand<typeof Stream> {
     static args: {
         STREAM: import("@oclif/core/lib/interfaces/parser.js").Arg<string, Record<string, unknown>>;

package/dist/commands/stream.js

@@ -1,18 +1,17 @@
 import { Queue } from "@datastructures-js/queue";
+import { BaseCommand, LOGIN_CODES, ValidateLogin } from "@flowcore/cli-plugin-config";
 import { Args, Flags, ux } from '@oclif/core';
 import dayjs from "dayjs";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore.js";
 import utc from "dayjs/plugin/utc.js";
 import _ from "lodash";
 import { Subject } from "rxjs";
-import { BaseCommand } from "../base-command.js";
 import { QueryGraphQL } from "../utils/graphql.util.js";
 import { FETCH_DATA_CORE_GQL_QUERY } from "../utils/queries/fetch-data-core.gql.js";
 import { FETCH_EVENT_TYPE_RANGE_GQL_QUERY } from "../utils/queries/fetch-event-type-range.gql.js";
 import { FETCH_EVENTS_GQL_QUERY } from "../utils/queries/fetch-events.gql.js";
 import { FETCH_CATALOG_INDEXES_QUERY } from "../utils/queries/fetch-indexes.gql.js";
 import { TIME_BUCKET_HOUR_PATTERN, TIME_BUCKET_PATTERN, createTimebucket, createTimebucketDayjs } from "../utils/timebucket.util.js";
-import { LOGIN_CODES, ValidateLogin } from "../utils/validate-login.util.js";
 dayjs.extend(utc);
 dayjs.extend(isSameOrBefore);
 export default class Stream extends BaseCommand {
@@ -36,6 +35,15 @@ export default class Stream extends BaseCommand {
         timeout: Flags.integer({ char: 't', default: 5000, description: 'Timeout in milliseconds to wait for a response from the destination' }),
     };
     async run() {
+        const { args, flags } = await this.parse(Stream);
+        const parts = args.STREAM.replace(/https?:\/\//i, "").split("/");
+        if (parts.length !== 5) {
+            ux.error(`Invalid stream url, ${args.STREAM}`);
+        }
+        const newProfile = this.cliConfiguration.switchProfile(args.STREAM);
+        if (newProfile) {
+            ux.log(`Using profile ${ux.colorize("yellow", newProfile)} based on stream url`);
+        }
         const config = this.cliConfiguration.getConfig();
         const loginValidator = new ValidateLogin(config.login.url);
         const validateLogin = await loginValidator.validate(config, this.cliConfiguration, !this.flags.json);
@@ -52,11 +60,6 @@ export default class Stream extends BaseCommand {
             }
             return config.auth.accessToken;
         });
-        const { args, flags } = await this.parse(Stream);
-        const parts = args.STREAM.replace(/https?:\/\//i, "").split("/");
-        if (parts.length !== 5) {
-            ux.error(`Invalid stream url, ${args.STREAM}`);
-        }
         const org = parts[1];
         const dataCore = parts[2];
         const aggregator = parts[3];

package/oclif.manifest.json

@@ -1,46 +1,5 @@
 {
   "commands": {
-    "login": {
-      "aliases": [],
-      "args": {},
-      "description": "login to the Flowcore Platform",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>",
-        "<%= config.bin %> <%= command.id %> --port 8080"
-      ],
-      "flags": {
-        "profile": {
-          "description": "Specify the configuration profile to use",
-          "name": "profile",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "port": {
-          "char": "p",
-          "description": "port to listen for the callback",
-          "name": "port",
-          "default": 3000,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "login",
-      "pluginAlias": "@flowcore/cli",
-      "pluginName": "@flowcore/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "login.js"
-      ]
-    },
     "stream": {
       "aliases": [],
       "args": {
@@ -140,140 +99,7 @@
         "commands",
         "stream.js"
       ]
-    },
-    "whoami": {
-      "aliases": [],
-      "args": {},
-      "description": "Check what user you are logged in as",
-      "flags": {
-        "profile": {
-          "description": "Specify the configuration profile to use",
-          "name": "profile",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "whoami",
-      "pluginAlias": "@flowcore/cli",
-      "pluginName": "@flowcore/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "whoami.js"
-      ]
-    },
-    "config:set": {
-      "aliases": [],
-      "args": {},
-      "description": "Configure the cli",
-      "examples": [
-        "<%= config.bin %> <%= command.id %> -l https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration -c my-client-id -s my-client-secret",
-        "<%= config.bin %> <%= command.id %> -u https://graph.api.flowcore.io/graphql",
-        "<%= config.bin %> <%= command.id %> -l https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration -c my-client-id -p"
-      ],
-      "flags": {
-        "profile": {
-          "description": "Specify the configuration profile to use",
-          "name": "profile",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "clientId": {
-          "char": "c",
-          "description": "client id to use for the login",
-          "name": "clientId",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "clientSecret": {
-          "char": "n",
-          "description": "name to print",
-          "name": "clientSecret",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "loginUrl": {
-          "char": "l",
-          "description": "url to discover the openid configuration",
-          "name": "loginUrl",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "port": {
-          "char": "p",
-          "description": "prompt for port to listen for the callback",
-          "name": "port",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "url": {
-          "char": "u",
-          "description": "url to the flowcore platform api",
-          "name": "url",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "config:set",
-      "pluginAlias": "@flowcore/cli",
-      "pluginName": "@flowcore/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "config",
-        "set.js"
-      ]
-    },
-    "config:show": {
-      "aliases": [],
-      "args": {},
-      "description": "Show the configured login url",
-      "examples": [
-        "<%= config.bin %> <%= command.id %>"
-      ],
-      "flags": {
-        "profile": {
-          "description": "Specify the configuration profile to use",
-          "name": "profile",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "config:show",
-      "pluginAlias": "@flowcore/cli",
-      "pluginName": "@flowcore/cli",
-      "pluginType": "core",
-      "strict": true,
-      "enableJsonFlag": false,
-      "isESM": true,
-      "relativePath": [
-        "dist",
-        "commands",
-        "config",
-        "show.js"
-      ]
     }
   },
-  "version": "2.0.1"
+  "version": "2.1.1"
 }

package/package.json

@@ -5,6 +5,7 @@
   },
   "dependencies": {
     "@datastructures-js/queue": "^4.2.3",
+    "@flowcore/cli-plugin-config": "^1.0.5",
     "@flowcore/time-bucket": "^1.1.0",
     "@oclif/core": "^3",
     "@oclif/plugin-autocomplete": "^3.0.2",
@@ -16,14 +17,11 @@
     "cross-fetch": "^4.0.0",
     "dayjs": "^1.11.10",
     "enquirer": "^2.4.1",
-    "express": "^4.18.2",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
     "jwt-decode": "^4.0.0",
     "lodash": "^4.17.21",
     "merge": "^2.1.1",
-    "open": "^9.1.0",
-    "openid-client": "^5.6.1",
     "rxjs": "^7.8.1",
     "session": "^0.1.0"
   },
@@ -68,7 +66,8 @@
       "@oclif/plugin-version",
       "@oclif/plugin-plugins",
       "@oclif/plugin-autocomplete",
-      "@oclif/plugin-not-found"
+      "@oclif/plugin-not-found",
+      "@flowcore/cli-plugin-config"
     ],
     "topicSeparator": " "
   },
@@ -86,7 +85,7 @@
     "prestart": "npm run build",
     "update-schema": "rover graph introspect https://graph.api.staging.flowcore.io/graphql -o schema.gql"
   },
-  "version": "2.0.1",
+  "version": "2.1.1",
   "bugs": "https://github.com/flowcore-io/flowcore-cli/issues",
   "keywords": [
     "flowcore",

package/dist/base-command.d.ts

@@ -1,17 +0,0 @@
-import { Command, Interfaces } from '@oclif/core';
-import { CliConfiguration } from "./utils/config.util.js";
-export type Flags<T extends typeof Command> = Interfaces.InferredFlags<typeof BaseCommand['baseFlags'] & T['flags']>;
-export type Args<T extends typeof Command> = Interfaces.InferredArgs<T['args']>;
-export declare abstract class BaseCommand<T extends typeof Command> extends Command {
-    static baseFlags: {
-        profile: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
-    };
-    protected args: Args<T>;
-    protected cliConfiguration: CliConfiguration;
-    protected flags: Flags<T>;
-    protected catch(err: Error & {
-        exitCode?: number;
-    }): Promise<unknown>;
-    protected finally(_: Error | undefined): Promise<unknown>;
-    protected init(): Promise<void>;
-}

package/dist/base-command.js

@@ -1,32 +0,0 @@
-// src/baseCommand.ts
-import { Command, Flags } from '@oclif/core';
-import { CliConfiguration } from "./utils/config.util.js";
-export class BaseCommand extends Command {
-    // define flags that can be inherited by any command that extends BaseCommand
-    static baseFlags = {
-        'profile': Flags.string({
-            description: 'Specify the configuration profile to use',
-        }),
-    };
-    args;
-    cliConfiguration = new CliConfiguration();
-    flags;
-    async catch(err) {
-        return super.catch(err);
-    }
-    async finally(_) {
-        return super.finally(_);
-    }
-    async init() {
-        await super.init();
-        const { args, flags } = await this.parse({
-            args: this.ctor.args,
-            baseFlags: super.ctor.baseFlags,
-            flags: this.ctor.flags,
-            strict: this.ctor.strict,
-        });
-        this.cliConfiguration.init(flags.profile || "default", this.config.configDir);
-        this.flags = flags;
-        this.args = args;
-    }
-}

package/dist/commands/config/set.d.ts

@@ -1,13 +0,0 @@
-import { BaseCommand } from "../../base-command.js";
-export default class Set extends BaseCommand<typeof Set> {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        clientId: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        clientSecret: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        loginUrl: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        port: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        url: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-    };
-    run(): Promise<void>;
-}

package/dist/commands/config/set.js

@@ -1,45 +0,0 @@
-import { Flags } from '@oclif/core';
-import pkg from "enquirer";
-import _ from "lodash";
-import { BaseCommand } from "../../base-command.js";
-const { prompt } = pkg;
-export default class Set extends BaseCommand {
-    static description = 'Configure the cli';
-    static examples = [
-        '<%= config.bin %> <%= command.id %> -l https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration -c my-client-id -s my-client-secret',
-        '<%= config.bin %> <%= command.id %> -u https://graph.api.flowcore.io/graphql',
-        '<%= config.bin %> <%= command.id %> -l https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration -c my-client-id -p',
-    ];
-    static flags = {
-        clientId: Flags.string({ char: 'c', description: 'client id to use for the login' }),
-        clientSecret: Flags.string({ char: 'n', description: 'name to print' }),
-        loginUrl: Flags.string({ char: 'l', description: 'url to discover the openid configuration' }),
-        port: Flags.boolean({ char: 'p', description: 'prompt for port to listen for the callback' }),
-        url: Flags.string({ char: 'u', description: 'url to the flowcore platform api' }),
-    };
-    async run() {
-        const { flags } = await this.parse(Set);
-        let callbackPort;
-        if (flags.port) {
-            const port = await prompt([{
-                    choices: ["3000", "4000", "5000", "6000"],
-                    message: "Select a port to listen for the callback",
-                    name: "callbackPort",
-                    type: "select"
-                }]);
-            callbackPort = port.callbackPort;
-        }
-        console.log(flags);
-        this.cliConfiguration.setConfig({
-            ...(flags.url && { api: {
-                    url: flags.url,
-                } }),
-            login: {
-                ...(callbackPort && { callbackPort }),
-                ...(flags.loginUrl && { url: flags.loginUrl }),
-                ..._.omit(flags, ["port", "url", "loginUrl"]),
-            }
-        });
-        this.cliConfiguration.displayConfigTable(this.log.bind(this));
-    }
-}

package/dist/commands/config/show.d.ts

@@ -1,6 +0,0 @@
-import { BaseCommand } from "../../base-command.js";
-export default class LoginShow extends BaseCommand<typeof LoginShow> {
-    static description: string;
-    static examples: string[];
-    run(): Promise<void>;
-}

package/dist/commands/config/show.js

@@ -1,11 +0,0 @@
-import { BaseCommand } from "../../base-command.js";
-export default class LoginShow extends BaseCommand {
-    static description = 'Show the configured login url';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-    ];
-    async run() {
-        this.log(`Showing configuration for ${this.cliConfiguration.getSelectedProfile()}`);
-        this.cliConfiguration.displayConfigTable(this.log.bind(this));
-    }
-}

package/dist/commands/login.d.ts

@@ -1,19 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-import * as http from "node:http";
-import { BaseClient } from "openid-client";
-import { BaseCommand } from "../base-command.js";
-export default class Login extends BaseCommand<typeof Login> {
-    static description: string;
-    static examples: string[];
-    static flags: {
-        port: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-    };
-    protected client: BaseClient | undefined;
-    protected server: http.Server | undefined;
-    protected catch(err: Error & {
-        exitCode?: number;
-    }): Promise<unknown>;
-    protected init(): Promise<void>;
-    run(): Promise<void>;
-    private writeToken;
-}

package/dist/commands/login.js

@@ -1,146 +0,0 @@
-import { Flags } from '@oclif/core';
-import express from 'express';
-import open from "open";
-import { Issuer, generators } from "openid-client";
-import { BaseCommand } from "../base-command.js";
-export default class Login extends BaseCommand {
-    static description = 'login to the Flowcore Platform';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-        '<%= config.bin %> <%= command.id %> --port 8080',
-    ];
-    static flags = {
-        port: Flags.integer({ char: 'p', default: 3000, description: 'port to listen for the callback' }),
-    };
-    client;
-    server;
-    catch(err) {
-        this.server?.close();
-        return super.catch(err);
-    }
-    async init() {
-        await super.init();
-        try {
-            const { login } = this.cliConfiguration.getConfig();
-            const oidcIssuer = await Issuer.discover(login.url);
-            this.client = new oidcIssuer.Client({
-                // eslint-disable-next-line camelcase
-                client_id: login.clientId,
-                // eslint-disable-next-line camelcase
-                ...(login.clientSecret && { client_secret: login.clientSecret }),
-                // eslint-disable-next-line camelcase
-                redirect_uris: [`http://localhost:${login.callbackPort}/callback`],
-                // eslint-disable-next-line camelcase
-                response_types: ['code'],
-                // eslint-disable-next-line camelcase
-                token_endpoint_auth_method: 'none',
-            });
-        }
-        catch (error) {
-            this.error(`Failed to discover the openid configuration: ${error}`);
-        }
-    }
-    async run() {
-        if (!this.client) {
-            this.error("No client configured");
-        }
-        const { login } = this.cliConfiguration.getConfig();
-        const codeVerifier = generators.codeVerifier();
-        const codeChallenge = generators.codeChallenge(codeVerifier);
-        const loginUrl = this.client.authorizationUrl({
-            // eslint-disable-next-line camelcase
-            code_challenge: codeChallenge,
-            // eslint-disable-next-line camelcase
-            code_challenge_method: 'S256',
-            scope: 'openid profile email flowcore_user offline_access',
-        });
-        const app = express();
-        app.get('/callback', async (req, res) => {
-            const params = this.client.callbackParams(req);
-            // eslint-disable-next-line camelcase
-            const tokenSet = await this.client.callback(`http://localhost:${port}/callback`, params, { code_verifier: codeVerifier });
-            if (!tokenSet.claims()) {
-                this.error("No claims in token set");
-            }
-            if (tokenSet.claims()) {
-                this.log(`Logged in as ${tokenSet.claims().preferred_username}`);
-            }
-            this.writeToken(tokenSet);
-            const claims = tokenSet.claims();
-            res.send(`
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="icon" href="https://flowcore.com/favicon.ico" type="image/x-icon" sizes="any">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
-  <title>Login Successful</title>
-  <style>
-    body {
-      font-family: Arial, sans-serif;
-      background-color: #000000;
-      color: #FFFFFF;
-      text-align: center;
-      padding: 50px;
-    }
-    
-    h1 {
-      font-size: 32px;
-      margin-bottom: 20px;
-    }
-    
-    p {
-      font-size: 16px;
-      margin-bottom: 30px;
-    }
-    
-    .success-icon {
-      color: #66bd6a;
-      font-size: 48px;
-      margin-bottom: 20px;
-    }
-    
-    .button {
-      background-color: #ff4ba2;
-      color: #FFFFFF;
-      padding: 10px 20px;
-      font-size: 18px;
-      border: none;
-      border-radius: 4px;
-      cursor: pointer;
-    }
-    
-    .button:hover {
-      background-color: #1976D2;
-    }
-  </style>
-</head>
-<body>
-  <div class="success-icon">
-    <i class="fa fa-check-circle"></i>
-  </div>
-  <h1>Login Successful</h1>
-  <p>Hello ${claims.preferred_username}! You have successfully logged in. You can now close this window.</p>
-  <button class="button" onclick="window.close();">Close Window</button>
-</body>
-</html>
-      `);
-            this.server?.close();
-        });
-        const port = login.callbackPort;
-        await open(loginUrl, { wait: false });
-        this.server = app.listen(port, () => {
-            this.log(`Listening for authentication callback on port ${port}`);
-        });
-    }
-    writeToken(tokenSet) {
-        this.cliConfiguration.setConfig({
-            auth: {
-                accessToken: tokenSet.access_token,
-                idToken: tokenSet.id_token,
-                refreshToken: tokenSet.refresh_token,
-            }
-        });
-    }
-}

package/dist/commands/whoami.d.ts

@@ -1,5 +0,0 @@
-import { BaseCommand } from "../base-command.js";
-export default class Whoami extends BaseCommand<typeof Whoami> {
-    static description: string;
-    run(): Promise<void>;
-}

package/dist/commands/whoami.js

@@ -1,25 +0,0 @@
-import { BaseCommand } from "../base-command.js";
-import { LOGIN_CODES, ValidateLogin } from "../utils/validate-login.util.js";
-export default class Whoami extends BaseCommand {
-    static description = 'Check what user you are logged in as';
-    async run() {
-        const config = this.cliConfiguration.getConfig();
-        const { auth, login } = config;
-        if (!login.url) {
-            this.error("No login url configured");
-        }
-        if (!auth) {
-            this.error("Not logged in");
-        }
-        const validator = new ValidateLogin(login.url);
-        const result = await validator.validate(config, this.cliConfiguration);
-        if (result.status === LOGIN_CODES.LOGIN_SUCCESS) {
-            this.log(`Logged in as ${result.name} (${result.flowcore_user_id})`);
-            return;
-        }
-        if (result.status === LOGIN_CODES.LOGIN_EXPIRED) {
-            this.error("Login expired, please login again");
-        }
-        this.error("Not logged in");
-    }
-}

package/dist/utils/config.util.d.ts

@@ -1,31 +0,0 @@
-export declare const CONFIG_FILE_NAME = "credentials.json";
-export declare class CliConfiguration {
-    private config;
-    private configPath;
-    private selectedProfile;
-    private static generateConfigPath;
-    displayConfigTable(log: (message?: string, ...args: unknown[]) => void): void;
-    getConfig(): CliConfig;
-    getSelectedProfile(): string;
-    init(profile: string, path: string): void;
-    setConfig(newConfig: unknown): void;
-    private ensureConfigIsValid;
-}
-export type CliConfig = {
-    api: {
-        url: string;
-    };
-    auth?: {
-        accessToken: string;
-        idToken?: string;
-        refreshToken?: string;
-    };
-    login: {
-        callbackPort: number;
-        clientId: string;
-        clientSecret?: string;
-        url: string;
-    };
-};
-export declare const createDefaultConfig: (configPath: string) => void;
-export declare const loadConfig: (configPath: string) => CliConfig;

package/dist/utils/config.util.js

@@ -1,108 +0,0 @@
-import { ux } from "@oclif/core";
-import _ from "lodash";
-import { merge, recursive } from "merge";
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { getObjectPaths } from "./object-path.util.js";
-export const CONFIG_FILE_NAME = "credentials.json";
-export class CliConfiguration {
-    config = {};
-    configPath = "";
-    selectedProfile = "";
-    static generateConfigPath(configDir) {
-        return `${configDir}/${CONFIG_FILE_NAME}`;
-    }
-    displayConfigTable(log) {
-        const maskedValues = new Set([
-            "login.clientSecret",
-            "auth.accessToken",
-            "auth.idToken",
-            "auth.refreshToken",
-        ]);
-        const objectPaths = getObjectPaths(this.config);
-        ux.table(objectPaths.map(oMap => maskedValues.has(oMap) ?
-            ({ path: oMap, value: "*******" }) : ({ path: oMap, value: _.get(this.config, oMap) })), {
-            path: {},
-            value: {
-                get: (row) => row.value ?? "not configured",
-                header: 'Value'
-            }
-        }, {
-            printLine: log,
-        });
-    }
-    getConfig() {
-        return this.config;
-    }
-    getSelectedProfile() {
-        return this.selectedProfile;
-    }
-    init(profile, path) {
-        this.configPath = CliConfiguration.generateConfigPath(path);
-        this.selectedProfile = profile;
-        this.ensureConfigIsValid();
-    }
-    setConfig(newConfig) {
-        this.config = recursive(this.config, newConfig);
-        const existingConfig = JSON.parse(fs.readFileSync(this.configPath, "utf8"));
-        fs.writeFileSync(this.configPath, JSON.stringify(recursive(existingConfig, {
-            [this.selectedProfile]: this.config,
-        }), null, 2));
-    }
-    ensureConfigIsValid() {
-        const defaultConfig = {
-            api: {
-                url: "https://graph.api.flowcore.io/graphql",
-            },
-            login: {
-                callbackPort: 3000,
-                clientId: "flowcore-cli",
-                url: "https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration",
-            }
-        };
-        if (!fs.existsSync(path.dirname(this.configPath))) {
-            fs.mkdirSync(path.dirname(this.configPath), { recursive: true });
-        }
-        if (fs.existsSync(this.configPath)) {
-            const existingConfig = JSON.parse(fs.readFileSync(this.configPath, "utf8"));
-            this.config = existingConfig[this.selectedProfile] ? recursive(defaultConfig, existingConfig[this.selectedProfile]) : defaultConfig;
-            fs.writeFileSync(this.configPath, JSON.stringify(recursive(existingConfig, {
-                [this.selectedProfile]: this.config,
-            }), null, 2));
-        }
-        else {
-            this.config = defaultConfig;
-            fs.writeFileSync(this.configPath, JSON.stringify({
-                [this.selectedProfile]: this.config,
-            }, null, 2));
-        }
-    }
-}
-export const createDefaultConfig = (configPath) => {
-    const config = {
-        api: {
-            url: "https://graph.api.flowcore.io/graphql",
-        },
-        login: {
-            callbackPort: 3000,
-            clientId: "flowcoreweb",
-            url: "https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration",
-        }
-    };
-    if (!fs.existsSync(path.dirname(configPath))) {
-        fs.mkdirSync(path.dirname(configPath), { recursive: true });
-    }
-    if (fs.existsSync(configPath)) {
-        const existingConfig = JSON.parse(fs.readFileSync(configPath, "utf8"));
-        fs.writeFileSync(configPath, JSON.stringify(merge(config, existingConfig), null, 2));
-    }
-    else {
-        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
-    }
-};
-export const loadConfig = (configPath) => {
-    if (!fs.existsSync(configPath)) {
-        createDefaultConfig(configPath);
-    }
-    return JSON.parse(fs.readFileSync(configPath, "utf8"));
-};

package/dist/utils/object-path.util.d.ts

@@ -1 +0,0 @@
-export declare function getObjectPaths(obj: unknown, parentKey?: string): string[];

package/dist/utils/object-path.util.js

@@ -1,17 +0,0 @@
-export function getObjectPaths(obj, parentKey) {
-    let paths = [];
-    for (const key in obj) {
-        if (Object.hasOwn(obj, key)) {
-            const path = parentKey ? `${parentKey}.${key}` : key;
-            const value = obj[key];
-            if (typeof value === 'object' && value !== null) {
-                const nestedPaths = getObjectPaths(value, path);
-                paths = [...paths, ...nestedPaths];
-            }
-            else {
-                paths.push(path);
-            }
-        }
-    }
-    return paths;
-}

package/dist/utils/validate-login.util.d.ts

@@ -1,24 +0,0 @@
-import { CliConfig, CliConfiguration } from "./config.util.js";
-export type UserInfo = {
-    family_name: string;
-    flowcore_user_id: string;
-    given_name: string;
-    name: string;
-    preferred_username: string;
-};
-export declare enum LOGIN_CODES {
-    LOGIN_EXPIRED = 2,
-    LOGIN_FAILED = 0,
-    LOGIN_SUCCESS = 1
-}
-export declare class ValidateLogin {
-    private readonly url;
-    constructor(url: string);
-    isExpired(config: CliConfig, client: CliConfiguration, displayProgress?: boolean): Promise<boolean>;
-    tryRefreshToken(config: CliConfig, client: CliConfiguration): Promise<CliConfig>;
-    validate(config: CliConfig, client: CliConfiguration, displayProgress?: boolean): Promise<{
-        status: LOGIN_CODES;
-    } | UserInfo & {
-        status: LOGIN_CODES;
-    }>;
-}

package/dist/utils/validate-login.util.js

@@ -1,115 +0,0 @@
-import { ux } from "@oclif/core";
-import { jwtDecode } from "jwt-decode";
-export var LOGIN_CODES;
-(function (LOGIN_CODES) {
-    LOGIN_CODES[LOGIN_CODES["LOGIN_EXPIRED"] = 2] = "LOGIN_EXPIRED";
-    LOGIN_CODES[LOGIN_CODES["LOGIN_FAILED"] = 0] = "LOGIN_FAILED";
-    LOGIN_CODES[LOGIN_CODES["LOGIN_SUCCESS"] = 1] = "LOGIN_SUCCESS";
-})(LOGIN_CODES || (LOGIN_CODES = {}));
-export class ValidateLogin {
-    url;
-    constructor(url) {
-        this.url = url;
-    }
-    async isExpired(config, client, displayProgress = true) {
-        const decoded = jwtDecode(config.auth?.accessToken ?? "");
-        if (decoded.exp === undefined) {
-            throw new Error("Invalid id token");
-        }
-        if (decoded.exp * 1000 < Date.now() - 5000) {
-            try {
-                if (displayProgress) {
-                    ux.action.start("Refreshing token");
-                }
-                config = await this.tryRefreshToken(config, client);
-                if (displayProgress) {
-                    ux.action.stop("Refreshed token");
-                }
-                return true;
-            }
-            catch (error) {
-                ux.error(`Failed to refresh token: ${error}`);
-            }
-        }
-        return false;
-    }
-    async tryRefreshToken(config, client) {
-        if (config.auth?.refreshToken === undefined) {
-            throw new Error("No refresh token");
-        }
-        const response = await fetch(this.url);
-        const json = await response.json();
-        if (json.token_endpoint === undefined) {
-            throw new Error("No token_endpoint in openid configuration");
-        }
-        const body = new URLSearchParams();
-        body.append("grant_type", "refresh_token");
-        body.append("refresh_token", config.auth.refreshToken);
-        body.append("client_id", config.login.clientId);
-        body.append("client_secret", config.login.clientSecret ?? "");
-        const result = await fetch(json.token_endpoint, {
-            body,
-            method: "POST",
-        });
-        if (result.status !== 200) {
-            throw new Error("Failed to refresh token");
-        }
-        const resultJson = await result.json();
-        client.setConfig({
-            auth: {
-                ...config.auth,
-                accessToken: resultJson.access_token,
-                idToken: resultJson.id_token,
-                refreshToken: resultJson.refresh_token,
-            }
-        });
-        return client.getConfig();
-    }
-    async validate(config, client, displayProgress = true) {
-        const response = await fetch(this.url);
-        const json = await response.json();
-        if (json.userinfo_endpoint === undefined) {
-            throw new Error("No userinfo_endpoint in openid configuration");
-        }
-        if (config.auth === undefined) {
-            return {
-                status: LOGIN_CODES.LOGIN_FAILED,
-            };
-        }
-        if (config.auth.accessToken === undefined) {
-            return {
-                status: LOGIN_CODES.LOGIN_FAILED,
-            };
-        }
-        try {
-            await this.isExpired(config, client, displayProgress);
-        }
-        catch {
-            return {
-                status: LOGIN_CODES.LOGIN_EXPIRED,
-            };
-        }
-        try {
-            const result = await fetch(json.userinfo_endpoint, {
-                headers: {
-                    "Authorization": `Bearer ${config?.auth?.accessToken}`,
-                }
-            });
-            if (result.status !== 200) {
-                return {
-                    status: LOGIN_CODES.LOGIN_FAILED,
-                };
-            }
-            return {
-                ...await result.json(),
-                status: LOGIN_CODES.LOGIN_SUCCESS,
-            };
-        }
-        catch (error) {
-            console.error(error);
-            return {
-                status: LOGIN_CODES.LOGIN_FAILED,
-            };
-        }
-    }
-}