@adinsure-ops/ops-cli 5.0.3 → 5.0.4

package/CHANGELOGS.md

@@ -1,5 +1,9 @@
 # Changelogs
 
+## 5.0.4: 2023-09-27
+
+- Fixed version command's post request, where the headers were actually stored in the body
+
 ## 5.0.3: 2023-09-25
 
 - Updated node engine support to also include 20.x and deprecated the use of 14.x

package/README.md

@@ -36,7 +36,7 @@ You can run and debug commands directly from terminal by running `ops [command]`
 - [`ops download:signalr <flags>`](#ops-downloadsignalr-flags)
 - [`ops download:studio <flags>`](#ops-downloadstudio-flags)
 - [`ops download:keycloak-scim <flags>`](#ops-downloadkeycloak-scim-flags)
-- [`ops download:jmeter-examples <flags>`](#ops-downloadstudio-flags)
+- [`ops download:jmeter <flags>`](#ops-downloadstudio-flags)
 - [`ops gitlab:get-tag-pipeline`](#ops-gitlabget-tag-pipeline)
 - [`ops gitlab:next-nightly-tag`](#ops-gitlabnext-nightly-tag)
 - [`ops log <issue> -t <type> -c [component]`](#ops-log-issue-t-type-c-component)
@@ -222,19 +222,19 @@ EXAMPLES
   $ ops download:keycloak-scim -v 3.0.0 
 ```
 
-## `ops download:jmeter-examples <flags>`
+## `ops download:jmeter <flags>`
 
 Download the Jmeter examples zip
 
 ```txt
 USAGE
-  $ ops download:jmeter-examples <flags>
+  $ ops download:jmeter <flags>
 
 OPTIONS
   -o, --output=output    [default: ./] output directory.
 
 EXAMPLES
-  $ ops download:jmeter-examples -o ~/Downloads
+  $ ops download:jmeter -o ~/Downloads
 ```
 
 ## `ops gitlab:get-tag-pipeline`
@@ -404,13 +404,16 @@ USAGE
   $ ops login
 
 OPTIONS
-      --servicePrincipal    # authenticate using service principal credentials.
-  -c, --clientId            # (application) client id.
-  -s, --secret              # client secret.
+  --deviceFlow            authenticate using device flow
+  --force                 Force a change of login token
+  --npm                   register also for npm
+  --skipCI=<value>        Skip login if environment variables is set
 
 EXAMPLES
   $ ops login
-  $ ops login --servicePrincipal -c {client id} -s {secret}
+  $ ops login --npm
+  $ ops login --skipCi CI
+  $ ops login --deviceFlow
 ```
 
 ## `ops npm:check-publish`

package/lib/commands/download/jmeter.js

@@ -59,9 +59,9 @@ class DownloadJmeter extends CommandBase {
     }
 }
 DownloadJmeter.description = 'download jmeter examples from Azure storage';
-DownloadJmeter.usage = 'download:jmeter-examples <flags>';
+DownloadJmeter.usage = 'download:jmeter <flags>';
 DownloadJmeter.examples = [
-    `$ ops download:jmeter-examples -o ~/Downloads`,
+    `$ ops download:jmeter -o ~/Downloads`,
 ];
 DownloadJmeter.flags = {
     output: Flags.string({

package/lib/commands/login.d.ts

@@ -4,10 +4,7 @@ export default class Login extends CommandBase<typeof Login> {
     static usage: string;
     static examples: string[];
     static flags: {
-        servicePrincipal: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         deviceFlow: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        clientId: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        secret: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         npm: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         skipCI: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         force: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;

package/lib/commands/login.js

@@ -75,9 +75,6 @@ class Login extends CommandBase {
                     this.error(error);
                 }
             }
-            else if (flags.servicePrincipal || flags.clientId || flags.secret) {
-                this.warn(`${chalk.red('[DEPRECATED] --servicePrincipal parameter is deprecated. To use with service principal, please set environment variables AZURE_CLIENT_ID and AZURE_CLIENT_SECRET! Login is not required!')}`);
-            }
             else {
                 this.log(`${chalk.yellow('Note: We have launched a browser for you to login.')}`);
                 const loginUrl = yield this.security.getLoginUrl();
@@ -125,24 +122,10 @@ Login.examples = [
     `$ ops login --deviceFlow`,
 ];
 Login.flags = {
-    servicePrincipal: Flags.boolean({
-        description: 'authenticate using service principal credentials',
-        default: false,
-    }),
     deviceFlow: Flags.boolean({
         description: 'authenticate using device flow',
         default: false,
     }),
-    clientId: Flags.string({
-        char: 'c',
-        env: 'AZURE_CLIENT_ID',
-        description: '[DEPRECATED] (application) client id',
-    }),
-    secret: Flags.string({
-        char: 's',
-        env: 'AZURE_CLIENT_SECRET',
-        description: '[DEPRECATED] client secret',
-    }),
     npm: Flags.boolean({
         description: 'register also for npm',
         default: false,

package/lib/commands/version.js

@@ -75,15 +75,15 @@ class Version extends CommandBase {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     validateOptions(args, flags) {
         if (args.type !== 'new' && flags.version) {
-            this.error(`${chalk.red('Version flag can only be used with new type')}`);
+            this.error(`${chalk.red('Version flag can only be used with new type')}`, { exit: 2 });
             return false;
         }
         if (args.type === 'new' && !flags.version) {
-            this.error(`${chalk.red('Version flag is required with new type')}`);
+            this.error(`${chalk.red('Version flag is required with new type')}`, { exit: 2 });
             return false;
         }
         if (args.type === 'new' && flags.increment) {
-            this.error(`${chalk.red('Increment flag not supported with new type')}`);
+            this.error(`${chalk.red('Increment flag not supported with new type')}`, { exit: 2 });
             return false;
         }
         return true;
@@ -113,15 +113,11 @@ class Version extends CommandBase {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     insertScriptRequest(token, version, prefix) {
         return __awaiter(this, void 0, void 0, function* () {
-            return axios.post(`https://ops.adinsure.com/api/script`, {
+            return axios.post(`https://ops.adinsure.com/api/script`, { version, prefix }, {
                 headers: {
                     Authorization: 'Bearer ' + token,
                     'Content-Type': 'application/json',
                 },
-                params: {
-                    version,
-                    prefix,
-                },
             });
         });
     }
@@ -132,12 +128,9 @@ class Version extends CommandBase {
                 ux.action.stop(`${chalk.blue('skip')}`);
             }
             else if (token) {
-                try {
-                    yield this.insertScriptRequest(token, version, prefix);
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                }
-                catch (error) {
-                    switch (error.statusCode) {
+                yield this.insertScriptRequest(token, version, prefix)
+                    .catch((error) => {
+                    switch (error.response.status) {
                         case 401: {
                             this.error(`${chalk.red('You don\'t have permissions. If this was intentional command, please contact Operations for permissions, do git reset and rerun command.')}`);
                             break;
@@ -146,7 +139,7 @@ class Version extends CommandBase {
                             this.error(`${chalk.red(error)}`);
                         }
                     }
-                }
+                });
                 ux.action.stop(`${chalk.green('done')}`);
             }
             else {

package/lib/security/context.js

@@ -17,7 +17,6 @@ export default class SecurityContext {
         this.devopsResourceId = '499b84ac-1321-427f-aa17-267ca6975798';
         this.tenant = 'adfintech.onmicrosoft.com';
         this.authorityUrl = `https://login.microsoftonline.com/${this.tenant}/`;
-        // tslint:disable-next-line: no-http-string
         this.redirectUri = 'http://localhost:3044';
         this.resource = 'https://ops.adinsure.com';
         this._verifier = null;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.3",
+  "version": "5.0.4",
   "commands": {
     "doctor": {
       "id": "doctor",
@@ -40,32 +40,12 @@
         "$ ops login --deviceFlow"
       ],
       "flags": {
-        "servicePrincipal": {
-          "name": "servicePrincipal",
-          "type": "boolean",
-          "description": "authenticate using service principal credentials",
-          "allowNo": false
-        },
         "deviceFlow": {
           "name": "deviceFlow",
           "type": "boolean",
           "description": "authenticate using device flow",
           "allowNo": false
         },
-        "clientId": {
-          "name": "clientId",
-          "type": "option",
-          "char": "c",
-          "description": "[DEPRECATED] (application) client id",
-          "multiple": false
-        },
-        "secret": {
-          "name": "secret",
-          "type": "option",
-          "char": "s",
-          "description": "[DEPRECATED] client secret",
-          "multiple": false
-        },
         "npm": {
           "name": "npm",
           "type": "boolean",
@@ -477,13 +457,13 @@
       "id": "download:jmeter",
       "description": "download jmeter examples from Azure storage",
       "strict": true,
-      "usage": "download:jmeter-examples <flags>",
+      "usage": "download:jmeter <flags>",
       "pluginName": "@adinsure-ops/ops-cli",
       "pluginAlias": "@adinsure-ops/ops-cli",
       "pluginType": "core",
       "aliases": [],
       "examples": [
-        "$ ops download:jmeter-examples -o ~/Downloads"
+        "$ ops download:jmeter -o ~/Downloads"
       ],
       "flags": {
         "output": {

package/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.0.3",
+    "version": "5.0.4",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"
     },
     "type": "module",
     "dependencies": {
-        "@azure/msal-node": "^1.14.5",
+        "@azure/msal-node": "^2.1.0",
         "@oclif/core": "^2.11.8",
         "@oclif/plugin-help": "^5.2.17",
         "@oclif/plugin-not-found": "^2.3.37",
@@ -74,7 +74,7 @@
         "@types/node": "^20.5.7"
     },
     "engines": {
-        "node": "^16 || ^18 || ^20"
+        "node": "^18 || ^20"
     },
     "files": [
         "/bin",