@pnp/cli-microsoft365 6.3.0-beta.c3dc921 → 6.3.0-beta.e40d7b4

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initOptionSets, _SpoListItemListCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
@@ -53,7 +54,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             }
             let formDigestValue = '';
             const fieldsArray = args.options.fields ? args.options.fields.split(",")
-                : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
+                : (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) ? ["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);

package/dist/m365/spo/commands/navigation/navigation-node-add.js

@@ -38,6 +38,7 @@ class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
         return ['url'];
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Adding navigation node...`);
@@ -51,12 +52,13 @@ class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata',
                     'content-type': 'application/json;odata=nometadata'
                 },
+                responseType: 'json',
                 data: {
+                    AudienceIds: (_a = args.options.audienceIds) === null || _a === void 0 ? void 0 : _a.split(','),
                     Title: args.options.title,
                     Url: args.options.url,
                     IsExternal: args.options.isExternal === true
-                },
-                responseType: 'json'
+                }
             };
             try {
                 const res = yield request_1.default.post(requestOptions);
@@ -73,7 +75,8 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
         Object.assign(this.telemetryProperties, {
             isExternal: args.options.isExternal,
             location: typeof args.options.location !== 'undefined',
-            parentNodeId: typeof args.options.parentNodeId !== 'undefined'
+            parentNodeId: typeof args.options.parentNodeId !== 'undefined',
+            audienceIds: typeof args.options.audienceIds !== 'undefined'
         });
     });
 }, _SpoNavigationNodeAddCommand_initOptions = function _SpoNavigationNodeAddCommand_initOptions() {
@@ -90,6 +93,8 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
         option: '--parentNodeId [parentNodeId]'
     }, {
         option: '--isExternal'
+    }, {
+        option: '--audienceIds [audienceIds]'
     });
 }, _SpoNavigationNodeAddCommand_initValidators = function _SpoNavigationNodeAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -108,6 +113,15 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
                 return `${args.options.location} is not a valid value for the location option. Allowed values are QuickLaunch|TopNavigationBar`;
             }
         }
+        if (args.options.audienceIds) {
+            const audienceIdsSplitted = args.options.audienceIds.split(',');
+            if (audienceIdsSplitted.length > 10) {
+                return 'The maximum amount of audienceIds per navigation node exceeded. The maximum amount of auciendeIds is 10.';
+            }
+            if (!validation_1.validation.isValidGuidArray(audienceIdsSplitted)) {
+                return 'The option audienceIds contains one or more invalid GUIDs';
+            }
+        }
         return true;
     }));
 }, _SpoNavigationNodeAddCommand_initOptionSets = function _SpoNavigationNodeAddCommand_initOptionSets() {

package/dist/m365/spo/commands/navigation/navigation-node-get.js

@@ -0,0 +1,73 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoNavigationNodeGetCommand_instances, _SpoNavigationNodeGetCommand_initOptions, _SpoNavigationNodeGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoNavigationNodeGetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.NAVIGATION_NODE_GET;
+    }
+    get description() {
+        return 'Retrieve information about a specific navigation node';
+    }
+    constructor() {
+        super();
+        _SpoNavigationNodeGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeGetCommand_instances, "m", _SpoNavigationNodeGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeGetCommand_instances, "m", _SpoNavigationNodeGetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about navigation node with id ${args.options.id}`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/navigation/GetNodeById(${args.options.id})`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const listInstance = yield request_1.default.get(requestOptions);
+                logger.log(listInstance);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoNavigationNodeGetCommand_instances = new WeakSet(), _SpoNavigationNodeGetCommand_initOptions = function _SpoNavigationNodeGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--id <id>'
+    });
+}, _SpoNavigationNodeGetCommand_initValidators = function _SpoNavigationNodeGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const id = parseInt(args.options.id);
+        if (isNaN(id)) {
+            return `${args.options.id} is not a valid number`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+};
+module.exports = new SpoNavigationNodeGetCommand();
+//# sourceMappingURL=navigation-node-get.js.map

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

@@ -26,6 +26,9 @@ class SpoNavigationNodeListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists nodes from the specified site navigation';
     }
+    defaultProperties() {
+        return ['Id', 'Title', 'Url'];
+    }
     constructor() {
         super();
         _SpoNavigationNodeListCommand_instances.add(this);
@@ -40,13 +43,7 @@ class SpoNavigationNodeListCommand extends SpoCommand_1.default {
             }
             try {
                 const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}`);
-                logger.log(res.map(n => {
-                    return {
-                        Id: n.Id,
-                        Title: n.Title,
-                        Url: n.Url
-                    };
-                }));
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/navigation/navigation-node-set.js

@@ -0,0 +1,118 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoNavigationNodeSetCommand_instances, _SpoNavigationNodeSetCommand_initTelemetry, _SpoNavigationNodeSetCommand_initTypes, _SpoNavigationNodeSetCommand_initOptions, _SpoNavigationNodeSetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoNavigationNodeSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.NAVIGATION_NODE_SET;
+    }
+    get description() {
+        return 'Adds a navigation node to the specified site navigation';
+    }
+    constructor() {
+        super();
+        _SpoNavigationNodeSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Setting navigation node...`);
+                }
+                const requestBody = {
+                    Title: args.options.title,
+                    IsExternal: args.options.isExternal,
+                    Url: args.options.url
+                };
+                if (args.options.audienceIds !== undefined) {
+                    requestBody.AudienceIds = args.options.audienceIds === '' ? [] : args.options.audienceIds.split(',');
+                }
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/navigation/GetNodeById(${args.options.id})`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                const response = yield request_1.default.patch(requestOptions);
+                if (response['odata.null'] === true) {
+                    throw `Navigation node does not exist.`;
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoNavigationNodeSetCommand_instances = new WeakSet(), _SpoNavigationNodeSetCommand_initTelemetry = function _SpoNavigationNodeSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            isExternal: typeof args.options.isExternal !== 'undefined',
+            audienceIds: typeof args.options.audienceIds !== 'undefined'
+        });
+    });
+}, _SpoNavigationNodeSetCommand_initTypes = function _SpoNavigationNodeSetCommand_initTypes() {
+    this.types.boolean.push('isExternal');
+}, _SpoNavigationNodeSetCommand_initOptions = function _SpoNavigationNodeSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--id <id>'
+    }, {
+        option: '--title [title]'
+    }, {
+        option: '--url [url]'
+    }, {
+        option: '--audienceIds [audienceIds]'
+    }, {
+        option: '--isExternal [isExternal]'
+    });
+}, _SpoNavigationNodeSetCommand_initValidators = function _SpoNavigationNodeSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.audienceIds === undefined && !args.options.url && args.options.isExternal === undefined && !args.options.title) {
+            return `Please specify atleast one property to update.`;
+        }
+        if (args.options.audienceIds) {
+            const audienceIdsSplitted = args.options.audienceIds.split(',');
+            if (audienceIdsSplitted.length > 10) {
+                return 'The maximum amount of audienceIds per navigation node exceeded. The maximum amount of audienceIds is 10.';
+            }
+            if (!validation_1.validation.isValidGuidArray(audienceIdsSplitted)) {
+                return `The option audienceIds contains one or more invalid GUIDs`;
+            }
+        }
+        return true;
+    }));
+};
+module.exports = new SpoNavigationNodeSetCommand();
+//# sourceMappingURL=navigation-node-set.js.map

package/dist/m365/spo/commands/page/page-column-get.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = args.options.output === 'json';
+                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                     const columns = sections[0].columns.filter(col => col.order === args.options.column);
                     if (columns.length) {
                         const column = Page_1.Page.getColumnsInformation(columns[0], isJSONOutput);

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnListCommand_instances, _SpoPageColumnListCommand_initOptions, _SpoPageColumnListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = args.options.output === 'json';
+                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                     logger.log(sections[0].columns.map(c => {
                         const column = Page_1.Page.getColumnsInformation(c, isJSONOutput);
                         column.controls = c.controls.length;

package/dist/m365/spo/commands/page/page-section-get.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionGetCommand_instances, _SpoPageSectionGetCommand_initOptions, _SpoPageSectionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,7 +39,7 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
                 const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
-                const isJSONOutput = args.options.output === 'json';
+                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                 if (sections.length) {
                     logger.log(Page_1.Page.getSectionInformation(sections[0], isJSONOutput));
                 }

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionListCommand_instances, _SpoPageSectionListCommand_initOptions, _SpoPageSectionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -37,7 +38,7 @@ class SpoPageSectionListCommand extends SpoCommand_1.default {
             try {
                 const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections;
-                const isJSONOutput = args.options.output === 'json';
+                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                 if (sections.length) {
                     const output = sections.map(section => Page_1.Page.getSectionInformation(section, isJSONOutput));
                     if (isJSONOutput) {

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

@@ -17,6 +17,7 @@ var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_i
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -37,19 +38,6 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getAppInfo(args) {
         if (args.options.appId && args.options.appDisplayName) {
             return Promise.resolve({
@@ -136,7 +124,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const appInfo = yield this.getAppInfo(args);
                 let permission = yield this.addPermissions(args, appInfo);
                 if (this.roleNeedsElevation(args.options.permission)) {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionGetCommand_instances, _SpoSiteAppPermissionGetCommand_initOptions, _SpoSiteAppPermissionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -32,19 +33,6 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionGetCommand_instances, "m", _SpoSiteAppPermissionGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionGetCommand_instances, "m", _SpoSiteAppPermissionGetCommand_initValidators).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getApplicationPermission(args, siteId) {
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${siteId}/permissions/${args.options.id}`,
@@ -58,7 +46,7 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const siteId = yield this.getSpoSiteId(args);
+                const siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const permissionObject = yield this.getApplicationPermission(args, siteId);
                 const transposed = [];
                 permissionObject.grantedToIdentities.forEach((permissionEntity) => {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionListCommand_instances, _SpoSiteAppPermissionListCommand_initTelemetry, _SpoSiteAppPermissionListCommand_initOptions, _SpoSiteAppPermissionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -34,19 +35,6 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initValidators).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getFilteredPermissions(args, permissions) {
         let filterProperty = 'displayName';
         let filterValue = args.options.appDisplayName;
@@ -95,7 +83,7 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const permRes = yield this.getPermissions();
                 let permissions = permRes.value;
                 if (args.options.appId || args.options.appDisplayName) {

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

@@ -17,6 +17,7 @@ var _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCom
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -36,19 +37,6 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getPermissions() {
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
@@ -98,7 +86,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSiteAppPermission = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    this.siteId = yield this.getSpoSiteId(args);
+                    this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                     const permissionIdsToRemove = yield this.getPermissionIds(args);
                     const tasks = [];
                     for (const permissionId of permissionIdsToRemove) {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionSetCommand_instances, _SpoSiteAppPermissionSetCommand_initTelemetry, _SpoSiteAppPermissionSetCommand_initOptions, _SpoSiteAppPermissionSetCommand_initValidators, _SpoSiteAppPermissionSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -36,19 +37,6 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const siteRequestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(siteRequestOptions)
-            .then((site) => site.id);
-    }
     getFilteredPermissions(args, permissions) {
         let filterProperty = 'displayName';
         let filterValue = args.options.appDisplayName;
@@ -85,7 +73,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const sitePermissionId = yield this.getPermission(args);
                 const requestOptions = {
                     url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${sitePermissionId}`,

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

@@ -53,6 +53,9 @@ class SpoSiteDesignAddCommand extends SpoCommand_1.default {
                 if (args.options.previewImageAltText) {
                     info.PreviewImageAltText = args.options.previewImageAltText;
                 }
+                if (args.options.thumbnailUrl) {
+                    info.ThumbnailUrl = args.options.thumbnailUrl;
+                }
                 if (args.options.isDefault) {
                     info.IsDefault = true;
                 }
@@ -83,6 +86,7 @@ _SpoSiteDesignAddCommand_instances = new WeakSet(), _SpoSiteDesignAddCommand_ini
             description: (!(!args.options.description)).toString(),
             previewImageUrl: (!(!args.options.previewImageUrl)).toString(),
             previewImageAltText: (!(!args.options.previewImageAltText)).toString(),
+            thumbnailUrl: (!(!args.options.thumbnailUrl)).toString(),
             isDefault: args.options.isDefault || false
         });
     });
@@ -100,6 +104,8 @@ _SpoSiteDesignAddCommand_instances = new WeakSet(), _SpoSiteDesignAddCommand_ini
         option: '-m, --previewImageUrl [previewImageUrl]'
     }, {
         option: '-a, --previewImageAltText [previewImageAltText]'
+    }, {
+        option: '--thumbnailUrl [thumbnailUrl]'
     }, {
         option: '--isDefault'
     });

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchCommand_initOptions, _SpoSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
+const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
 const formatting_1 = require("../../../utils/formatting");
 const spo_1 = require("../../../utils/spo");
@@ -137,7 +138,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         else {
             logger.log(this.getParsedOutput(args, results));
         }
-        if (!args.options.output || args.options.output === 'text') {
+        if (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) {
             logger.log("# Rows: " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
             logger.log("# Rows (Including duplicates): " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
             logger.log("Elapsed Time: " + this.getElapsedTime(results));