@pnp/cli-microsoft365 6.9.0-beta.41bb38c → 6.9.0-beta.8393174

package/dist/m365/spo/commands/tenant/tenant-commandset-add.js

@@ -0,0 +1,215 @@
+"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 _SpoTenantCommandSetAddCommand_instances, _SpoTenantCommandSetAddCommand_initTelemetry, _SpoTenantCommandSetAddCommand_initOptions, _SpoTenantCommandSetAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const Cli_1 = require("../../../../cli/Cli");
+const spoTenantAppCatalogUrlGetCommand = require("./tenant-appcatalogurl-get");
+const spoListItemAddCommand = require("../listitem/listitem-add");
+const spoListItemListCommand = require("../listitem/listitem-list");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+class SpoTenantCommandSetAddCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_COMMANDSET_ADD;
+    }
+    get description() {
+        return 'Add a ListView Command Set as a tenant-wide extension.';
+    }
+    constructor() {
+        super();
+        _SpoTenantCommandSetAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetAddCommand_instances, "m", _SpoTenantCommandSetAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetAddCommand_instances, "m", _SpoTenantCommandSetAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetAddCommand_instances, "m", _SpoTenantCommandSetAddCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appCatalogUrl = yield this.getAppCatalogUrl(logger);
+                const componentManifest = yield this.getComponentManifest(appCatalogUrl, args.options.clientSideComponentId, logger);
+                const clientComponentManifest = JSON.parse(componentManifest.ClientComponentManifest);
+                if (clientComponentManifest.extensionType !== "ListViewCommandSet") {
+                    throw `The extension type of this component is not of type 'ListViewCommandSet' but of type '${clientComponentManifest.extensionType}'`;
+                }
+                const solution = yield this.getSolutionFromAppCatalog(appCatalogUrl, componentManifest.SolutionId, logger);
+                if (!solution.ContainsTenantWideExtension) {
+                    throw `The solution does not contain an extension that can be deployed to all sites. Make sure that you've entered the correct component Id.`;
+                }
+                else if (!solution.SkipFeatureDeployment) {
+                    throw 'The solution has not been deployed to all sites. Make sure to deploy this solution to all sites.';
+                }
+                yield this.addTenantWideExtension(appCatalogUrl, args.options, logger);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getAppCatalogUrl(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spoTenantAppCatalogUrlGetCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(spoTenantAppCatalogUrlGetCommand, { options: { output: 'text', _: [] } });
+            if (this.verbose) {
+                logger.logToStderr(spoTenantAppCatalogUrlGetCommandOutput.stderr);
+            }
+            const appCatalogUrl = spoTenantAppCatalogUrlGetCommandOutput.stdout;
+            if (!appCatalogUrl) {
+                throw 'Cannot add tenant-wide ListView Command Set as app catalog cannot be found';
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Got tenant app catalog url: ${appCatalogUrl}`);
+            }
+            return appCatalogUrl;
+        });
+    }
+    getComponentManifest(appCatalogUrl, clientSideComponentId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving component manifest item from the ComponentManifests list on the app catalog site so that we get the solution id');
+            }
+            const camlQuery = `<View><ViewFields><FieldRef Name='ClientComponentId'></FieldRef><FieldRef Name='SolutionId'></FieldRef><FieldRef Name='ClientComponentManifest'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='ClientComponentId' /><Value Type='Guid'>${clientSideComponentId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/ComponentManifests`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw 'No component found with the specified clientSideComponentId found in the component manifest list. Make sure that the application is added to the application catalog';
+            }
+            return outputParsed[0];
+        });
+    }
+    getSolutionFromAppCatalog(appCatalogUrl, solutionId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving solution with id ${solutionId} from the application catalog`);
+            }
+            const camlQuery = `<View><ViewFields><FieldRef Name='SkipFeatureDeployment'></FieldRef><FieldRef Name='ContainsTenantWideExtension'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='AppProductID' /><Value Type='Guid'>${solutionId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/AppCatalog`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw `No component found with the solution id ${solutionId}. Make sure that the solution is available in the app catalog`;
+            }
+            return outputParsed[0];
+        });
+    }
+    addTenantWideExtension(appCatalogUrl, options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Pre-checks finished. Adding tenant wide extension to the TenantWideExtensions list');
+            }
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/TenantWideExtensions`,
+                Title: options.title,
+                TenantWideExtensionComponentId: options.clientSideComponentId,
+                TenantWideExtensionLocation: this.getLocation(options.location),
+                TenantWideExtensionSequence: 0,
+                TenantWideExtensionListTemplate: this.getListTemplate(options.listType),
+                TenantWideExtensionComponentProperties: options.clientSideComponentProperties || '',
+                TenantWideExtensionWebTemplate: options.webTemplate || '',
+                TenantWideExtensionDisabled: false,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: options.output
+            };
+            yield Cli_1.Cli.executeCommand(spoListItemAddCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+        });
+    }
+    getLocation(location) {
+        switch (location) {
+            case 'Both':
+                return 'ClientSideExtension.ListViewCommandSet';
+            case 'ContextMenu':
+                return 'ClientSideExtension.ListViewCommandSet.ContextMenu';
+            default:
+                return 'ClientSideExtension.ListViewCommandSet.CommandBar';
+        }
+    }
+    getListTemplate(listTemplate) {
+        switch (listTemplate) {
+            case 'SitePages':
+                return '119';
+            case 'Library':
+                return '101';
+            default:
+                return '100';
+        }
+    }
+}
+_SpoTenantCommandSetAddCommand_instances = new WeakSet(), _SpoTenantCommandSetAddCommand_initTelemetry = function _SpoTenantCommandSetAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listType: args.options.listType,
+            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
+            webTemplate: typeof args.options.webTemplate !== 'undefined',
+            location: args.options.location
+        });
+    });
+}, _SpoTenantCommandSetAddCommand_initOptions = function _SpoTenantCommandSetAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-t, --title <title>'
+    }, {
+        option: '-l, --listType <listType>',
+        autocomplete: SpoTenantCommandSetAddCommand.listTypes
+    }, {
+        option: '-i, --clientSideComponentId <clientSideComponentId>'
+    }, {
+        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
+    }, {
+        option: '-w, --webTemplate [webTemplate]'
+    }, {
+        option: '--location [location]',
+        autocomplete: SpoTenantCommandSetAddCommand.locations
+    });
+}, _SpoTenantCommandSetAddCommand_initValidators = function _SpoTenantCommandSetAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (SpoTenantCommandSetAddCommand.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoTenantCommandSetAddCommand.listTypes.join(', ')}`;
+        }
+        if (args.options.location && SpoTenantCommandSetAddCommand.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${SpoTenantCommandSetAddCommand.locations.join(', ')}`;
+        }
+        return true;
+    }));
+};
+SpoTenantCommandSetAddCommand.listTypes = ['List', 'Library', 'SitePages'];
+SpoTenantCommandSetAddCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];
+module.exports = new SpoTenantCommandSetAddCommand();
+//# sourceMappingURL=tenant-commandset-add.js.map

package/dist/m365/spo/commands/tenant/tenant-commandset-get.js

@@ -0,0 +1,114 @@
+"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 _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../../../Command");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoTenantCommandSetGetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_COMMANDSET_GET;
+    }
+    get description() {
+        return 'Get a ListView Command Set that is installed tenant wide';
+    }
+    constructor() {
+        super();
+        _SpoTenantCommandSetGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetGetCommand_instances, "m", _SpoTenantCommandSetGetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const appCatalogUrl = yield spo_1.spo.getTenantAppCatalogUrl(logger, this.debug);
+            if (!appCatalogUrl) {
+                throw new Command_1.CommandError('No app catalog URL found');
+            }
+            let filter = `startswith(TenantWideExtensionLocation,'ClientSideExtension.ListViewCommandSet')`;
+            if (args.options.title) {
+                filter += ` and Title eq '${args.options.title}'`;
+            }
+            else if (args.options.id) {
+                filter += ` and Id eq ${args.options.id}`;
+            }
+            else if (args.options.clientSideComponentId) {
+                filter += ` and TenantWideExtensionComponentId eq '${args.options.clientSideComponentId}'`;
+            }
+            const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
+            const reqOptions = {
+                url: `${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=${filter}`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const listItemInstances = yield request_1.default.get(reqOptions);
+                if ((listItemInstances === null || listItemInstances === void 0 ? void 0 : listItemInstances.value.length) > 0) {
+                    if (listItemInstances.value.length > 1) {
+                        throw `Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.value.map(item => item.Id).join(', ')}`;
+                    }
+                    listItemInstances.value.forEach(v => delete v['ID']);
+                    logger.log(listItemInstances.value[0]);
+                }
+                else {
+                    throw 'The specified ListView Command Set was not found';
+                }
+            }
+            catch (err) {
+                return this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoTenantCommandSetGetCommand_instances = new WeakSet(), _SpoTenantCommandSetGetCommand_initTelemetry = function _SpoTenantCommandSetGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined'
+        });
+    });
+}, _SpoTenantCommandSetGetCommand_initOptions = function _SpoTenantCommandSetGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    });
+}, _SpoTenantCommandSetGetCommand_initValidators = function _SpoTenantCommandSetGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && isNaN(parseInt(args.options.id))) {
+            return `${args.options.id} is not a number`;
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoTenantCommandSetGetCommand_initOptionSets = function _SpoTenantCommandSetGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
+};
+module.exports = new SpoTenantCommandSetGetCommand();
+//# sourceMappingURL=tenant-commandset-get.js.map

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

@@ -0,0 +1,50 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../../../Command");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoTenantCommandSetListCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_COMMANDSET_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of ListView Command Sets that are installed tenant-wide';
+    }
+    defaultProperties() {
+        return ['Title', 'TenantWideExtensionComponentId', 'TenantWideExtensionListTemplate'];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const appCatalogUrl = yield spo_1.spo.getTenantAppCatalogUrl(logger, this.debug);
+            if (!appCatalogUrl) {
+                throw new Command_1.CommandError('No app catalog URL found');
+            }
+            if (this.verbose) {
+                logger.logToStderr('Retrieving a list of ListView Command Sets that are installed tenant-wide');
+            }
+            const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
+            try {
+                const response = yield odata_1.odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet')`);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new SpoTenantCommandSetListCommand();
+//# sourceMappingURL=tenant-commandset-list.js.map

package/dist/m365/spo/commands/tenant/tenant-commandset-set.js

@@ -166,7 +166,7 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
         option: '-l, --listType [listType]',
         autocomplete: SpoTenantCommandSetSetCommand.listTypes
     }, {
-        option: '-i, --clientSideComponentId [clientSideComponentId]'
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
         option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
     }, {

package/dist/m365/spo/commands/term/term-group-add.js

@@ -42,14 +42,14 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
             let formDigest = '';
             let termGroup;
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const webUrl = args.options.webUrl || (yield spo_1.spo.getSpoAdminUrl(logger, this.debug));
+                const res = yield spo_1.spo.getRequestDigest(webUrl);
                 formDigest = res.FormDigestValue;
                 if (this.verbose) {
                     logger.logToStderr(`Getting taxonomy term store...`);
                 }
                 const requestOptionsPost = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -67,7 +67,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Adding taxonomy term group...`);
                 }
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': formDigest
                     },
@@ -86,7 +86,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                         logger.logToStderr(`Setting taxonomy term group description...`);
                     }
                     const requestOptionsQuery = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': formDigest
                         },
@@ -117,7 +117,8 @@ _SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             description: typeof args.options.id !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined'
         });
     });
 }, _SpoTermGroupAddCommand_initOptions = function _SpoTermGroupAddCommand_initOptions() {
@@ -127,13 +128,16 @@ _SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initT
         option: '-i, --id [id]'
     }, {
         option: '-d, --description [description]'
+    }, {
+        option: '-u, --webUrl [webUrl]'
     });
 }, _SpoTermGroupAddCommand_initValidators = function _SpoTermGroupAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id) {
-            if (!validation_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.webUrl) {
+            return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands.js

@@ -17,6 +17,7 @@ exports.default = {
     APPLICATIONCUSTOMIZER_GET: `${prefix} applicationcustomizer get`,
     APPLICATIONCUSTOMIZER_LIST: `${prefix} applicationcustomizer list`,
     APPLICATIONCUSTOMIZER_REMOVE: `${prefix} applicationcustomizer remove`,
+    APPLICATIONCUSTOMIZER_SET: `${prefix} applicationcustomizer set`,
     APPPAGE_ADD: `${prefix} apppage add`,
     APPPAGE_SET: `${prefix} apppage set`,
     CDN_GET: `${prefix} cdn get`,
@@ -60,6 +61,7 @@ exports.default = {
     FILE_ADD: `${prefix} file add`,
     FILE_CHECKIN: `${prefix} file checkin`,
     FILE_CHECKOUT: `${prefix} file checkout`,
+    FILE_CHECKOUT_UNDO: `${prefix} file checkout undo`,
     FILE_COPY: `${prefix} file copy`,
     FILE_GET: `${prefix} file get`,
     FILE_LIST: `${prefix} file list`,
@@ -141,6 +143,7 @@ exports.default = {
     LIST_ROLEASSIGNMENT_ADD: `${prefix} list roleassignment add`,
     LIST_ROLEINHERITANCE_BREAK: `${prefix} list roleinheritance break`,
     LIST_ROLEINHERITANCE_RESET: `${prefix} list roleinheritance reset`,
+    LIST_SENSITIVITYLABEL_ENSURE: `${prefix} list sensitivitylabel ensure`,
     LIST_SET: `${prefix} list set`,
     LIST_SITESCRIPT_GET: `${prefix} list sitescript get`,
     LIST_VIEW_ADD: `${prefix} list view add`,
@@ -295,6 +298,10 @@ exports.default = {
     TENANT_APPLICATIONCUSTOMIZER_GET: `${prefix} tenant applicationcustomizer get`,
     TENANT_APPLICATIONCUSTOMIZER_LIST: `${prefix} tenant applicationcustomizer list`,
     TENANT_APPLICATIONCUSTOMIZER_REMOVE: `${prefix} tenant applicationcustomizer remove`,
+    TENANT_APPLICATIONCUSTOMIZER_SET: `${prefix} tenant applicationcustomizer set`,
+    TENANT_COMMANDSET_ADD: `${prefix} tenant commandset add`,
+    TENANT_COMMANDSET_GET: `${prefix} tenant commandset get`,
+    TENANT_COMMANDSET_LIST: `${prefix} tenant commandset list`,
     TENANT_COMMANDSET_REMOVE: `${prefix} tenant commandset remove`,
     TENANT_COMMANDSET_SET: `${prefix} tenant commandset set`,
     TENANT_RECYCLEBINITEM_LIST: `${prefix} tenant recyclebinitem list`,

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

@@ -13,20 +13,13 @@ 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 _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initValidators;
+var _TeamsTeamAddCommand_instances, _TeamsTeamAddCommand_initTelemetry, _TeamsTeamAddCommand_initOptions, _TeamsTeamAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-var TeamsAsyncOperationStatus;
-(function (TeamsAsyncOperationStatus) {
-    TeamsAsyncOperationStatus["Invalid"] = "invalid";
-    TeamsAsyncOperationStatus["NotStarted"] = "notStarted";
-    TeamsAsyncOperationStatus["InProgress"] = "inProgress";
-    TeamsAsyncOperationStatus["Succeeded"] = "succeeded";
-    TeamsAsyncOperationStatus["Failed"] = "failed";
-})(TeamsAsyncOperationStatus || (TeamsAsyncOperationStatus = {}));
+const promises_1 = require("timers/promises");
 class TeamsTeamAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.TEAM_ADD;
@@ -40,7 +33,7 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
         this.pollingInterval = 30000;
         __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamAddCommand_instances, "m", _TeamsTeamAddCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -64,6 +57,9 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                 }
             }
             else {
+                if (this.verbose) {
+                    logger.logToStderr(`Creating team with name ${args.options.name} and description ${args.options.description}`);
+                }
                 requestBody = {
                     'template@odata.bind': `https://graph.microsoft.com/v1.0/teamsTemplates('standard')`,
                     displayName: args.options.name,
@@ -87,50 +83,57 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
                     },
                     responseType: 'json'
                 };
-                const teamsAsyncOperation = yield new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    const teamsAsyncOperation = yield request_1.default.get(requestOptions);
-                    if (!args.options.wait) {
-                        resolve(teamsAsyncOperation);
-                    }
-                    else {
-                        setTimeout(() => {
-                            this.waitUntilFinished(requestOptions, resolve, reject, logger);
-                        }, this.pollingInterval);
-                    }
-                }));
-                let output;
+                const teamsAsyncOperation = yield request_1.default.get(requestOptions);
                 if (!args.options.wait) {
-                    output = teamsAsyncOperation;
+                    logger.log(teamsAsyncOperation);
                 }
                 else {
-                    output = yield aadGroup_1.aadGroup.getGroupById(teamsAsyncOperation.targetResourceId);
+                    yield this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
+                    const aadGroup = yield this.getAadGroup(teamsAsyncOperation.targetResourceId, logger);
+                    logger.log(aadGroup);
                 }
-                logger.log(output);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    waitUntilFinished(requestOptions, resolve, reject, logger) {
-        request_1.default
-            .get(requestOptions)
-            .then((teamsAsyncOperation) => {
-            if (teamsAsyncOperation.status === TeamsAsyncOperationStatus.Succeeded) {
+    waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (teamsAsyncOperation.status === 'succeeded') {
                 if (this.verbose) {
-                    process.stdout.write('\n');
+                    logger.logToStderr('Team provisioned succesfully. Returning...');
                 }
-                resolve(teamsAsyncOperation);
                 return;
             }
-            if (teamsAsyncOperation.error) {
-                reject(teamsAsyncOperation.error);
-                return;
+            else if (teamsAsyncOperation.error) {
+                throw teamsAsyncOperation.error;
+            }
+            else {
+                if (this.verbose) {
+                    logger.logToStderr(`Team still provisioning. Retrying in ${this.pollingInterval / 1000} seconds...`);
+                }
+                yield (0, promises_1.setTimeout)(this.pollingInterval);
+                teamsAsyncOperation = yield request_1.default.get(requestOptions);
+                yield this.waitUntilTeamFinishedProvisioning(teamsAsyncOperation, requestOptions, logger);
+            }
+        });
+    }
+    getAadGroup(id, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let group;
+            try {
+                group = yield aadGroup_1.aadGroup.getGroupById(id);
+            }
+            catch (_a) {
+                if (this.verbose) {
+                    logger.logToStderr(`Error occured on retrieving the aad group. Retrying in ${this.pollingInterval / 1000} seconds.`);
+                }
+                yield (0, promises_1.setTimeout)(this.pollingInterval);
+                return yield this.getAadGroup(id, logger);
             }
-            setTimeout(() => {
-                this.waitUntilFinished(requestOptions, resolve, reject, logger);
-            }, this.pollingInterval);
-        }).catch(err => reject(err));
+            return group;
+        });
     }
 }
 _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemetry = function _TeamsTeamAddCommand_initTelemetry() {
@@ -152,18 +155,18 @@ _TeamsTeamAddCommand_instances = new WeakSet(), _TeamsTeamAddCommand_initTelemet
     }, {
         option: '--wait'
     });
-}, _TeamsTeamAddCommand_initValidators = function _TeamsTeamAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.template) {
-            if (!args.options.name) {
-                return `Required parameter name missing`;
-            }
-            if (!args.options.description) {
-                return `Required parameter description missing`;
-            }
+}, _TeamsTeamAddCommand_initOptionSets = function _TeamsTeamAddCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['name'],
+        runsWhen: (args) => {
+            return !args.options.template;
         }
-        return true;
-    }));
+    }, {
+        options: ['description'],
+        runsWhen: (args) => {
+            return !args.options.template;
+        }
+    });
 };
 module.exports = new TeamsTeamAddCommand();
 //# sourceMappingURL=team-add.js.map