@pnp/cli-microsoft365 6.3.0-beta.fee5cdb → 6.4.0-beta.3946b02

package/dist/m365/flow/commands/flow-remove.js

@@ -82,8 +82,8 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
 _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry = function _FlowRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            asAdmin: typeof args.options.asAdmin !== 'undefined',
-            confirm: typeof args.options.confirm !== 'undefined'
+            asAdmin: !!args.options.asAdmin,
+            confirm: !!args.options.confirm
         });
     });
 }, _FlowRemoveCommand_initOptions = function _FlowRemoveCommand_initOptions() {

package/dist/m365/flow/commands/owner/owner-list.js

@@ -0,0 +1,89 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _FlowOwnerListCommand_instances, _FlowOwnerListCommand_initTelemetry, _FlowOwnerListCommand_initOptions, _FlowOwnerListCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
+const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
+const commands_1 = require("../../commands");
+class FlowOwnerListCommand extends AzmgmtCommand_1.default {
+    get name() {
+        return commands_1.default.OWNER_LIST;
+    }
+    get description() {
+        return 'Lists all owners of a Power Automate flow';
+    }
+    defaultProperties() {
+        return ['roleName', 'id', 'type'];
+    }
+    constructor() {
+        super();
+        _FlowOwnerListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowOwnerListCommand_instances, "m", _FlowOwnerListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerListCommand_instances, "m", _FlowOwnerListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowOwnerListCommand_instances, "m", _FlowOwnerListCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Listing owners for flow ${args.options.flowName} in environment ${args.options.environmentName}`);
+                }
+                const response = yield odata_1.odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
+                    logger.log(response);
+                }
+                else {
+                    //converted to text friendly output
+                    logger.log(response.map(res => ({
+                        roleName: res.properties.roleName,
+                        id: res.properties.principal.id,
+                        type: res.properties.principal.type
+                    })));
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_FlowOwnerListCommand_instances = new WeakSet(), _FlowOwnerListCommand_initTelemetry = function _FlowOwnerListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _FlowOwnerListCommand_initOptions = function _FlowOwnerListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-f, --flowName <flowName>'
+    }, {
+        option: '--asAdmin'
+    });
+}, _FlowOwnerListCommand_initValidators = function _FlowOwnerListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID.`;
+        }
+        return true;
+    }));
+};
+module.exports = new FlowOwnerListCommand();
+//# sourceMappingURL=owner-list.js.map

package/dist/m365/flow/commands/run/run-cancel.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _FlowRunCancelCommand_instances, _FlowRunCancelCommand_initOptions, _FlowRunCancelCommand_initValidators;
+var _FlowRunCancelCommand_instances, _FlowRunCancelCommand_initTelemetry, _FlowRunCancelCommand_initOptions, _FlowRunCancelCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -31,6 +31,7 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
     constructor() {
         super();
         _FlowRunCancelCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowRunCancelCommand_instances, "m", _FlowRunCancelCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowRunCancelCommand_instances, "m", _FlowRunCancelCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _FlowRunCancelCommand_instances, "m", _FlowRunCancelCommand_initValidators).call(this);
     }
@@ -71,7 +72,13 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
         });
     }
 }
-_FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initOptions = function _FlowRunCancelCommand_initOptions() {
+_FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initTelemetry = function _FlowRunCancelCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _FlowRunCancelCommand_initOptions = function _FlowRunCancelCommand_initOptions() {
     this.options.unshift({
         option: '-n, --name <name>'
     }, {

package/dist/m365/flow/commands.js

@@ -11,6 +11,7 @@ exports.default = {
     EXPORT: `${prefix} export`,
     GET: `${prefix} get`,
     LIST: `${prefix} list`,
+    OWNER_LIST: `${prefix} owner list`,
     REMOVE: `${prefix} remove`,
     RUN_CANCEL: `${prefix} run cancel`,
     RUN_GET: `${prefix} run get`,

package/dist/m365/pp/commands/environment/environment-get.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpEnvironmentGetCommand_instances, _PpEnvironmentGetCommand_initTelemetry, _PpEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const odata_1 = require("../../../../utils/odata");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 class PpEnvironmentGetCommand extends PowerPlatformCommand_1.default {
     get name() {
         return commands_1.default.ENVIRONMENT_GET;
@@ -36,16 +37,24 @@ class PpEnvironmentGetCommand extends PowerPlatformCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments`;
-            if (args.options.asAdmin) {
-                url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments`;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving environment: ${args.options.name || 'default'}`);
             }
-            const res = yield odata_1.odata.getAllItems(`${url}?api-version=2020-10-01`);
-            const environmentItem = res.filter((env) => args.options.name ? env.name === args.options.name : env.properties.isDefault === true)[0];
-            if (!environmentItem) {
-                throw `The specified Power Platform environment does not exist`;
+            let url = `${this.resource}/providers/Microsoft.BusinessAppPlatform`;
+            if (args.options.asAdmin) {
+                url += '/scopes/admin';
             }
-            logger.log(environmentItem);
+            const envName = args.options.name ? formatting_1.formatting.encodeQueryParameter(args.options.name) : '~Default';
+            url += `/environments/${envName}?api-version=2020-10-01`;
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            logger.log(response);
         });
     }
 }

package/dist/m365/spo/commands/file/file-move.js

@@ -82,7 +82,6 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                     responseType: 'json'
                 };
                 const jobInfo = yield request_1.default.post(requestOptions);
-                this.dots = '';
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 1800; // 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
@@ -94,7 +93,6 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                             resolve,
                             reject,
                             logger,
-                            dots: this.dots,
                             debug: this.debug,
                             verbose: this.verbose
                         });

package/dist/m365/spo/commands/folder/folder-copy.js

@@ -64,7 +64,6 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
             };
             try {
                 const jobInfo = yield request_1.default.post(requestOptions);
-                this.dots = '';
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
@@ -76,7 +75,6 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
                             resolve,
                             reject,
                             logger,
-                            dots: this.dots,
                             debug: this.debug,
                             verbose: this.verbose
                         });

package/dist/m365/spo/commands/folder/folder-move.js

@@ -65,7 +65,6 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
             };
             try {
                 const jobInfo = yield request_1.default.post(requestOptions);
-                this.dots = '';
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
@@ -77,7 +76,6 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
                             resolve,
                             reject,
                             logger,
-                            dots: this.dots,
                             debug: this.debug,
                             verbose: this.verbose
                         });

package/dist/m365/spo/commands/site/site-add.js

@@ -166,7 +166,6 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     }
     createClassicSite(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dots = '';
             try {
                 this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
@@ -228,7 +227,6 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                                 reject,
                                 logger,
                                 currentContext: this.context,
-                                dots: this.dots,
                                 verbose: this.verbose,
                                 debug: this.debug
                             });
@@ -362,7 +360,6 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                             reject,
                             logger,
                             currentContext: this.context,
-                            dots: this.dots,
                             verbose: this.verbose,
                             debug: this.debug
                         });

package/dist/m365/spo/commands/site/site-remove.js

@@ -43,7 +43,6 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    this.dots = '';
                     if (args.options.fromRecycleBin) {
                         yield this.deleteSiteWithoutGroup(logger, args);
                     }
@@ -203,7 +202,6 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                             reject,
                             logger,
                             currentContext: this.context,
-                            dots: this.dots,
                             debug: this.debug,
                             verbose: this.verbose
                         });
@@ -248,7 +246,6 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                             reject,
                             logger,
                             currentContext: this.context,
-                            dots: this.dots,
                             debug: this.debug,
                             verbose: this.verbose
                         });

package/dist/m365/spo/commands/site/site-set.js

@@ -46,7 +46,6 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.dots = '';
                 this.tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
                 this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
@@ -128,7 +127,6 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                         reject,
                         logger,
                         currentContext: this.context,
-                        dots: this.dots,
                         debug: this.debug,
                         verbose: this.verbose
                     });

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -74,7 +74,6 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                                     reject,
                                     logger,
                                     currentContext: this.context,
-                                    dots: this.dots,
                                     debug: this.debug,
                                     verbose: this.verbose
                                 });

package/dist/m365/spo/commands/term/term-get.js

@@ -22,6 +22,7 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const os = require("os");
 class SpoTermGetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.TERM_GET;
@@ -50,32 +51,34 @@ class SpoTermGetCommand extends SpoCommand_1.default {
                     data = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="6" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="7" ParentId="6" Name="GetDefaultSiteCollectionTermStore" /><Method Id="13" ParentId="7" Name="GetTerm"><Parameters><Parameter Type="Guid">{${args.options.id}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
                 }
                 else {
-                    const termGroupQuery = args.options.termGroupId ? `<Method Id="98" ParentId="96" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="98" ParentId="96" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
-                    const termSetQuery = args.options.termSetId ? `<Method Id="103" ParentId="101" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="103" ParentId="101" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
-                    data = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="91" ObjectPathId="90" /><ObjectIdentityQuery Id="92" ObjectPathId="90" /><ObjectPath Id="94" ObjectPathId="93" /><ObjectIdentityQuery Id="95" ObjectPathId="93" /><ObjectPath Id="97" ObjectPathId="96" /><ObjectPath Id="99" ObjectPathId="98" /><ObjectIdentityQuery Id="100" ObjectPathId="98" /><ObjectPath Id="102" ObjectPathId="101" /><ObjectPath Id="104" ObjectPathId="103" /><ObjectIdentityQuery Id="105" ObjectPathId="103" /><ObjectPath Id="107" ObjectPathId="106" /><ObjectPath Id="109" ObjectPathId="108" /><ObjectIdentityQuery Id="110" ObjectPathId="108" /><Query Id="111" ObjectPathId="108"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="90" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="93" ParentId="90" Name="GetDefaultSiteCollectionTermStore" /><Property Id="96" ParentId="93" Name="Groups" />${termGroupQuery}<Property Id="101" ParentId="98" Name="TermSets" />${termSetQuery}<Property Id="106" ParentId="103" Name="Terms" /><Method Id="108" ParentId="106" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+                    data = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectIdentityQuery Id="3" ObjectPathId="1" /><ObjectPath Id="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><ObjectPath Id="8" ObjectPathId="7" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><ObjectPath Id="13" ObjectPathId="12" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectIdentityQuery Id="16" ObjectPathId="14" /><ObjectPath Id="18" ObjectPathId="17" /><SetProperty Id="19" ObjectPathId="17" Name="TrimUnavailable"><Parameter Type="Boolean">true</Parameter></SetProperty><SetProperty Id="20" ObjectPathId="17" Name="TermLabel"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></SetProperty><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><StaticMethod Id="1" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="4" ParentId="1" Name="GetDefaultSiteCollectionTermStore" /><Property Id="7" ParentId="4" Name="Groups" /><Method Id="9" ParentId="7" Name="${args.options.termGroupName === undefined ? "GetById" : "GetByName"}"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName) || args.options.termGroupId}</Parameter></Parameters></Method><Property Id="12" ParentId="9" Name="TermSets" /><Method Id="14" ParentId="12" Name="${args.options.termSetName === undefined ? "GetById" : "GetByName"}"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termSetName) || args.options.termSetId}</Parameter></Parameters></Method><Constructor Id="17" TypeId="{61a1d689-2744-4ea3-a88b-c95bee9803aa}" /><Method Id="21" ParentId="14" Name="GetTerms"><Parameters><Parameter ObjectPathId="17" /></Parameters></Method></ObjectPaths></Request>`;
                 }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    data: data
-                };
-                const processQuery = yield request_1.default.post(requestOptions);
-                const json = JSON.parse(processQuery);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
+                let term;
+                const csomResponse = yield this.executeCsomCall(data, spoAdminUrl, res);
+                if (csomResponse === null) {
+                    throw `Term with id '${args.options.id}' could not be found.`;
                 }
-                const term = json[json.length - 1];
-                if (!term) {
-                    return;
+                else if (csomResponse._Child_Items_ !== undefined) {
+                    const terms = csomResponse;
+                    if (terms._Child_Items_.length === 0) {
+                        throw `Term with name '${args.options.name}' could not be found.`;
+                    }
+                    if (terms._Child_Items_.length > 1) {
+                        const disambiguationText = terms._Child_Items_.map(c => {
+                            return `- ${this.getTermId(c.Id)} - ${c.PathOfTerm}`;
+                        }).join(os.EOL);
+                        throw new Error(`Multiple terms with the specific term name found. Please disambiguate:${os.EOL}${disambiguationText}`);
+                    }
+                    term = terms._Child_Items_[0];
+                }
+                else {
+                    term = csomResponse;
                 }
                 delete term._ObjectIdentity_;
                 delete term._ObjectType_;
-                term.CreatedDate = new Date(Number(term.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                term.Id = term.Id.replace('/Guid(', '').replace(')/', '');
-                term.LastModifiedDate = new Date(Number(term.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                term.CreatedDate = this.parseTermDateToIsoString(term.CreatedDate);
+                term.Id = this.getTermId(term.Id);
+                term.LastModifiedDate = this.parseTermDateToIsoString(term.LastModifiedDate);
                 logger.log(term);
             }
             catch (err) {
@@ -83,6 +86,31 @@ class SpoTermGetCommand extends SpoCommand_1.default {
             }
         });
     }
+    executeCsomCall(data, spoAdminUrl, res) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': res.FormDigestValue
+                },
+                data: data
+            };
+            const processQuery = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(processQuery);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            const responseObject = json[json.length - 1];
+            return responseObject;
+        });
+    }
+    getTermId(termId) {
+        return termId.replace('/Guid(', '').replace(')/', '');
+    }
+    parseTermDateToIsoString(dateAsString) {
+        return new Date(Number(dateAsString.replace('/Date(', '').replace(')/', ''))).toISOString();
+    }
 }
 _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry = function _SpoTermGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -111,39 +139,31 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
     });
 }, _SpoTermGetCommand_initValidators = function _SpoTermGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id) {
-            if (!validation_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.name) {
-            if (!args.options.termGroupId && !args.options.termGroupName) {
-                return 'Specify termGroupId or termGroupName';
-            }
-            if (!args.options.termSetId && !args.options.termSetName) {
-                return 'Specify termSetId or termSetName';
-            }
+        if (args.options.termGroupId && !validation_1.validation.isValidGuid(args.options.termGroupId)) {
+            return `${args.options.termGroupId} is not a valid GUID`;
         }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
-        if (args.options.termGroupId) {
-            if (!validation_1.validation.isValidGuid(args.options.termGroupId)) {
-                return `${args.options.termGroupId} is not a valid GUID`;
-            }
-        }
-        if (args.options.termSetId && args.options.termSetName) {
-            return 'Specify termSetId or termSetName but not both';
-        }
-        if (args.options.termSetId) {
-            if (!validation_1.validation.isValidGuid(args.options.termSetId)) {
-                return `${args.options.termSetId} is not a valid GUID`;
-            }
+        if (args.options.termSetId && !validation_1.validation.isValidGuid(args.options.termSetId)) {
+            return `${args.options.termSetId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({
+        options: ['id', 'name']
+    }, {
+        options: ['termGroupId', 'termGroupName'],
+        runsWhen: (args) => {
+            return args.options.name !== undefined;
+        }
+    }, {
+        options: ['termSetId', 'termSetName'],
+        runsWhen: (args) => {
+            return args.options.name !== undefined;
+        }
+    });
 };
 module.exports = new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

package/dist/m365/teams/commands/team/team-add.js

@@ -44,7 +44,6 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.dots = '';
             let requestBody;
             if (args.options.template) {
                 if (this.verbose) {
@@ -95,7 +94,7 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                     }
                     else {
                         setTimeout(() => {
-                            this.waitUntilFinished(requestOptions, resolve, reject, logger, this.dots);
+                            this.waitUntilFinished(requestOptions, resolve, reject, logger);
                         }, this.pollingInterval);
                     }
                 }));
@@ -113,11 +112,7 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
             }
         });
     }
-    waitUntilFinished(requestOptions, resolve, reject, logger, dots) {
-        if (!this.debug && this.verbose) {
-            dots += '.';
-            process.stdout.write(`\r${dots}`);
-        }
+    waitUntilFinished(requestOptions, resolve, reject, logger) {
         request_1.default
             .get(requestOptions)
             .then((teamsAsyncOperation) => {
@@ -133,7 +128,7 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                 return;
             }
             setTimeout(() => {
-                this.waitUntilFinished(requestOptions, resolve, reject, logger, dots);
+                this.waitUntilFinished(requestOptions, resolve, reject, logger);
             }, this.pollingInterval);
         }).catch(err => reject(err));
     }

package/dist/utils/session.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.session = void 0;
+const crypto = require("crypto");
+const cache_1 = require("./cache");
+exports.session = {
+    getId(pid) {
+        const key = `${pid.toString()}_session`;
+        let sessionId = cache_1.cache.getValue(key);
+        if (sessionId) {
+            return sessionId;
+        }
+        sessionId = crypto.randomBytes(24).toString('base64');
+        cache_1.cache.setValue(key, sessionId);
+        return sessionId;
+    }
+};
+//# sourceMappingURL=session.js.map

package/dist/utils/spo.js

@@ -56,7 +56,7 @@ exports.spo = {
             });
         });
     },
-    waitUntilFinished({ operationId, siteUrl, resolve, reject, logger, currentContext, dots, debug, verbose }) {
+    waitUntilFinished({ operationId, siteUrl, resolve, reject, logger, currentContext, debug, verbose }) {
         exports.spo
             .ensureFormDigest(siteUrl, logger, currentContext, debug)
             .then((res) => {
@@ -64,10 +64,6 @@ exports.spo = {
             if (debug) {
                 logger.logToStderr(`Checking if operation ${operationId} completed...`);
             }
-            if (!debug && verbose) {
-                dots += '.';
-                process.stdout.write(`\r${dots}`);
-            }
             const requestOptions = {
                 url: `${siteUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -101,7 +97,6 @@ exports.spo = {
                         reject,
                         logger,
                         currentContext,
-                        dots,
                         debug,
                         verbose
                     });
@@ -109,7 +104,7 @@ exports.spo = {
             }
         });
     },
-    waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, dots, debug, verbose }) {
+    waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, debug, verbose }) {
         const requestUrl = `${siteUrl}/_api/site/GetCopyJobProgress`;
         const requestOptions = {
             url: requestUrl,
@@ -119,10 +114,6 @@ exports.spo = {
             data: { "copyJobInfo": copyJobInfo },
             responseType: 'json'
         };
-        if (!debug && verbose) {
-            dots += '.';
-            process.stdout.write(`\r${dots}`);
-        }
         request_1.default
             .post(requestOptions)
             .then((resp) => {
@@ -149,7 +140,7 @@ exports.spo = {
             }
             else {
                 setTimeout(() => {
-                    exports.spo.waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, dots, debug, verbose });
+                    exports.spo.waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, debug, verbose });
                 }, pollingInterval);
             }
         });

package/docs/docs/cmd/aad/approleassignment/approleassignment-add.md

@@ -20,10 +20,10 @@ m365 aad approleassignment add [options]
 : Application name of the App Registration to which the configured scopes (app roles) should be applied
 
 `-r, --resource <resource>`
-: Service principal name, appId or objectId that has the scopes (roles) ex. `SharePoint`.
+: Service principal name, appId or objectId that has the scopes (roles) e.g. `SharePoint`.
 
 `-s, --scope <scope>`
-: Permissions known also as scopes and roles to grant the application with. If multiple permissions have to be granted, they have to be comma separated ex. `Sites.Read.All,Sites.ReadWrite.all`
+: Permissions known also as scopes and roles to grant the application with. If multiple permissions have to be granted, they have to be comma-separated e.g. `Sites.Read.All,Sites.ReadWrite.all`
 
 --8<-- "docs/cmd/_global.md"
 
@@ -33,7 +33,7 @@ This command requires tenant administrator permissions.
 
 Specify either the `appId`, `appObjectId` or `appDisplayName` but not multiple. If you specify more than one option value, the command will fail with an error.
 
-Autocomplete values for the `resource` option do not mean allowed values. The autocomplete will just suggest some known names, but that doesn't restrict you to use name of your own custom application or other application within your tenant.
+Autocomplete values for the `resource` option do not mean allowed values. The autocomplete will just suggest some known names, but that doesn't restrict you to use the name of your own custom application or other application within your tenant.
 
 This command can also be used to assign permissions to system or user-assigned managed identity.
 
@@ -45,13 +45,13 @@ Adds SharePoint _Sites.Read.All_ application permissions to Azure AD application
 m365 aad approleassignment add --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "SharePoint" --scope "Sites.Read.All"
 ```
 
-Adds multiple Microsoft Graph application permissions to an Azure AD application with name _MyAppName_
+Adds multiple Microsoft Graph application permissions to an Azure AD application with the name _MyAppName__
 
 ```sh
 m365 aad approleassignment add --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
 ```
 
-Adds Microsoft Graph _Mail.Read_ application permissions to a system managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
+Adds Microsoft Graph _Mail.Read_ application permissions to a system-managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
 m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"