@pnp/cli-microsoft365 6.0.0-beta.f73c4f8 → 6.0.0-beta.f94d570

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

@@ -14,18 +14,12 @@ class SpoListListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url', 'Id'];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.executeWithLimitedPermissions = !!args.options.executeWithLimitedPermissions;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         if (this.verbose) {
             logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
         }
-        const suffix = args.options.executeWithLimitedPermissions ? '&$select=RootFolder/ServerRelativeUrl,*' : '';
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder${suffix}`,
+            url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,*`,
             method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'
@@ -46,9 +40,6 @@ class SpoListListCommand extends SpoCommand_1.default {
         const options = [
             {
                 option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--executeWithLimitedPermissions'
             }
         ];
         const parentOptions = super.options();

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

@@ -24,15 +24,15 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
-        const propertiesSelect = args.options.properties ?
-            `?$select=${encodeURIComponent(args.options.properties)}` :
-            ((!args.options.output || args.options.output === 'text') ?
-                `?$select=Id,Title` :
-                ``);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')` :
+            `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+        const propertiesSelect = args.options.properties ? args.options.properties.split(',') : [];
+        const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
+        const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
+        const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
+        const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
         const requestOptions = {
-            url: `${listRestUrl}/items(${args.options.id})${propertiesSelect}`,
+            url: `${listRestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -41,7 +41,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
         request_1.default
             .get(requestOptions)
             .then((response) => {
-            delete response["ID"];
+            delete response['ID'];
             logger.log(response);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));

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

@@ -13,10 +13,8 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
         telemetryProps.listId = typeof args.options.listId !== 'undefined';
         telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.title = typeof args.options.title !== 'undefined';
         telemetryProps.fields = typeof args.options.fields !== 'undefined';
         telemetryProps.filter = typeof args.options.filter !== 'undefined';
         telemetryProps.pageNumber = typeof args.options.pageNumber !== 'undefined';
@@ -25,17 +23,14 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        if (args.options.id) {
-            this.warn(logger, `Option 'id' is deprecated. Please use 'listId' instead.`);
-        }
-        if (args.options.title) {
-            this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
-        }
-        const listIdArgument = args.options.listId || args.options.id || '';
-        const listTitleArgument = args.options.listTitle || args.options.title || '';
+        const listIdArgument = args.options.listId || '';
+        const listTitleArgument = args.options.listTitle || '';
         let formDigestValue = '';
         const fieldsArray = args.options.fields ? args.options.fields.split(",")
             : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
+        const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
+        const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
+        const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
         const listRestUrl = listIdArgument ?
             `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
             : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`;
@@ -75,8 +70,9 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
             const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
             const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
+            const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
             const fieldSelect = fieldsArray.length > 0 ?
-                `?$select=${encodeURIComponent(fieldsArray.join(","))}&${rowLimit}&${skipToken}&${filter}` :
+                `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
                 `?${rowLimit}&${skipToken}&${filter}`;
             const requestBody = args.options.camlQuery ?
                 {
@@ -107,12 +103,6 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             {
                 option: '-u, --webUrl <webUrl>'
             },
-            {
-                option: '--id [id]'
-            },
-            {
-                option: '--title [title]'
-            },
             {
                 option: '-i, --listId [listId]'
             },
@@ -157,14 +147,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle) {
+        if (!args.options.listId && !args.options.listTitle) {
             return `Specify listId or listTitle`;
         }
-        if (args.options.id && args.options.title) {
-            return `Specify list id or title but not both`;
-        }
-        // Check if only one of the 4 options is specified
-        if ([args.options.id, args.options.title, args.options.listId, args.options.listTitle].filter(o => o).length > 1) {
+        if (args.options.listId && args.options.listTitle) {
             return 'Specify listId or listTitle but not both';
         }
         if (args.options.camlQuery && args.options.fields) {
@@ -188,9 +174,6 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} in option id is not a valid GUID`;
-        }
         return true;
     }
 }

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

@@ -73,7 +73,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     }
     mapRequestBody(permission, appInfo) {
         const requestBody = {
-            roles: permission.split(',')
+            roles: [permission]
         };
         requestBody.grantedToIdentities = [];
         requestBody.grantedToIdentities.push({ application: { "id": appInfo.appId, "displayName": appInfo.displayName } });
@@ -129,11 +129,8 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        const permissions = args.options.permission.split(',');
-        for (let i = 0; i < permissions.length; i++) {
-            if (['read', 'write'].indexOf(permissions[i]) === -1) {
-                return `${permissions[i]} is not a valid permission value. Allowed values read|write|read,write`;
-            }
+        if (['read', 'write', 'owner'].indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are read|write|owner`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }

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

@@ -83,7 +83,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
                     'content-type': 'application/json;odata=nometadata'
                 },
                 data: {
-                    roles: args.options.permission.split(',')
+                    roles: [args.options.permission]
                 },
                 responseType: 'json'
             };
@@ -122,11 +122,8 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        const permissions = args.options.permission.split(',');
-        for (let i = 0; i < permissions.length; i++) {
-            if (['read', 'write'].indexOf(permissions[i]) === -1) {
-                return `${permissions[i]} is not a valid permission value. Allowed values are read|write|read,write`;
-            }
+        if (['read', 'write', 'owner'].indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are read|write|owner`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }

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

@@ -10,22 +10,25 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         return commands_1.default.SITE_LIST;
     }
     get description() {
-        return 'Lists modern sites of the given type';
+        return 'Lists sites of the given type';
     }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.siteType = args.options.type || 'TeamSite';
+        telemetryProps.webTemplate = args.options.webTemplate;
         telemetryProps.filter = (!(!args.options.filter)).toString();
-        telemetryProps.deleted = args.options.deleted;
+        telemetryProps.includeOneDriveSites = typeof args.options.includeOneDriveSites !== 'undefined';
+        telemetryProps.deleted = typeof args.options.deleted !== 'undefined';
+        telemetryProps.siteType = args.options.type;
         return telemetryProps;
     }
     defaultProperties() {
         return ['Title', 'Url'];
     }
     commandAction(logger, args, cb) {
-        const siteType = args.options.type || 'TeamSite';
-        const webTemplate = siteType === 'TeamSite' ? 'GROUP#0' : 'SITEPAGEPUBLISHING#0';
-        let spoAdminUrl;
+        const webTemplate = this.getWebTemplateId(args.options);
+        const includeOneDriveSites = args.options.includeOneDriveSites || false;
+        const personalSite = includeOneDriveSites === false ? '0' : '1';
+        let spoAdminUrl = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
@@ -34,19 +37,19 @@ class SpoSiteListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', webTemplate, undefined, args.options.deleted, logger);
+            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
         })
             .then(_ => {
             logger.log(this.allSites);
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    getAllSites(spoAdminUrl, filter, startIndex, webTemplate, formDigest, deleted, logger) {
+    getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
         return new Promise((resolve, reject) => {
             utils_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
-                let requestBody = `<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" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">0</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
+                let requestBody = `<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" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
                 if (deleted) {
                     requestBody = `<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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
                 }
@@ -71,7 +74,7 @@ class SpoSiteListCommand extends SpoCommand_1.default {
                     this.allSites.push(...sites._Child_Items_);
                     if (sites.NextStartIndexFromSharePoint) {
                         this
-                            .getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, webTemplate, formDigest, deleted, logger)
+                            .getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger)
                             .then(_ => resolve(), err => reject(err));
                     }
                     else {
@@ -81,15 +84,37 @@ class SpoSiteListCommand extends SpoCommand_1.default {
             }, err => reject(err));
         });
     }
+    getWebTemplateId(options) {
+        if (options.webTemplate) {
+            return options.webTemplate;
+        }
+        if (options.includeOneDriveSites) {
+            return '';
+        }
+        switch (options.type) {
+            case "TeamSite":
+                return 'GROUP#0';
+            case "CommunicationSite":
+                return 'SITEPAGEPUBLISHING#0';
+            default:
+                return '';
+        }
+    }
     options() {
         const options = [
             {
-                option: '--type [type]',
+                option: '-t, --type [type]',
                 autocomplete: ['TeamSite', 'CommunicationSite']
             },
+            {
+                option: '--webTemplate [webTemplate]'
+            },
             {
                 option: '-f, --filter [filter]'
             },
+            {
+                option: '--includeOneDriveSites'
+            },
             {
                 option: '--deleted'
             }
@@ -98,11 +123,17 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (args.options.type) {
-            if (args.options.type !== 'TeamSite' &&
-                args.options.type !== 'CommunicationSite') {
-                return `${args.options.type} is not a valid modern site type. Allowed types are TeamSite and CommunicationSite`;
-            }
+        if (args.options.type && args.options.webTemplate) {
+            return 'Specify either type or webTemplate, but not both';
+        }
+        const typeValues = ['TeamSite', 'CommunicationSite'];
+        if (args.options.type &&
+            typeValues.indexOf(args.options.type) < 0) {
+            return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
+        }
+        if (args.options.includeOneDriveSites
+            && (args.options.type || args.options.webTemplate)) {
+            return 'When using includeOneDriveSites, don\'t specify the type or webTemplate options';
         }
         return true;
     }