@adinsure-ops/ops-cli 5.1.1 → 5.1.2

package/CHANGELOGS.md

@@ -1,8 +1,14 @@
 # Changelogs
 
+## 5.1.2: 2024-07-04
+
+- LJADIRD-43932: updated all core (oclif) and non-core dependencies
+- LJADIRDSUP-15178: added acquiring token by refreshToken functionality into security context
+- LJADIRD-47453: updated create-nightly-tag regex to match correct versions and create new tag
+
 ## 5.1.1: 2024-05-13
 
-- LJADIRD-46524: Added more verbose output to the security context when aquiring token
+- LJADIRD-46524: added more verbose output to the security context when aquiring token
 
 ## 5.1.0: 2024-03-29
 

package/bin/dev.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env ts-node
-// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
+// eslint-disable-next-line
 (async () => {
     const oclif = await import('@oclif/core');
     await oclif.execute({ type: 'esm', development: true, dir: import.meta.url });

package/bin/run.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-// eslint-disable-next-line node/shebang
+// eslint-disable-next-line
 import oclif from '@oclif/core';
 
-/* eslint-disable unicorn/prefer-top-level-await */
+/* eslint-disable */
 oclif.run(process.argv.slice(2), import.meta.url)
     .then(oclif.flush)
     .catch(oclif.Errors.handle);

package/lib/command.base.js

@@ -28,8 +28,8 @@ export default class CommandBase extends Command {
             }
         });
     }
-    getVersion(versionFile = 'VERSION', ...filesToCheck) {
-        return __awaiter(this, void 0, void 0, function* () {
+    getVersion() {
+        return __awaiter(this, arguments, void 0, function* (versionFile = 'VERSION', ...filesToCheck) {
             filesToCheck.unshift(versionFile);
             const gitRoot = yield this.getGitRoot();
             for (const file of filesToCheck) {

package/lib/commands/download/studio.js

@@ -39,8 +39,8 @@ class DownloadStudio extends CommandBase {
         });
     }
     findExtensionIfEnabled(studioVersion, enabled) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!enabled) {
                 return false;
             }

package/lib/commands/jira/labels.js

@@ -3,8 +3,8 @@ import { Args, Flags, ux } from '@oclif/core';
 import chalk from 'chalk';
 import CommandBaseJira from '../../command.base.jira.js';
 class JiraLabels extends CommandBaseJira {
-    setLabels(jira, issue, add = [], remove = []) {
-        return __awaiter(this, void 0, void 0, function* () {
+    setLabels(jira_1, issue_1) {
+        return __awaiter(this, arguments, void 0, function* (jira, issue, add = [], remove = []) {
             const labels = [];
             for (const label of add) {
                 const add = {

package/lib/commands/log/generate.js

@@ -79,8 +79,8 @@ class Generate extends CommandBase {
         const _super = Object.create(null, {
             run: { get: () => super.run }
         });
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             _super.run.call(this);
             const { flags } = yield this.parse(Generate);
             const root = path.resolve(process.cwd());

package/lib/commands/login.js

@@ -92,9 +92,7 @@ class Login extends CommandBase {
                     // Then let's acquire an authentication token from AAD
                     try {
                         const queryURL = new url.URL(req.url, 'http://localhost:3044').searchParams;
-                        const name = yield this.security.acquireToken(
-                        // eslint-disable-next-line unicorn/prefer-spread
-                        Object.fromEntries(Array.from(queryURL.entries())));
+                        const name = yield this.security.acquireToken(Object.fromEntries(Array.from(queryURL.entries())));
                         this.log(`Hello ${name}!`);
                         // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     }

package/lib/commands/npm/check-publish.js

@@ -35,14 +35,12 @@ class NpmCheckPublish extends CommandBase {
         return __awaiter(this, void 0, void 0, function* () {
             _super.run.call(this);
             try {
-                // eslint-disable-next-line unicorn/no-await-expression-member
                 const { flags } = (yield this.parse(NpmCheckPublish)).flags;
                 const npmContext = new NpmContext();
                 ux.action.start('Parsing packages to check', undefined, { stdout: true });
                 const packages = yield npmContext.packageList(this, flags.package, flags.exclude);
                 ux.action.stop(`${chalk.green('done')}`);
                 ux.action.start('Getting list of available packages', undefined, { stdout: true });
-                // eslint-disable-next-line unicorn/no-await-expression-member
                 const allPackages = (yield npmContext.getAllNpmPackages(flags.pat)).data;
                 ux.action.stop(`${chalk.green('done')}`);
                 yield this.checkPackagesExists(packages, allPackages, flags.version);

package/lib/commands/npm/dependency-update.js

@@ -16,8 +16,8 @@ class NpmDependencyUpdate extends CommandBase {
      * @param {string[]} filter Regular expressions filter for packages
      * @returns {Prmoise<void>} Void Promise
      */
-    updateDependencies(newVersion, packages, force = false, filter = ['**/*']) {
-        return __awaiter(this, void 0, void 0, function* () {
+    updateDependencies(newVersion_1, packages_1) {
+        return __awaiter(this, arguments, void 0, function* (newVersion, packages, force = false, filter = ['**/*']) {
             // Find all package.json files that are not in node modules
             for (const path of packages) {
                 try {

package/lib/commands/npm/publish.js

@@ -5,9 +5,9 @@ import { spawn } from 'child_process';
 import CommandBase from '../../command.base.js';
 import NpmContext from '../../lib/npm.js';
 class NpmPublish extends CommandBase {
-    publishPackage(pkg, cmd = ['yarn', 'publish']) {
-        var _a, e_1, _b, _c, _d, e_2, _e, _f;
-        return __awaiter(this, void 0, void 0, function* () {
+    publishPackage(pkg_1) {
+        return __awaiter(this, arguments, void 0, function* (pkg, cmd = ['yarn', 'publish']) {
+            var _a, e_1, _b, _c, _d, e_2, _e, _f;
             let sh;
             let args;
             // cross platform compatibility
@@ -56,7 +56,7 @@ class NpmPublish extends CommandBase {
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
-                const exitCode = yield new Promise((resolve, _reject) => {
+                const exitCode = yield new Promise((resolve) => {
                     this.cp.on('close', resolve);
                 });
                 if (exitCode) {
@@ -150,7 +150,6 @@ class NpmPublish extends CommandBase {
                 const packages = yield npmContext.packageList(this, flags.package, flags.exclude);
                 ux.action.stop(`${chalk.green('done')}`);
                 ux.action.start('Getting list of published packages', undefined, { stdout: true });
-                // eslint-disable-next-line unicorn/no-await-expression-member
                 const allPackages = (yield npmContext.getAllNpmPackages(flags.pat)).data;
                 ux.action.stop(`${chalk.green('done')}`);
                 yield this.publishPackages(packages, allPackages, flags.version, flags.retry);

package/lib/commands/nuget/dependency-update.js

@@ -17,8 +17,8 @@ class NuGetDependencyUpdate extends CommandBase {
      * @param {string[]} filter Regular expressions filter for packages
      * @returns {Prmoise<void>} Void Promise
      */
-    updateDependencies(newVersion, packages, filter = '') {
-        return __awaiter(this, void 0, void 0, function* () {
+    updateDependencies(newVersion_1, packages_1) {
+        return __awaiter(this, arguments, void 0, function* (newVersion, packages, filter = '') {
             // Find all package.json files that are not in node modules
             for (const path of packages) {
                 try {

package/lib/commands/prepare-content.js

@@ -142,7 +142,7 @@ class PrepareContent extends CommandBase {
             const m = line.match('^([!#])?(.+?)({.*?})?$');
             const dotfileLine = {
                 prefix: m[1],
-                source: path.join(sourceDirectory, path.normalize(m[2].trim())),
+                source: path.join(sourceDirectory, path.normalize(m[2].trim())), // should it be absolute path?
                 transformData: m[3],
             };
             /*
@@ -264,11 +264,9 @@ class PrepareContent extends CommandBase {
                     });
                 }
             });
-            /* eslint-disable unicorn/no-array-callback-reference */
             const doCopyTransform = copyTransformList.map(t);
             const doModuleTransform = modlueTransformList.map(t);
             const doExclude = excludeList.map(t);
-            /* eslint-enable unicorn/no-array-callback-reference */
             /* Copy first, then transform and finally remove files. This should
                ensure that transformations can overwrite previous copies. Removals
                can still erase transformations though. If needed, we can remove

package/lib/commands/sql.js

@@ -4,7 +4,7 @@ import axios from 'axios';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
-import _ from 'lodash-es';
+import _ from 'lodash';
 import path from 'path';
 import semver from 'semver';
 import CommandBase from '../command.base.js';
@@ -146,8 +146,8 @@ end;`;
         const _super = Object.create(null, {
             run: { get: () => super.run }
         });
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
             _super.run.call(this);
             const { args, flags } = yield this.parse(Sql);
             const fullVersion = (_a = flags.version) !== null && _a !== void 0 ? _a : yield this.getVersion('SQL_SCRIPTS_VERSION', 'PLATFORM_VERSION', 'VERSION');
@@ -244,7 +244,6 @@ end;`;
                 this.log(`Generation script: '${chalk.green(scriptId + '.sql')}'`);
             }
             else {
-                // eslint-disable-next-line unicorn/no-await-expression-member
                 scriptId = (yield this.getScriptId(version.version)).data;
                 this.log(`Got: '${chalk.green(scriptId)}'`);
             }

package/lib/commands/translate.js

@@ -61,8 +61,8 @@ class Translate extends CommandBase {
      * @throws Error message
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    extractFiles(content, destinationDir, xmlFilename = '') {
-        return __awaiter(this, void 0, void 0, function* () {
+    extractFiles(content_1, destinationDir_1) {
+        return __awaiter(this, arguments, void 0, function* (content, destinationDir, xmlFilename = '') {
             const zip = yield JSZip.loadAsync(content);
             for (const fileName of Object.keys(zip.files)) {
                 const buffer = yield zip.files[fileName].async('nodebuffer');

package/lib/commands/version.js

@@ -118,8 +118,8 @@ class Version extends CommandBase {
             });
         });
     }
-    insertScript(token, version, prefix, skip = false) {
-        return __awaiter(this, void 0, void 0, function* () {
+    insertScript(token_1, version_1, prefix_1) {
+        return __awaiter(this, arguments, void 0, function* (token, version, prefix, skip = false) {
             ux.action.start('Inserting new script version', undefined, { stdout: true });
             if (skip) {
                 ux.action.stop(`${chalk.blue('skip')}`);

package/lib/hooks/init/version-override.js

@@ -10,7 +10,7 @@ export const versionOverride = function () {
             catch (error) {
                 this.error(error);
             }
-            // eslint-disable-next-line no-process-exit, unicorn/no-process-exit
+            // eslint-disable-next-line no-process-exit
             return process.exit(0);
         }
     });

package/lib/lib/command.js

@@ -7,9 +7,9 @@ export default class ChildProcessCommand {
      * @return {void}
      */
     runCommand(cmd) {
-        var _a, e_1, _b, _c, _d, e_2, _e, _f;
-        var _g;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, e_1, _b, _c, _d, e_2, _e, _f;
+            var _g;
             let sh;
             let args;
             let cp;
@@ -61,7 +61,7 @@ export default class ChildProcessCommand {
                     }
                     finally { if (e_2) throw e_2.error; }
                 }
-                const exitCode = yield new Promise((resolve, _reject) => {
+                const exitCode = yield new Promise((resolve) => {
                     cp.on('close', resolve);
                 });
                 if (exitCode) {

package/lib/lib/gitlab.js

@@ -14,8 +14,8 @@ export default class GitLab {
      * @param prefix Prefix
      * @returns {semver.SemVer} Version object
      */
-    getLatestVersion(searchVersion, prefix = '') {
-        return __awaiter(this, void 0, void 0, function* () {
+    getLatestVersion(searchVersion_1) {
+        return __awaiter(this, arguments, void 0, function* (searchVersion, prefix = '') {
             const versions = [];
             try {
                 let page = 1;
@@ -32,13 +32,13 @@ export default class GitLab {
                             page,
                         },
                     });
-                    // eslint-disable-next-line unicorn/no-array-for-each, @typescript-eslint/no-explicit-any
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     response.data.forEach((tag) => {
-                        const regex = new RegExp(`${prefix}(v\\d*\\.\\d*\\.\\d*-\\d{4}.*)`);
+                        const regex = new RegExp(`${prefix}v\\d+\\.\\d+\\.\\d+(-\\d{6}\\.\\d+)?$`);
                         let searchTag = tag;
                         const match = tag.name.match(regex);
-                        if (match !== null && match[1]) {
-                            searchTag = match[1];
+                        if (match !== null && match[0]) {
+                            searchTag = match[0].replace(prefix, '');
                         }
                         const customOptions = {
                             includePrerelease: true,

package/lib/lib/npm.js

@@ -33,8 +33,8 @@ export default class NpmContext {
      * Get package names
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    packageList(context, packages = ['**/*'], excludes = ['']) {
-        return __awaiter(this, void 0, void 0, function* () {
+    packageList(context_1) {
+        return __awaiter(this, arguments, void 0, function* (context, packages = ['**/*'], excludes = ['']) {
             try {
                 const workspaces = yield this.getWorkspaces();
                 let searchPattern = ['package.json', '**/package.json', '!**/node_modules'];
@@ -77,8 +77,8 @@ export default class NpmContext {
      * @returns {Promise<string>} Returns all the NPM packages
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    getAllNpmPackages(patToken = '') {
-        return __awaiter(this, void 0, void 0, function* () {
+    getAllNpmPackages() {
+        return __awaiter(this, arguments, void 0, function* (patToken = '') {
             const uri = `https://feeds.dev.azure.com/adacta-fintech/adinsure/_apis/packaging/Feeds/feed/packages?api-version=6.0-preview.1&includeAllVersions=true&protocolType=Npm`;
             return axios.get(uri, {
                 headers: {

package/lib/lib/nuget.js

@@ -7,8 +7,8 @@ export default class NugetContext {
      * @param exclude List of excluded packages
      * @returns {Promise<string>} Array of package names
      */
-    projectList(exclude = []) {
-        return __awaiter(this, void 0, void 0, function* () {
+    projectList() {
+        return __awaiter(this, arguments, void 0, function* (exclude = []) {
             try {
                 const searchPattern = ['**/*.csproj'];
                 for (const exc of exclude) {

package/lib/security/context.d.ts

@@ -33,6 +33,23 @@ export default class SecurityContext {
      * @returns [[Promise<TokenResponse>]]
      */
     getLoginUrl(): Promise<string>;
+    /**
+     * Retrieves the refresh token from the MSAL (Microsoft Authentication Library) token cache.
+     *
+     * @returns {string} The refresh token.
+     *
+     * @example
+     * const refreshToken = getRefreshToken();
+     * console.log(refreshToken);
+     *
+     * @description
+     * The `getRefreshToken` function extracts the refresh token from the serialized token cache
+     * managed by the MSAL library. This function first serializes the token cache, parses it into
+     * a JSON object, and then retrieves the refresh token from the parsed object.
+     *
+     * @throws {Error} If there are issues with parsing the token cache or accessing the refresh token.
+     */
+    getRefreshToken(): string;
     /**
      * Gets the current authentication token.
      * This function will also automatically try to refresh token if expired.

package/lib/security/context.js

@@ -1,5 +1,5 @@
 import { __awaiter } from "tslib";
-import { AuthError, ConfidentialClientApplication, CryptoProvider, PublicClientApplication } from '@azure/msal-node';
+import { AuthError, ConfidentialClientApplication, CryptoProvider, InteractionRequiredAuthError, PublicClientApplication, } from '@azure/msal-node';
 import { reject } from 'lodash-es';
 import path from 'path';
 import LocalCachePlugin from './cache.js';
@@ -47,28 +47,56 @@ export default class SecurityContext {
      * @returns [[Promise<TokenResponse>]]
      */
     getLoginUrl() {
-        return new Promise((resolve, _reject) => {
+        return new Promise((resolve) => {
             // Generate PKCE Codes before starting the authorization flow
-            this._cryptoProvider.generatePkceCodes().then(({ verifier, challenge }) => {
+            this._cryptoProvider
+                .generatePkceCodes()
+                .then(({ verifier, challenge }) => {
                 this._verifier = verifier;
                 this._challenge = challenge;
                 const authCodeUrlParameters = {
-                    scopes: [this.resource + '/.default'],
+                    scopes: [this.resource + '/.default', 'offline_access'],
                     redirectUri: this.redirectUri,
                     codeChallenge: this._challenge,
                     codeChallengeMethod: 'S256',
                 };
                 // Get url to sign user in and consent to scopes needed for applicatio
-                this._pca.getAuthCodeUrl(authCodeUrlParameters).then(url => {
+                this._pca
+                    .getAuthCodeUrl(authCodeUrlParameters)
+                    .then((url) => {
                     resolve(url);
-                }).catch(error => {
+                })
+                    .catch((error) => {
                     reject(JSON.stringify(error));
                 });
-            }).catch(error => {
+            })
+                .catch((error) => {
                 reject(error);
             });
         });
     }
+    /**
+     * Retrieves the refresh token from the MSAL (Microsoft Authentication Library) token cache.
+     *
+     * @returns {string} The refresh token.
+     *
+     * @example
+     * const refreshToken = getRefreshToken();
+     * console.log(refreshToken);
+     *
+     * @description
+     * The `getRefreshToken` function extracts the refresh token from the serialized token cache
+     * managed by the MSAL library. This function first serializes the token cache, parses it into
+     * a JSON object, and then retrieves the refresh token from the parsed object.
+     *
+     * @throws {Error} If there are issues with parsing the token cache or accessing the refresh token.
+     */
+    getRefreshToken() {
+        const tokenCache = this._pca.getTokenCache().serialize();
+        const refreshTokenObject = JSON.parse(tokenCache).RefreshToken;
+        const refreshToken = refreshTokenObject[Object.keys(refreshTokenObject)[0]].secret;
+        return refreshToken;
+    }
     /**
      * Gets the current authentication token.
      * This function will also automatically try to refresh token if expired.
@@ -82,10 +110,12 @@ export default class SecurityContext {
             const cachedAccounts = yield msalTokenCache.getAllAccounts();
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 if (cachedAccounts.length > 0) {
-                    this._pca.acquireTokenSilent({
+                    this._pca
+                        .acquireTokenSilent({
                         account: cachedAccounts[0],
                         scopes: [this.resource + '/.default', 'offline_access'],
-                    }).then(response => {
+                    })
+                        .then((response) => {
                         if (response) {
                             const { accessToken } = response;
                             resolve(accessToken);
@@ -93,11 +123,30 @@ export default class SecurityContext {
                         else {
                             reject(new Error('Error getting token, please call `ops login`.'));
                         }
-                    }).catch(error => {
+                    })
+                        .catch((error) => __awaiter(this, void 0, void 0, function* () {
+                        if (error instanceof InteractionRequiredAuthError) {
+                            try {
+                                const tokenRespone = yield this._pca.acquireTokenByRefreshToken({
+                                    refreshToken: this.getRefreshToken(),
+                                    scopes: [this.resource + '/.default'],
+                                    forceCache: true,
+                                });
+                                if (tokenRespone === null) {
+                                    throw new AuthError('Cannot retrieve user cache and use the refresh token!');
+                                }
+                                resolve(tokenRespone.accessToken);
+                                //eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            }
+                            catch (error) {
+                                reject(new Error(error));
+                            }
+                        }
                         reject(new Error(error));
-                    });
+                    }));
                 }
-                else if (process.env.AZURE_CLIENT_ID && process.env.AZURE_CLIENT_SECRET) {
+                else if (process.env.AZURE_CLIENT_ID &&
+                    process.env.AZURE_CLIENT_SECRET) {
                     const cca = new ConfidentialClientApplication({
                         auth: {
                             clientId: process.env.AZURE_CLIENT_ID,
@@ -114,7 +163,8 @@ export default class SecurityContext {
                         cca.acquireTokenSilent({
                             account: ccaCachedAccounts[0],
                             scopes: [this.resource + '/.default'],
-                        }).then(response => {
+                        })
+                            .then((response) => {
                             if (response) {
                                 const { accessToken } = response;
                                 resolve(accessToken);
@@ -122,22 +172,26 @@ export default class SecurityContext {
                             else {
                                 reject(new Error('Error getting token, please call `ops login`.'));
                             }
-                        }).catch(error => {
+                        })
+                            .catch((error) => {
                             reject(new Error(error));
                         });
                     }
                     else {
                         cca.acquireTokenByClientCredential({
                             scopes: [this.resource + '/.default', 'offline_access'],
-                        }).then(response => {
+                        })
+                            .then((response) => {
                             if (response) {
                                 const { accessToken } = response;
+                                console.log(accessToken);
                                 resolve(accessToken);
                             }
                             else {
                                 reject(new Error('Error getting token, please call `ops login`.'));
                             }
-                        }).catch(error => {
+                        })
+                            .catch((error) => {
                             reject(new Error(error));
                         });
                     }
@@ -155,7 +209,7 @@ export default class SecurityContext {
      * @returns [[Promise<TokenResponse>]]
      */
     acquireToken(query) {
-        return new Promise((resolve, _reject) => {
+        return new Promise((resolve) => {
             if (this._verifier === null) {
                 throw new Error(`PKCE verifier missing.`);
             }
@@ -167,12 +221,15 @@ export default class SecurityContext {
                 codeVerifier: this._verifier,
                 clientInfo: query.client_info,
             };
-            this._pca.acquireTokenByCode(tokenRequest).then(token => {
+            this._pca
+                .acquireTokenByCode(tokenRequest)
+                .then((token) => {
                 var _a;
                 if ((_a = token.account) === null || _a === void 0 ? void 0 : _a.name) {
                     resolve(token.account.name);
                 }
-            }).catch(error => {
+            })
+                .catch((error) => {
                 if (error instanceof AuthError) {
                     const authError = error;
                     console.log(`Error name:  + ${authError.name}`);
@@ -192,7 +249,8 @@ export default class SecurityContext {
      */
     acquireTokenDeviceFlow() {
         return new Promise((resolve, reject) => {
-            this._pca.acquireTokenByDeviceCode({
+            this._pca
+                .acquireTokenByDeviceCode({
                 deviceCodeCallback(response) {
                     if (response.message) {
                         // tslint:disable-next-line: no-console
@@ -200,9 +258,11 @@ export default class SecurityContext {
                     }
                 },
                 scopes: [this.resource + '/.default', 'offline_access'],
-            }).then(_response => {
+            })
+                .then(() => {
                 resolve();
-            }).catch(error => {
+            })
+                .catch((error) => {
                 reject(error);
             });
         });
@@ -218,17 +278,23 @@ export default class SecurityContext {
             const cachedAccounts = yield msalTokenCache.getAllAccounts();
             return new Promise((resolve, reject) => {
                 if (cachedAccounts.length > 0) {
-                    this._pca.acquireTokenSilent({
+                    this._pca
+                        .acquireTokenSilent({
                         account: cachedAccounts[0],
-                        scopes: [this.devopsResourceId + '/.default', 'offline_access'],
-                    }).then(response => {
+                        scopes: [
+                            this.devopsResourceId + '/.default',
+                            'offline_access',
+                        ],
+                    })
+                        .then((response) => {
                         if (response) {
                             resolve(response.accessToken);
                         }
                         else {
                             reject(new Error('Error getting token, please call `ops login`.'));
                         }
-                    }).catch(error => {
+                    })
+                        .catch((error) => {
                         reject(new Error(error));
                     });
                 }