@pnp/cli-microsoft365 10.1.0-beta.282b66f → 10.1.0-beta.63210ca

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN016004_TS_property_pane_property_import.js

@@ -40,8 +40,8 @@ export class FN016004_TS_property_pane_property_import extends TsRule {
                 .filter(n => n.getText().indexOf('@microsoft/sp-webpart-base') > 0);
             obj.forEach(n => {
                 const resource = n.getText();
-                const importsText = resource.replace(/\s/g, '').substr(resource.indexOf('{'));
-                const imports = importsText.substr(0, importsText.indexOf('}')).split(',');
+                const importsText = resource.replace(/\s/g, '').substring(resource.indexOf('{'));
+                const imports = importsText.substring(0, importsText.indexOf('}')).split(',');
                 const importsToStay = [];
                 const importsToBeMoved = [];
                 imports.forEach(importName => {

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -929,7 +929,7 @@ class SpfxDoctorCommand extends BaseProjectCommand {
         });
     }
     getNodeVersion() {
-        return process.version.substr(1);
+        return process.version.substring(1);
     }
     async checkStatus(what, versionFound, versionCheck) {
         if (versionFound) {

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

@@ -40,10 +40,10 @@ class SpoContentTypeGetCommand extends SpoCommand {
         }
         requestUrl += "/contenttypes";
         if (args.options.id) {
-            requestUrl += `('${formatting.encodeQueryParameter(args.options.id)}')`;
+            requestUrl += `('${formatting.encodeQueryParameter(args.options.id)}')?$expand=Parent`;
         }
         else if (args.options.name) {
-            requestUrl += `?$filter=Name eq '${formatting.encodeQueryParameter(args.options.name)}'`;
+            requestUrl += `?$filter=Name eq '${formatting.encodeQueryParameter(args.options.name)}'&$expand=Parent`;
         }
         const requestOptions = {
             url: requestUrl,

package/dist/m365/spo/commands/contenttype/contenttype-list.js

@@ -3,7 +3,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 _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators;
+var _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators, _SpoContentTypeListCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -25,12 +25,13 @@ class SpoContentTypeListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
-            let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
+            let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes?$expand=Parent`;
             if (args.options.category) {
-                requestUrl += `?$filter=Group eq '${formatting.encodeQueryParameter(args.options.category)}'`;
+                requestUrl += `&$filter=Group eq '${formatting.encodeQueryParameter(args.options.category)}'`;
             }
             const res = await odata.getAllItems(requestUrl);
             await logger.log(res);
@@ -54,6 +55,8 @@ _SpoContentTypeListCommand_instances = new WeakSet(), _SpoContentTypeListCommand
     });
 }, _SpoContentTypeListCommand_initValidators = function _SpoContentTypeListCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoContentTypeListCommand_initTypes = function _SpoContentTypeListCommand_initTypes() {
+    this.types.string.push('webUrl', 'category');
 };
 export default new SpoContentTypeListCommand();
 //# sourceMappingURL=contenttype-list.js.map

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

@@ -283,7 +283,7 @@ class SpoFileAddCommand extends SpoCommand {
             const isLastChunk = info.Position >= info.Size;
             if (isLastChunk) {
                 // trim buffer for last chunk
-                fileBuffer = fileBuffer.slice(0, readCount);
+                fileBuffer = fileBuffer.subarray(0, readCount);
             }
             const requestOptions = {
                 url: `${info.WebUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.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 _SpoFileRetentionLabelEnsureCommand_instances, _SpoFileRetentionLabelEnsureCommand_initTelemetry, _SpoFileRetentionLabelEnsureCommand_initOptions, _SpoFileRetentionLabelEnsureCommand_initValidators, _SpoFileRetentionLabelEnsureCommand_initOptionSets, _SpoFileRetentionLabelEnsureCommand_initTypes;
-import * as url from 'url';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,7 +30,7 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const fileProperties = await this.getFileProperties(logger, args);
-            const parsedUrl = url.parse(args.options.webUrl);
+            const parsedUrl = new URL(args.options.webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
             const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
             if (args.options.assetId) {

package/dist/m365/spo/commands/file/file-retentionlabel-remove.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 _SpoFileRetentionLabelRemoveCommand_instances, _SpoFileRetentionLabelRemoveCommand_initTelemetry, _SpoFileRetentionLabelRemoveCommand_initOptions, _SpoFileRetentionLabelRemoveCommand_initValidators, _SpoFileRetentionLabelRemoveCommand_initOptionSets, _SpoFileRetentionLabelRemoveCommand_initTypes;
-import * as url from 'url';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -43,7 +42,7 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
     async removeFileRetentionLabel(logger, args) {
         try {
             const fileProperties = await this.getFileProperties(logger, args);
-            const parsedUrl = url.parse(args.options.webUrl);
+            const parsedUrl = new URL(args.options.webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
             const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, fileProperties.listServerRelativeUrl);
             await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(fileProperties.listItemId)], logger, args.options.verbose);

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.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 _SpoFolderRetentionLabelEnsureCommand_instances, _SpoFolderRetentionLabelEnsureCommand_initTelemetry, _SpoFolderRetentionLabelEnsureCommand_initOptions, _SpoFolderRetentionLabelEnsureCommand_initValidators, _SpoFolderRetentionLabelEnsureCommand_initOptionSets, _SpoFolderRetentionLabelEnsureCommand_initTypes;
-import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -32,7 +31,7 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const parsedUrl = url.parse(args.options.webUrl);
+                const parsedUrl = new URL(args.options.webUrl);
                 const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
                 const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
                 await spo.applyRetentionLabelToListItems(args.options.webUrl, args.options.name, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.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 _SpoFolderRetentionLabelRemoveCommand_instances, _SpoFolderRetentionLabelRemoveCommand_initTelemetry, _SpoFolderRetentionLabelRemoveCommand_initOptions, _SpoFolderRetentionLabelRemoveCommand_initValidators, _SpoFolderRetentionLabelRemoveCommand_initOptionSets, _SpoFolderRetentionLabelRemoveCommand_initTypes;
-import * as url from 'url';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -44,7 +43,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand {
         try {
             const folderProperties = await this.getFolderProperties(logger, args);
             if (folderProperties.ListItemAllFields) {
-                const parsedUrl = url.parse(args.options.webUrl);
+                const parsedUrl = new URL(args.options.webUrl);
                 const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
                 const listAbsoluteUrl = urlUtil.urlCombine(tenantUrl, folderProperties.ListItemAllFields.ParentList.RootFolder.ServerRelativeUrl);
                 await spo.removeRetentionLabelFromListItems(args.options.webUrl, listAbsoluteUrl, [parseInt(folderProperties.ListItemAllFields.Id)], logger, args.options.verbose);

package/dist/m365/spo/commands/list/list-contenttype-list.js

@@ -3,7 +3,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 _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_initOptionSets;
+var _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_initOptionSets, _SpoListContentTypeListCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -27,6 +27,7 @@ class SpoListContentTypeListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -45,7 +46,7 @@ class SpoListContentTypeListCommand extends SpoCommand {
             requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
         try {
-            const res = await odata.getAllItems(`${requestUrl}/ContentTypes`);
+            const res = await odata.getAllItems(`${requestUrl}/ContentTypes?$expand=Parent`);
             await logger.log(res);
         }
         catch (err) {
@@ -86,6 +87,8 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
     });
 }, _SpoListContentTypeListCommand_initOptionSets = function _SpoListContentTypeListCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+}, _SpoListContentTypeListCommand_initTypes = function _SpoListContentTypeListCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl');
 };
 export default new SpoListContentTypeListCommand();
 //# sourceMappingURL=list-contenttype-list.js.map

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

@@ -40,7 +40,8 @@ class SpoListItemBatchRemoveCommand extends SpoCommand {
                 if (args.options.filePath) {
                     const csvContent = fs.readFileSync(args.options.filePath, 'utf-8');
                     const jsonContent = formatting.parseCsvToJson(csvContent);
-                    idsToRemove = jsonContent.map((item) => item['ID']);
+                    const idKey = Object.keys(jsonContent[0]).find(key => key.toLowerCase() === 'id');
+                    idsToRemove = jsonContent.map((item) => item[idKey]);
                 }
                 else {
                     idsToRemove = formatting.splitAndTrim(args.options.ids);
@@ -193,18 +194,19 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
             }
             const fileContent = fs.readFileSync(args.options.filePath, 'utf-8');
             const jsonContent = formatting.parseCsvToJson(fileContent);
-            if (!jsonContent[0].hasOwnProperty('ID')) {
+            const idKey = Object.keys(jsonContent[0]).find(key => key.toLowerCase() === 'id');
+            if (!idKey) {
                 return `The file does not contain the required header row with the column name 'ID'.`;
             }
-            const nonNumbers = jsonContent.filter(element => isNaN(Number(element['ID'].toString().trim()))).map(element => element['ID']);
-            if (nonNumbers.length > 0) {
-                return `The specified ids '${nonNumbers.join(', ')}' are invalid numbers.`;
+            const invalidIDs = validation.isValidPositiveIntegerArray(jsonContent.map(element => element[idKey].toString().trim()).join(','));
+            if (invalidIDs !== true) {
+                return `The file contains one or more invalid IDs: '${invalidIDs}'.`;
             }
         }
         if (args.options.ids) {
-            const nonNumbers = formatting.splitAndTrim(args.options.ids).filter(element => isNaN(Number(element)));
-            if (nonNumbers.length > 0) {
-                return `The specified ids '${nonNumbers.join(', ')}' are invalid numbers.`;
+            const isValidIntegerArray = validation.isValidPositiveIntegerArray(args.options.ids);
+            if (isValidIntegerArray !== true) {
+                return `Option 'ids' contains one or more invalid IDs: '${isValidIntegerArray}'.`;
             }
         }
         return true;

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

@@ -117,7 +117,7 @@ class SpoListItemBatchSetCommand extends SpoCommand {
                         actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="Array">${lookupMultiString.join('')}</Parameter></Parameters></Method>`;
                         break;
                     default:
-                        actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${row[field.InternalName].toString()}</Parameter></Parameters></Method>`;
+                        actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${formatting.escapeXml(row[field.InternalName].toString())}</Parameter></Parameters></Method>`;
                         break;
                 }
             }

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-ensure.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 _SpoListItemRetentionLabelEnsureCommand_instances, _SpoListItemRetentionLabelEnsureCommand_initTelemetry, _SpoListItemRetentionLabelEnsureCommand_initOptions, _SpoListItemRetentionLabelEnsureCommand_initValidators, _SpoListItemRetentionLabelEnsureCommand_initOptionSets;
-import * as url from 'url';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -60,7 +59,7 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand {
         return label.TagName;
     }
     async getListAbsoluteUrl(options, logger) {
-        const parsedUrl = url.parse(options.webUrl);
+        const parsedUrl = new URL(options.webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         if (options.listUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-remove.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 _SpoListItemRetentionLabelRemoveCommand_instances, _SpoListItemRetentionLabelRemoveCommand_initTelemetry, _SpoListItemRetentionLabelRemoveCommand_initOptions, _SpoListItemRetentionLabelRemoveCommand_initValidators, _SpoListItemRetentionLabelRemoveCommand_initOptionSets;
-import * as url from 'url';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -49,7 +48,7 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand {
         }
     }
     async getListAbsoluteUrl(options, logger) {
-        const parsedUrl = url.parse(options.webUrl);
+        const parsedUrl = new URL(options.webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         if (options.listUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);

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

@@ -34,7 +34,7 @@ class SpoPageAddCommand extends SpoCommand {
         let bannerImageUrl = '';
         let canvasContent1 = '';
         let layoutWebpartsContent = '';
-        const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substr(0, args.options.name.indexOf('.aspx')) : args.options.name);
+        const pageTitle = args.options.title ? args.options.title : (args.options.name.indexOf('.aspx') > -1 ? args.options.name.substring(0, args.options.name.indexOf('.aspx')) : args.options.name);
         let pageId = null;
         const pageDescription = args.options.description || "";
         if (!pageName.endsWith('.aspx')) {

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

@@ -47,22 +47,14 @@ class SpoSiteAdminAddCommand extends SpoCommand {
             await logger.logToStderr('Adding site administrator as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteIdBasedOnUrl(args.options.siteUrl, logger);
-        const siteAdmins = (await this.getSiteAdmins(adminUrl, siteId)).map(u => u.loginName);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
+        const siteAdmins = (await this.getSiteAdmins(adminUrl, tenantSiteProperties.SiteId)).map(u => u.loginName);
         siteAdmins.push(loginNameToAdd);
-        await this.setSiteAdminsAsAdmin(adminUrl, siteId, siteAdmins);
+        await this.setSiteAdminsAsAdmin(adminUrl, tenantSiteProperties.SiteId, siteAdmins);
         if (args.options.primary) {
-            await this.setPrimaryAdminAsAdmin(adminUrl, siteId, loginNameToAdd);
+            await this.setPrimaryAdminAsAdmin(adminUrl, tenantSiteProperties.SiteId, loginNameToAdd);
         }
     }
-    async getSiteIdBasedOnUrl(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
-    }
     async getSiteAdmins(adminUrl, siteId) {
         const requestOptions = {
             url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,

package/dist/m365/spo/commands/site/site-admin-list.js

@@ -45,16 +45,16 @@ class SpoSiteAdminListCommand extends SpoCommand {
             await logger.logToStderr('Retrieving site administrators as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteId(args.options.siteUrl, logger);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
         const requestOptions = {
-            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
+            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${tenantSiteProperties.SiteId}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
+        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, tenantSiteProperties.SiteId, logger, this.verbose);
         const mappedResult = response.value.map((u) => ({
             Email: u.email,
             LoginName: u.loginName,
@@ -63,14 +63,6 @@ class SpoSiteAdminListCommand extends SpoCommand {
         }));
         await logger.log(mappedResult);
     }
-    async getSiteId(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
-    }
     async callAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr('Retrieving site administrators...');

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

@@ -54,22 +54,14 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
             await logger.logToStderr('Removing site administrator as an administrator...');
         }
         const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        const siteId = await this.getSiteId(args.options.siteUrl, logger);
-        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
+        const tenantSiteProperties = await spo.getSiteAdminPropertiesByUrl(args.options.siteUrl, false, logger, this.verbose);
+        const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, tenantSiteProperties.SiteId, logger, this.verbose);
         if (loginNameToRemove === primaryAdminLoginName) {
             throw 'You cannot remove the primary site collection administrator.';
         }
-        const existingAdmins = await this.getSiteAdmins(adminUrl, siteId);
+        const existingAdmins = await this.getSiteAdmins(adminUrl, tenantSiteProperties.SiteId);
         const adminsToSet = existingAdmins.filter(u => u.loginName.toLowerCase() !== loginNameToRemove.toLowerCase());
-        await this.setSiteAdminsAsAdmin(adminUrl, siteId, adminsToSet);
-    }
-    async getSiteId(siteUrl, logger) {
-        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
-        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
-        if (!match) {
-            throw `Site with URL ${siteUrl} not found`;
-        }
-        return match[1];
+        await this.setSiteAdminsAsAdmin(adminUrl, tenantSiteProperties.SiteId, adminsToSet);
     }
     async getSiteAdmins(adminUrl, siteId) {
         const requestOptions = {

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

@@ -373,7 +373,7 @@ class SpoSiteSetCommand extends SpoCommand {
                 headers: {
                     'X-RequestDigest': this.context.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substring(pos, this.tenantId.indexOf('&'))}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
             response = await request.post(requestOptions);
         }

package/dist/m365/spp/commands/model/model-remove.js

@@ -0,0 +1,105 @@
+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 _SppModelRemoveCommand_instances, _SppModelRemoveCommand_initTelemetry, _SppModelRemoveCommand_initOptions, _SppModelRemoveCommand_initValidators, _SppModelRemoveCommand_initOptionSets, _SppModelRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { spp } from '../../../../utils/spp.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SppModelRemoveCommand extends SpoCommand {
+    get name() {
+        return commands.MODEL_REMOVE;
+    }
+    get description() {
+        return 'Deletes a document understanding model';
+    }
+    constructor() {
+        super();
+        _SppModelRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SppModelRemoveCommand_instances, "m", _SppModelRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (!args.options.force) {
+                const confirmationResult = await cli.promptForConfirmation({ message: `Are you sure you want to remove model '${args.options.title ?? args.options.id}'?` });
+                if (!confirmationResult) {
+                    return;
+                }
+            }
+            if (this.verbose) {
+                await logger.log(`Removing model from ${args.options.siteUrl}...`);
+            }
+            const siteUrl = urlUtil.removeTrailingSlashes(args.options.siteUrl);
+            await spp.assertSiteIsContentCenter(siteUrl);
+            let requestUrl = `${siteUrl}/_api/machinelearning/models/`;
+            if (args.options.title) {
+                let requestTitle = args.options.title.toLowerCase();
+                if (!requestTitle.endsWith('.classifier')) {
+                    requestTitle += '.classifier';
+                }
+                requestUrl += `getbytitle('${formatting.encodeQueryParameter(requestTitle)}')`;
+            }
+            else {
+                requestUrl += `getbyuniqueid('${args.options.id}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'if-match': '*'
+                },
+                responseType: 'json'
+            };
+            const result = await request.delete(requestOptions);
+            if (result?.['odata.null'] === true) {
+                throw "Model not found.";
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_SppModelRemoveCommand_instances = new WeakSet(), _SppModelRemoveCommand_initTelemetry = function _SppModelRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _SppModelRemoveCommand_initOptions = function _SppModelRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-f, --force'
+    });
+}, _SppModelRemoveCommand_initValidators = function _SppModelRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option 'id'.`;
+        }
+        return validation.isValidSharePointUrl(args.options.siteUrl);
+    });
+}, _SppModelRemoveCommand_initOptionSets = function _SppModelRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title'] });
+}, _SppModelRemoveCommand_initTypes = function _SppModelRemoveCommand_initTypes() {
+    this.types.string.push('siteUrl', 'id', 'title');
+    this.types.boolean.push('force');
+};
+export default new SppModelRemoveCommand();
+//# sourceMappingURL=model-remove.js.map

package/dist/m365/spp/commands.js

@@ -1,6 +1,7 @@
 const prefix = 'spp';
 export default {
     CONTENTCENTER_LIST: `${prefix} contentcenter list`,
-    MODEL_LIST: `${prefix} model list`
+    MODEL_LIST: `${prefix} model list`,
+    MODEL_REMOVE: `${prefix} model remove`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -33,7 +33,7 @@ class TeamsUserAppListCommand extends GraphCommand {
             const items = await odata.getAllItems(endpoint);
             items.forEach(i => {
                 const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
-                const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
+                const appId = userAppId.substring(userAppId.indexOf("##") + 2, userAppId.length);
                 i.appId = appId;
             });
             if (!cli.shouldTrimOutput(args.options.output)) {

package/dist/m365/tenant/commands/report/report-office365activationcounts.js

@@ -27,12 +27,11 @@ class TenantReportOffice365ActivationCountsCommand extends GraphCommand {
         try {
             const res = await request.get(requestOptions);
             let content = '';
-            const cleanResponse = this.removeEmptyLines(res);
             if (output && output.toLowerCase() === 'json') {
-                content = formatting.parseCsvToJson(cleanResponse);
+                content = formatting.parseCsvToJson(res);
             }
             else {
-                content = cleanResponse;
+                content = res;
             }
             await logger.log(content);
         }
@@ -40,11 +39,6 @@ class TenantReportOffice365ActivationCountsCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    removeEmptyLines(input) {
-        const rows = input.split('\n');
-        const cleanRows = rows.filter(Boolean);
-        return cleanRows.join('\n');
-    }
 }
 export default new TenantReportOffice365ActivationCountsCommand();
 //# sourceMappingURL=report-office365activationcounts.js.map

package/dist/m365/tenant/commands/report/report-office365activationsusercounts.js

@@ -27,12 +27,11 @@ class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand {
         try {
             const res = await request.get(requestOptions);
             let content = '';
-            const cleanResponse = this.removeEmptyLines(res);
             if (output && output.toLowerCase() === 'json') {
-                content = formatting.parseCsvToJson(cleanResponse);
+                content = formatting.parseCsvToJson(res);
             }
             else {
-                content = cleanResponse;
+                content = res;
             }
             await logger.log(content);
         }
@@ -40,11 +39,6 @@ class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    removeEmptyLines(input) {
-        const rows = input.split('\n');
-        const cleanRows = rows.filter(Boolean);
-        return cleanRows.join('\n');
-    }
 }
 export default new TenantReportOffice365ActivationsUserCountsCommand();
 //# sourceMappingURL=report-office365activationsusercounts.js.map

package/dist/m365/tenant/commands/report/report-office365activationsuserdetail.js

@@ -27,12 +27,11 @@ class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand {
         try {
             const res = await request.get(requestOptions);
             let content = '';
-            const cleanResponse = this.removeEmptyLines(res);
             if (output && output.toLowerCase() === 'json') {
-                content = formatting.parseCsvToJson(cleanResponse);
+                content = formatting.parseCsvToJson(res);
             }
             else {
-                content = cleanResponse;
+                content = res;
             }
             await logger.log(content);
         }
@@ -40,11 +39,6 @@ class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    removeEmptyLines(input) {
-        const rows = input.split('\n');
-        const cleanRows = rows.filter(Boolean);
-        return cleanRows.join('\n');
-    }
 }
 export default new TenantReportOffice365ActivationsUserDetailCommand();
 //# sourceMappingURL=report-office365activationsuserdetail.js.map

package/dist/m365/todo/commands/list/list-remove.js

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TodoListRemoveCommand_instances, _TodoListRemoveCommand_initTelemetry, _TodoListRemoveCommand_initOptions, _TodoListRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
 import commands from '../../commands.js';
 class TodoListRemoveCommand extends DelegatedGraphCommand {
@@ -38,7 +39,7 @@ class TodoListRemoveCommand extends DelegatedGraphCommand {
             return args.options.id;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.name)}'`,
+            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: "application/json;odata.metadata=none"
             },