@hahnpro/flow-cli 2.14.2-6 → 2.15.0

package/lib/auth.mjs

@@ -43,8 +43,12 @@ export async function getAccessToken(baseUrl = BASE_URL, realm = REALM) {
       ? new Promise(async (resolve, reject) => {
           try {
             const kcIssuer = await openidClient.Issuer.discover(`${baseUrl}/auth/realms/${realm}/`);
-            const client = new kcIssuer.Client({ client_id: CLIENT_ID, client_secret: CLIENT_SECRET });
-            const tokenSet = await client.grant({ grant_type: 'client_credentials' });
+            const client = new kcIssuer.Client({
+              client_id: CLIENT_ID,
+              client_secret: CLIENT_SECRET,
+              token_endpoint_auth_method: 'client_secret_jwt',
+            });
+            tokenSet = await client.grant({ grant_type: 'client_credentials' });
 
             nconf.set(baseUrl.replace(/:/g, ''), tokenSet);
             nconf.save((error) => {
@@ -85,6 +89,7 @@ export function login(baseUrl = BASE_URL, realm = REALM) {
     const auhtUrl = client.authorizationUrl({ code_challenge, code_challenge_method: 'S256' });
 
     const app = express();
+    app.disable('x-powered-by');
     app.use(express.static(viewsPath));
     app.set('views', viewsPath);
 
@@ -142,6 +147,6 @@ function checkEnvironment(values) {
     }
   }
   if (missing) {
-    throw new Error('Missing environment varialbes');
+    throw new Error('Missing environment variables');
   }
 }

package/lib/cli.mjs

@@ -15,6 +15,7 @@ import fs from 'node:fs';
 import { createRequire } from 'node:module';
 import path from 'node:path';
 import ora from 'ora';
+import { fileURLToPath } from 'node:url';
 
 import { getAccessToken, login, logout } from './auth.mjs';
 import { handleApiError, handleConvertedOutput, logger, prepareTsFile } from './utils.mjs';
@@ -23,6 +24,9 @@ const require = createRequire(import.meta.url);
 const BASE_URL = process.env.BASE_URL || process.env.PLATFORM_URL;
 const BUILD_DIR = process.env.BUILD_DIR || 'dist';
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 let axios = Axios;
 if (process.env.https_proxy || process.env.http_proxy) {
   const httpsAgent = HttpsProxyAgent(process.env.https_proxy || process.env.http_proxy);
@@ -32,6 +36,8 @@ if (process.env.https_proxy || process.env.http_proxy) {
 let apiToken;
 let projectsRoot = 'modules';
 
+const packageJson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'package.json')));
+
 const CMD = {
   AUDIT: 'audit',
   BUILD: 'build',
@@ -46,7 +52,7 @@ const CMD = {
 const program = new Command();
 
 program
-  .version('2.13.0', '-v, --version')
+  .version(packageJson.version, '-v, --version')
   .usage('[command] [options]')
   .description('Flow Module Management Tool')
   .on('--help', () => {});
@@ -112,11 +118,7 @@ program
   .description('Lint project files')
   .action(async (projectName) => {
     try {
-      let project;
-      if (projectName === 'all') {
-        project = { location: '.' };
-      }
-      project = await findProject(projectName);
+      const project = await findProject(projectName);
       await exec(CMD.LINT, project);
     } catch (error) {
       if (error) logger.log(error);
@@ -124,10 +126,11 @@ program
     }
   });
 
+// if BASE_URL is not given and --url is not specified this correctly throws an error
 program
   .command('login')
-  .option('--url <url>', 'URL of target platform')
-  .option('-r, --realm <realm>', 'Auth realm of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
+  .requiredOption('-r, --realm <realm>', 'Auth realm of target platform', process.env.REALM)
   .description('Authenticate against platform')
   .action(async (options) => {
     try {
@@ -141,7 +144,7 @@ program
 
 program
   .command('logout')
-  .option('--url <url>', 'URL of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
   .description('Remove authentication data')
   .action(async (options) => {
     try {
@@ -186,8 +189,8 @@ program
 
 program
   .command('publish-module [projectName]')
-  .option('--url <url>', 'URL of target platform')
-  .option('-r, --realm <realm>', 'Auth realm of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
+  .requiredOption('-r, --realm <realm>', 'Auth realm of target platform', process.env.REALM)
   .option('-f, --functions', 'publish flow functions')
   .option('-u, --update', 'update existing flow functions')
   .option('-s, --skip', 'skip modules that already exists with the current version')
@@ -240,8 +243,8 @@ program
 
 program
   .command('publish-functions [projectName]')
-  .option('--url <url>', 'URL of target platform')
-  .option('-r, --realm <realm>', 'Auth realm of target platform')
+  .requiredOption('--url <url>', 'URL of target platform', process.env.BASE_URL)
+  .requiredOption('-r, --realm <realm>', 'Auth realm of target platform', process.env.REALM)
   .option('-u, --update', 'update existing flow functions')
   .description('Publishes all Flow Functions inside specified Module to Cloud Platform')
   .action(async (projectName, options) => {
@@ -530,6 +533,8 @@ async function publishModule(project, baseUrl = BASE_URL) {
           ...form.getHeaders(),
           Authorization: `Bearer ${apiToken}`,
         },
+        maxBodyLength: Number.POSITIVE_INFINITY,
+        maxContentLength: Number.POSITIVE_INFINITY,
       });
 
       logger.ok(`Module "${project.name}" published!`);
@@ -623,9 +628,9 @@ function zipDirectory(source, out) {
   });
 }
 
-function deleteFile(path) {
+function deleteFile(filePath) {
   return new Promise((resolve, reject) => {
-    fs.unlink(path, (error) => {
+    fs.unlink(filePath, (error) => {
       if (error) return reject(error);
       return resolve();
     });
@@ -732,20 +737,20 @@ function checkIfAll(projectName) {
   return false;
 }
 
-function readJson(path) {
+function readJson(filePath) {
   return new Promise((resolve, reject) => {
-    fs.readFile(path, { encoding: 'utf8' }, (error, data) => {
+    fs.readFile(filePath, { encoding: 'utf8' }, (error, data) => {
       if (error) return reject(error);
       try {
         return resolve(JSON.parse(data));
-      } catch (error) {
-        return reject(error);
+      } catch (error_) {
+        return reject(error_);
       }
     });
   });
 }
 
-function writeJson(path, data) {
+function writeJson(filePath, data) {
   return new Promise((resolve, reject) => {
     let dataString;
     try {
@@ -753,7 +758,7 @@ function writeJson(path, data) {
     } catch (error) {
       return reject(error);
     }
-    fs.writeFile(path, dataString, (error) => {
+    fs.writeFile(filePath, dataString, (error) => {
       if (error) return reject(error);
       return resolve();
     });

package/lib/utils.mjs

@@ -10,7 +10,7 @@ const defaultLogger = {
   /* eslint-enable no-console */
 };
 
-export function checkTypes(definedTypes, propertiesSchema, jsonPath, logger = defaultLogger) {
+export function checkTypes(definedTypes, propertiesSchema, jsonPath, logger1 = defaultLogger) {
   const knownTypes = new Set([
     ...definedTypes,
     'string',
@@ -32,7 +32,7 @@ export function checkTypes(definedTypes, propertiesSchema, jsonPath, logger = de
   const properties = propertiesSchema.properties || {};
   for (const property of Object.keys(properties)) {
     if (properties[property].type && !knownTypes.has(properties[property].type)) {
-      logger.error(
+      logger1.error(
         `ERROR: unknown type ${properties[property].type}.
        Please add a schema for this type in ${jsonPath}
        for more info check the documentation`,
@@ -52,12 +52,12 @@ export async function getTypes(filePath) {
   }
 }
 
-export async function handleConvertedOutput(result, jsonPath, json, logger = defaultLogger) {
+export async function handleConvertedOutput(result, jsonPath, json, logger1 = defaultLogger) {
   let schema;
   try {
     schema = JSON.parse(result);
   } catch {
-    logger.error(result);
+    logger1.error(result);
     return json;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hahnpro/flow-cli",
-  "version": "2.14.2-6",
+  "version": "2.15.0",
   "description": "CLI for managing Flow Modules",
   "license": "MIT",
   "type": "module",
@@ -27,38 +27,38 @@
   },
   "dependencies": {
     "archiver": "^5.3.1",
-    "axios": "^0.26.1",
+    "axios": "~0.27.2",
     "chalk": "^5.0.1",
     "class-transformer": "0.5.1",
     "class-validator": "~0.13.2",
-    "class-validator-jsonschema": "^3.1.0",
-    "commander": "^9.2.0",
+    "class-validator-jsonschema": "^3.1.1",
+    "commander": "^9.4.0",
     "copyfiles": "^2.4.1",
-    "dotenv": "^16.0.0",
-    "ejs": "^3.1.7",
+    "dotenv": "^16.0.1",
+    "ejs": "^3.1.8",
     "execa": "^6.1.0",
-    "express": "^4.17.3",
+    "express": "^4.18.1",
     "form-data": "^4.0.0",
     "get-port": "^6.1.2",
-    "glob": "^8.0.1",
+    "glob": "^8.0.3",
     "https-proxy-agent": "^5.0.1",
     "nconf": "^0.12.0",
     "open": "^8.4.0",
-    "openid-client": "^5.1.5",
-    "ora": "^6.1.0",
+    "openid-client": "^5.1.8",
+    "ora": "^6.1.2",
     "reflect-metadata": "^0.1.13",
-    "ts-node": "^10.7.0"
+    "ts-node": "^10.9.1"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",
-    "@types/jest": "^27.4.1",
-    "@types/nconf": "^0.10.2",
-    "@types/node": "^16.11.27",
-    "eslint": "^8.13.0",
-    "eslint-plugin-unicorn": "^42.0.0",
-    "jest": "^27.5.1",
-    "prettier": "^2.6.2",
-    "typescript": "^4.6.3"
+    "@types/jest": "^28.1.6",
+    "@types/nconf": "^0.10.3",
+    "@types/node": "^16.11.45",
+    "eslint": "^8.20.0",
+    "eslint-plugin-unicorn": "^43.0.2",
+    "jest": "^28.1.3",
+    "prettier": "^2.7.1",
+    "typescript": "^4.7.4"
   },
   "engines": {
     "node": "^14.13.1 || >=16.0.0"
@@ -83,6 +83,5 @@
     "format": "prettier --write .",
     "lint": "eslint '**/*.{js,mjs}'",
     "test": "jest"
-  },
-  "readme": "# `@hahnpro/flow-cli`\n\nhttps://github.com/hahnprojects/flow\n\n```shell\nflow-cli --help\nflow-cli [command] --help\n```\n\n# Commands\n\n## `build [projectName]`\n\nBuilds specified Project.\n\n## `install [projectName]`\n\nInstalls the dependencies of the specified Project.\n\n## `format`\n\nFormats all typescript files according to prettier configuration.\n\n## `name [projectName]`\n\nInstalls Dependencies and Builds the specified Project.\n\n## `package [projectName]`\n\nBuilds specified Module and packages it as .zip File for manual upload to the platform.\n\n## `publish-module [projectName]`\n\nPublishes specified Module to Cloud Platform.\n\n- `-f`, `--functions` Publish flow functions.\n- `-u`, `--update` Update existing flow functions.\n\n## `publish-functions [projectName]`\n\nPublishes all Flow Functions inside specified Module to Cloud Platform.\n\n- `-u`, `--update` Update existing flow functions.\n\n## `serve [projectName]`\n\nBuilds and serves your Project. Rebuilding on file changes.\n\n## `start [projectName]`\n\nRuns your project.\n\n## `test [projectName]`\n\nRuns tests for your Project.\n\n## `generate-schemas [projectName]`\n\nGenerates Input, Output and Properties-Schemas for the specified project.\n\n- `--verbose` Output more information about what is being done.\n- `-h`, `--hide` Hide warnings if Input/OutputProperties classes can´t be found.\n  This command generates the schemas and puts them in the `inputStreams` and `outputStreams`\n  fields in the json-files of each Flow-Function. It always assumes the properties defined\n  in the `Input/OutPutProperties` classes are meant for the default input/output streams.\n  If your Function uses different streams you may have to change stream name manually.\n"
+  }
 }

package/lib/config

@@ -1,12 +0,0 @@
-{
-  "https//testing.hahnpro.com": {
-    "access_token": "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJZbmFFenVubVYxWkpQZndQbWpxR1ZqUFdWejZFNjRZRkNCZTZ6bVJPa1hVIn0.eyJleHAiOjE2NDg5MjA4MTMsImlhdCI6MTY0ODkxNjk3MywiYXV0aF90aW1lIjoxNjQ4OTE1MTI2LCJqdGkiOiJiNGYyZTU1Ny04NTc0LTRhZjEtYjhkMC1lM2Q0ZjcyZTZhZWQiLCJpc3MiOiJodHRwczovL3Rlc3RpbmcuaGFobnByby5jb20vYXV0aC9yZWFsbXMvdGVzdGluZyIsImF1ZCI6ImZsb3ctc2VydmljZSIsInN1YiI6IjYyMDcyZjc0LTFhOTUtNDY2Ni1iMzA2LWNmNGM5MmM5OThhZSIsInR5cCI6IkJlYXJlciIsImF6cCI6ImZsb3ctY2xpIiwic2Vzc2lvbl9zdGF0ZSI6ImE3NWI4NGU1LTUzMmEtNDE5Ny1iZTk5LTZjZjNkYzZiYmRiMCIsImFjciI6IjAiLCJyZXNvdXJjZV9hY2Nlc3MiOnsiZmxvdy1zZXJ2aWNlIjp7InJvbGVzIjpbIm1vZHVsZS51cGRhdGUiLCJjIiwiZCIsImFkbWluIiwiZnVuY3Rpb24uY3JlYXRlIiwiZnVuY3Rpb24udXBkYXRlIiwiZmxvdy5jcmVhdGUiLCJtb2R1bGUucmVhZCIsImRlcGxveW1lbnQucmVhZCIsIm1vZHVsZS5jcmVhdGUiLCJkZXBsb3ltZW50LmNyZWF0ZSIsImRlcGxveW1lbnQuZG93bmxvYWQiLCJyIiwiZmxvdy5yZWFkIiwiZmxvdy5kZWxldGUiLCJkZXBsb3ltZW50LnVwZGF0ZSIsInUiLCJmbG93LnVwZGF0ZSIsImZ1bmN0aW9uLnJlYWQiLCJkZXBsb3ltZW50LmRlbGV0ZSIsIm1vZHVsZS5kb3dubG9hZCIsIm1vZHVsZS5kZWxldGUiLCJmdW5jdGlvbi5kZWxldGUiXX19LCJzY29wZSI6Im9wZW5pZCIsInNpZCI6ImE3NWI4NGU1LTUzMmEtNDE5Ny1iZTk5LTZjZjNkYzZiYmRiMCJ9.haTkto9ePP64_0HvN_9GyE-AZwIvtBSHw673-GcNCjnlK0qJN5UhXXch6211bBkHwhR7n0sT8JauN1I9qnamy93OgRDCwpYaZa6XMK0PQY_o5e8wfuF74JfrXQeQGDJcJ_8aBvGv9TsO0yTpbgPyxzADH-u8bKOzO7aCtZbI_1B71KuBJD9Z7qIi4E1Z19ZDDrFWJRyRYYT4-PqhoPONqw1mKCCLnWUzSKZOwiiDCOLXIn-05GyNbLUJenWrcYxQ0oYOYjp2OfCW_RTLiWOcJeEZzsrn2A6otSQz4MAlaD_ANHtQ1FtB9XDqLxTsXOusTHOMgSmS3tSvHeuF8EKXXA",
-    "expires_at": 1648920813,
-    "refresh_expires_in": 0,
-    "token_type": "Bearer",
-    "id_token": "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJZbmFFenVubVYxWkpQZndQbWpxR1ZqUFdWejZFNjRZRkNCZTZ6bVJPa1hVIn0.eyJleHAiOjE2NDg5MjA4MTMsImlhdCI6MTY0ODkxNjk3MywiYXV0aF90aW1lIjoxNjQ4OTE1MTI2LCJqdGkiOiI2ZWMwYTE5YS02N2E5LTRjYTQtYWUzNy1kODdiZmU1MjJlNGEiLCJpc3MiOiJodHRwczovL3Rlc3RpbmcuaGFobnByby5jb20vYXV0aC9yZWFsbXMvdGVzdGluZyIsImF1ZCI6ImZsb3ctY2xpIiwic3ViIjoiNjIwNzJmNzQtMWE5NS00NjY2LWIzMDYtY2Y0YzkyYzk5OGFlIiwidHlwIjoiSUQiLCJhenAiOiJmbG93LWNsaSIsInNlc3Npb25fc3RhdGUiOiJhNzViODRlNS01MzJhLTQxOTctYmU5OS02Y2YzZGM2YmJkYjAiLCJhdF9oYXNoIjoiN3Q0eHh4a2duRUdCWTFzX29iZ3BodyIsImFjciI6IjAiLCJzaWQiOiJhNzViODRlNS01MzJhLTQxOTctYmU5OS02Y2YzZGM2YmJkYjAifQ.bRuhmb2DUN-WVqFIUShNvSLdpTGkac4DjNVTjuSNgBRjQ6bWKjDYogFshc4Y16_GJ1adxbVHmaU85XIL3-aYmC-vdXHXbHIJ_lKoGw-vqAyKcPysZFdaWj9Gm1KA2ugPOsYVAYAwrNwVWt-9Jv6-UT2HDBe-KyXISJvLXrWpHMdenlnYtFdJo46qKJA8IQGvqupziaJk8b7au34ee_1hKvf0pg_OUMIODM-xDKoIXGcqc1q8dtEViSmaw2qUNryFNSC1GS4xws67vX4bKQm7hoNPbi62pKMbgvKt_Y0XQOI0G52zHxgKAlFjlrUa1xT9qFqMylFJkeT0jMHDGlVkqA",
-    "not-before-policy": 0,
-    "session_state": "a75b84e5-532a-4197-be99-6cf3dc6bbdb0",
-    "scope": "openid"
-  }
-}