@pnp/cli-microsoft365 7.3.0-beta.d293309 → 7.3.0

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

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowDisableCommand_instances, _FlowDisableCommand_initTelemetry, _FlowDisableCommand_initOptions;
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowDisableCommand extends AzmgmtCommand {
+class FlowDisableCommand extends PowerAutomateCommand {
     get name() {
         return commands.DISABLE;
     }
@@ -26,7 +26,7 @@ class FlowDisableCommand extends AzmgmtCommand {
             await logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/stop?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/stop?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowEnableCommand_instances, _FlowEnableCommand_initTelemetry, _FlowEnableCommand_initOptions;
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowEnableCommand extends AzmgmtCommand {
+class FlowEnableCommand extends PowerAutomateCommand {
     get name() {
         return commands.ENABLE;
     }
@@ -26,7 +26,7 @@ class FlowEnableCommand extends AzmgmtCommand {
             await logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/start?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/start?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -6,9 +6,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowGetCommand_instances, _FlowGetCommand_initTelemetry, _FlowGetCommand_initOptions;
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowGetCommand extends AzmgmtCommand {
+class FlowGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.GET;
     }
@@ -29,7 +29,7 @@ class FlowGetCommand extends AzmgmtCommand {
             await logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -5,9 +5,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
 import { formatting } from '../../../utils/formatting.js';
-import { AzmgmtItemsListCommand } from '../../base/AzmgmtItemsListCommand.js';
+import { odata } from '../../../utils/odata.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowListCommand extends AzmgmtItemsListCommand {
+class FlowListCommand extends PowerAutomateCommand {
     get name() {
         return commands.LIST;
     }
@@ -28,31 +29,32 @@ class FlowListCommand extends AzmgmtItemsListCommand {
     async commandAction(logger, args) {
         try {
             const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
+            let items = [];
             if (sharingStatus === 'personal') {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
                 let url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
                 url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
-                await this.getAllItems(url, logger, false);
+                items = await odata.getAllItems(url);
             }
             else {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions);
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             // Remove duplicates
-            this.items = this.items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
-            if (this.items.length > 0) {
-                this.items.forEach(i => {
+            items = items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
+            if (items.length > 0) {
+                items.forEach(i => {
                     i.displayName = i.properties.displayName;
                 });
-                await logger.log(this.items);
+                await logger.log(items);
             }
             else {
                 if (this.verbose) {
@@ -65,7 +67,7 @@ class FlowListCommand extends AzmgmtItemsListCommand {
         }
     }
     getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
-        let url = `${this.resource}providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
+        let url = `${this.resource}/providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
         if (filter === 'personal') {
             url += `&$filter=search('personal')`;
         }

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

@@ -8,9 +8,9 @@ import { cli } from '../../../cli/cli.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import { validation } from '../../../utils/validation.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
 import commands from '../commands.js';
-class FlowRemoveCommand extends AzmgmtCommand {
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
+class FlowRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.REMOVE;
     }
@@ -30,7 +30,7 @@ class FlowRemoveCommand extends AzmgmtCommand {
         }
         const removeFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                 fullResponse: true,
                 headers: {
                     accept: 'application/json'

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

@@ -9,9 +9,9 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerEnsureCommand extends AzmgmtCommand {
+class FlowOwnerEnsureCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_ENSURE;
     }
@@ -52,7 +52,7 @@ class FlowOwnerEnsureCommand extends AzmgmtCommand {
                 type = 'Group';
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

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

@@ -8,9 +8,9 @@ import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerListCommand extends AzmgmtCommand {
+class FlowOwnerListCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_LIST;
     }
@@ -32,7 +32,7 @@ class FlowOwnerListCommand extends AzmgmtCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Listing owners for flow ${args.options.flowName} in environment ${args.options.environmentName}`);
             }
-            const response = await odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
+            const response = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
             if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(response);
             }

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

@@ -10,9 +10,9 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerRemoveCommand extends AzmgmtCommand {
+class FlowOwnerRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_REMOVE;
     }
@@ -47,7 +47,7 @@ class FlowOwnerRemoveCommand extends AzmgmtCommand {
                     idToRemove = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
                 }
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                    url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },

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

@@ -8,9 +8,9 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunCancelCommand extends AzmgmtCommand {
+class FlowRunCancelCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_CANCEL;
     }
@@ -30,7 +30,7 @@ class FlowRunCancelCommand extends AzmgmtCommand {
         }
         const cancelFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

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

@@ -7,9 +7,9 @@ var _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions, _FlowRunGetCom
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunGetCommand extends AzmgmtCommand {
+class FlowRunGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_GET;
     }
@@ -31,7 +31,7 @@ class FlowRunGetCommand extends AzmgmtCommand {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -5,10 +5,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRunListCommand_instances, _FlowRunListCommand_initTelemetry, _FlowRunListCommand_initOptions, _FlowRunListCommand_initValidators;
 import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import { AzmgmtItemsListCommand } from '../../../base/AzmgmtItemsListCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunListCommand extends AzmgmtItemsListCommand {
+class FlowRunListCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_LIST;
     }
@@ -30,20 +31,20 @@ class FlowRunListCommand extends AzmgmtItemsListCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
         }
-        let url = `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+        let url = `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
         const filters = this.getFilters(args.options);
         if (filters.length > 0) {
             url += `&$filter=${filters.join(' and ')}`;
         }
         try {
-            await this.getAllItems(url, logger, true);
-            if (args.options.output !== 'json' && this.items.length > 0) {
-                this.items.forEach(i => {
+            const items = await odata.getAllItems(url);
+            if (args.options.output !== 'json' && items.length > 0) {
+                items.forEach(i => {
                     i.startTime = i.properties.startTime;
                     i.status = i.properties.status;
                 });
             }
-            await logger.log(this.items);
+            await logger.log(items);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -9,9 +9,9 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
 import commands from '../../commands.js';
-class FlowRunResubmitCommand extends AzmgmtCommand {
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
+class FlowRunResubmitCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_RESUBMIT;
     }
@@ -36,7 +36,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
                     await logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                 }
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
+                    url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -60,7 +60,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
     }
     async getTriggerName(environment, flow) {
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/spo/commands/listitem/listitem-batch-add.js

@@ -35,9 +35,9 @@ class SpoListItemBatchAddCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Starting to create batch items from csv at path ${args.options.filePath}`);
+                await logger.logToStderr(`Starting to create batch items from csv ${args.options.filePath ? `at path ${args.options.filePath}` : 'from content'}`);
             }
-            const csvContent = fs.readFileSync(args.options.filePath, 'utf8');
+            const csvContent = args.options.filePath ? fs.readFileSync(args.options.filePath, 'utf8') : args.options.csvContent;
             const jsonContent = formatting.parseCsvToJson(csvContent);
             await this.addItemsAsBatch(jsonContent, args.options, logger);
         }
@@ -97,7 +97,7 @@ class SpoListItemBatchAddCommand extends SpoCommand {
             batchBody.push(`Accept: application/json;odata=nometadata\n`);
             batchBody.push(`Content-Type: application/json;odata=verbose\n`);
             batchBody.push(`If-Match: *\n\n`);
-            batchBody.push(`{\n"formValues": ${JSON.stringify(item)}\n}`);
+            batchBody.push(`{\n"formValues": ${JSON.stringify(this.formatFormValues(item))}\n}`);
         });
         // close batch body
         batchBody.push(`\n\n`);
@@ -105,6 +105,13 @@ class SpoListItemBatchAddCommand extends SpoCommand {
         batchBody.push(`--batch_${batchId}--\n`);
         return batchBody;
     }
+    formatFormValues(input) {
+        // Fix for PS 7
+        return input.map(obj => ({
+            FieldName: obj.FieldName.replace(/\\"/g, ''),
+            FieldValue: obj.FieldValue.replace(/\\"/g, '')
+        }));
+    }
     parseBatchResponseBody(response) {
         const batchResults = [];
         response.split('\r\n')
@@ -151,6 +158,8 @@ class SpoListItemBatchAddCommand extends SpoCommand {
 _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddCommand_initTelemetry = function _SpoListItemBatchAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            filePath: typeof args.options.filePath !== 'undefined',
+            csvContent: typeof args.options.csvContent !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined'
@@ -158,9 +167,11 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
     });
 }, _SpoListItemBatchAddCommand_initOptions = function _SpoListItemBatchAddCommand_initOptions() {
     this.options.unshift({
-        option: '-p, --filePath <filePath>'
-    }, {
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-p, --filePath [filePath]'
+    }, {
+        option: '-c, --csvContent [csvContent]'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -178,7 +189,7 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
             !validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!fs.existsSync(args.options.filePath)) {
+        if (args.options.filePath && !fs.existsSync(args.options.filePath)) {
             return `File with path ${args.options.filePath} does not exist`;
         }
         return true;
@@ -186,7 +197,7 @@ _SpoListItemBatchAddCommand_instances = new WeakSet(), _SpoListItemBatchAddComma
 }, _SpoListItemBatchAddCommand_initTypes = function _SpoListItemBatchAddCommand_initTypes() {
     this.types.string.push('webUrl', 'filePath', 'listId', 'listTitle', 'listUrl');
 }, _SpoListItemBatchAddCommand_initOptionSets = function _SpoListItemBatchAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['filePath', 'csvContent'] });
 };
 export default new SpoListItemBatchAddCommand();
 //# sourceMappingURL=listitem-batch-add.js.map

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

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddCommand_initOptions, _SpoPageAddCommand_initValidators;
-import { Auth } from '../../../../Auth.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -31,11 +30,9 @@ class SpoPageAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const resource = Auth.getResourceFromUrl(args.options.webUrl);
         let requestDigest = '';
         let itemId = '';
         let pageName = args.options.name;
-        const serverRelativeSiteUrl = urlUtil.getServerRelativeSiteUrl(args.options.webUrl);
         const fileNameWithoutExtension = pageName.replace('.aspx', '');
         let bannerImageUrl = '';
         let canvasContent1 = '';
@@ -52,39 +49,22 @@ class SpoPageAddCommand extends SpoCommand {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
             requestDigest = reqDigest.FormDigestValue;
             let requestOptions = {
-                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${serverRelativeSiteUrl}/sitepages')/files/AddTemplateFile`,
+                url: `${args.options.webUrl}/_api/sitepages/pages`,
+                responseType: 'json',
                 headers: {
-                    'X-RequestDigest': requestDigest,
                     'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 data: {
-                    urlOfFile: `${serverRelativeSiteUrl}/sitepages/${pageName}`,
-                    templateFileType: 3
-                },
-                responseType: 'json'
+                    PageLayoutType: args.options.layoutType || 'Article',
+                    Name: pageName,
+                    PromotedState: args.options.promoteAs === 'NewsPage' ? 2 : 0,
+                    Title: pageTitle
+                }
             };
             const template = await request.post(requestOptions);
             itemId = template.UniqueId;
             const listItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
-            const layoutType = args.options.layoutType || 'Article';
-            const listItemSetOptions = {
-                webUrl: args.options.webUrl,
-                listUrl: listServerRelativeUrl,
-                id: listItemId,
-                systemUpdate: true,
-                ContentTypeId: '0x0101009D1CB255DA76424F860D91F20E6C4118',
-                Title: pageTitle,
-                ClientSideApplicationId: 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec',
-                PageLayoutType: layoutType,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            if (args.options.layoutType === 'Article') {
-                listItemSetOptions.PromotedState = 0;
-                listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
-            }
-            await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
             const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
             if (pageProps) {
                 pageId = pageProps.Id;
@@ -117,7 +97,6 @@ class SpoPageAddCommand extends SpoCommand {
                             listUrl: listServerRelativeUrl,
                             id: listItemId,
                             systemUpdate: true,
-                            PromotedState: 2,
                             FirstPublishedDate: new Date().toISOString(),
                             verbose: this.verbose,
                             debug: this.debug

package/dist/m365/teams/commands/user/user-app-add.js

@@ -3,8 +3,9 @@ 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 _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators;
+var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initTelemetry, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators, _TeamsUserAppAddCommand_initOptionSets;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -18,13 +19,16 @@ class TeamsUserAppAddCommand extends GraphCommand {
     constructor() {
         super();
         _TeamsUserAppAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        const userId = (args.options.userId ?? args.options.userName);
         const endpoint = `${this.resource}/v1.0`;
         const requestOptions = {
-            url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps`,
+            url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 'accept': 'application/json;odata.metadata=none'
@@ -42,22 +46,36 @@ class TeamsUserAppAddCommand extends GraphCommand {
         }
     }
 }
-_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
+_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initTelemetry = function _TeamsUserAppAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
     this.options.unshift({
         option: '--id <id>'
     }, {
-        option: '--userId <userId>'
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (!validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         return true;
     });
+}, _TeamsUserAppAddCommand_initOptionSets = function _TeamsUserAppAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
 };
 export default new TeamsUserAppAddCommand();
 //# sourceMappingURL=user-app-add.js.map

package/dist/utils/aadAdministrativeUnit.js

@@ -1,7 +1,6 @@
-import { odata } from "./odata.js";
-import { formatting } from "./formatting.js";
-import { cli } from "../cli/cli.js";
-const graphResource = 'https://graph.microsoft.com';
+import { odata } from './odata.js';
+import { formatting } from './formatting.js';
+import { cli } from '../cli/cli.js';
 export const aadAdministrativeUnit = {
     /**
      * Get an administrative unit by its display name.
@@ -10,6 +9,7 @@ export const aadAdministrativeUnit = {
      * @throws Error when administrative unit was not found.
      */
     async getAdministrativeUnitByDisplayName(displayName) {
+        const graphResource = 'https://graph.microsoft.com';
         const administrativeUnits = await odata.getAllItems(`${graphResource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
         if (administrativeUnits.length === 0) {
             throw `The specified administrative unit '${displayName}' does not exist.`;

package/dist/utils/aadDevice.js

@@ -0,0 +1,25 @@
+import { odata } from "./odata.js";
+import { formatting } from "./formatting.js";
+import { cli } from "../cli/cli.js";
+const graphResource = 'https://graph.microsoft.com';
+export const aadDevice = {
+    /**
+     * Get a device by its display name.
+     * @param displayName Device display name.
+     * @returns The device.
+     * @throws Error when device was not found.
+     */
+    async getDeviceByDisplayName(displayName) {
+        const devices = await odata.getAllItems(`${graphResource}/v1.0/devices?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
+        if (devices.length === 0) {
+            throw `The specified device '${displayName}' does not exist.`;
+        }
+        if (devices.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', devices);
+            const selectedDevice = await cli.handleMultipleResultsFound(`Multiple devices with name '${displayName}' found.`, resultAsKeyValuePair);
+            return selectedDevice;
+        }
+        return devices[0];
+    }
+};
+//# sourceMappingURL=aadDevice.js.map