@pnp/cli-microsoft365 6.3.0 → 6.4.0-beta.140530d

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

@@ -106,7 +106,7 @@ class SpoListAddCommand extends SpoCommand_1.default {
     mapRequestBody(options) {
         const requestBody = {
             Title: options.title,
-            BaseTemplate: ListTemplateType_1.ListTemplateType[options.baseTemplate.trim()].valueOf()
+            BaseTemplate: options.baseTemplate ? ListTemplateType_1.ListTemplateType[options.baseTemplate.trim()].valueOf() : ListTemplateType_1.ListTemplateType.GenericList
         };
         if (options.description) {
             requestBody.Description = options.description;
@@ -148,7 +148,7 @@ class SpoListAddCommand extends SpoCommand_1.default {
             requestBody.DisableGridEditing = options.disableGridEditing;
         }
         if (options.draftVersionVisibility) {
-            requestBody.DraftVersionVisibility = options.draftVersionVisibility;
+            requestBody.DraftVersionVisibility = DraftVisibilityType_1.DraftVisibilityType[options.draftVersionVisibility.trim()];
         }
         if (options.emailAlias) {
             requestBody.EmailAlias = options.emailAlias;
@@ -226,7 +226,7 @@ class SpoListAddCommand extends SpoCommand_1.default {
             requestBody.IsApplicationList = options.isApplicationList;
         }
         if (options.listExperienceOptions) {
-            requestBody.ListExperienceOptions = options.listExperienceOptions;
+            requestBody.ListExperienceOptions = ListExperience_1.ListExperience[options.listExperienceOptions.trim()];
         }
         if (options.majorVersionLimit) {
             requestBody.MajorVersionLimit = options.majorVersionLimit;
@@ -296,6 +296,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
         const telemetryProps = {};
         // add properties with identifiable data
         [
+            'baseTemplate',
             'description',
             'templateFeatureId',
             'schemaXml',
@@ -342,7 +343,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
     this.options.unshift({
         option: '-t, --title <title>'
     }, {
-        option: '--baseTemplate <baseTemplate>',
+        option: '--baseTemplate [baseTemplate]',
         autocomplete: this.listTemplateTypeMap
     }, {
         option: '-u, --webUrl <webUrl>'
@@ -520,9 +521,11 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        const template = ListTemplateType_1.ListTemplateType[args.options.baseTemplate.trim()];
-        if (!template) {
-            return `${args.options.baseTemplate} is not a valid baseTemplate value`;
+        if (args.options.baseTemplate) {
+            const template = ListTemplateType_1.ListTemplateType[args.options.baseTemplate.trim()];
+            if (!template) {
+                return `${args.options.baseTemplate} is not a valid baseTemplate value`;
+            }
         }
         if (args.options.templateFeatureId &&
             !validation_1.validation.isValidGuid(args.options.templateFeatureId)) {
@@ -538,7 +541,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
         }
         if (args.options.draftVersionVisibility) {
             const draftType = DraftVisibilityType_1.DraftVisibilityType[args.options.draftVersionVisibility.trim()];
-            if (!draftType) {
+            if (draftType === undefined) {
                 return `${args.options.draftVersionVisibility} is not a valid draftVisibilityType value`;
             }
         }

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

@@ -150,7 +150,7 @@ class SpoListSetCommand extends SpoCommand_1.default {
             requestBody.DisableGridEditing = options.disableGridEditing;
         }
         if (options.draftVersionVisibility) {
-            requestBody.DraftVersionVisibility = options.draftVersionVisibility;
+            requestBody.DraftVersionVisibility = DraftVisibilityType_1.DraftVisibilityType[options.draftVersionVisibility.trim()];
         }
         if (options.emailAlias) {
             requestBody.EmailAlias = options.emailAlias;
@@ -228,7 +228,7 @@ class SpoListSetCommand extends SpoCommand_1.default {
             requestBody.IsApplicationList = options.isApplicationList;
         }
         if (options.listExperienceOptions) {
-            requestBody.ListExperienceOptions = options.listExperienceOptions;
+            requestBody.ListExperienceOptions = ListExperience_1.ListExperience[options.listExperienceOptions.trim()];
         }
         if (options.majorVersionLimit) {
             requestBody.MajorVersionLimit = options.majorVersionLimit;
@@ -545,7 +545,7 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
         }
         if (args.options.draftVersionVisibility) {
             const draftType = DraftVisibilityType_1.DraftVisibilityType[args.options.draftVersionVisibility.trim()];
-            if (!draftType) {
+            if (draftType === undefined) {
                 return `${args.options.draftVersionVisibility} is not a valid draftVisibilityType value`;
             }
         }

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

@@ -38,7 +38,7 @@ class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
         return ['url'];
     }
     commandAction(logger, args) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Adding navigation node...`);
@@ -56,7 +56,7 @@ class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
                 data: {
                     AudienceIds: (_a = args.options.audienceIds) === null || _a === void 0 ? void 0 : _a.split(','),
                     Title: args.options.title,
-                    Url: args.options.url,
+                    Url: (_b = args.options.url) !== null && _b !== void 0 ? _b : 'http://linkless.header/',
                     IsExternal: args.options.isExternal === true
                 }
             };
@@ -76,7 +76,8 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
             isExternal: args.options.isExternal,
             location: typeof args.options.location !== 'undefined',
             parentNodeId: typeof args.options.parentNodeId !== 'undefined',
-            audienceIds: typeof args.options.audienceIds !== 'undefined'
+            audienceIds: typeof args.options.audienceIds !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
         });
     });
 }, _SpoNavigationNodeAddCommand_initOptions = function _SpoNavigationNodeAddCommand_initOptions() {
@@ -88,7 +89,7 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
     }, {
         option: '-t, --title <title>'
     }, {
-        option: '--url <url>'
+        option: '--url [url]'
     }, {
         option: '--parentNodeId [parentNodeId]'
     }, {

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

@@ -40,10 +40,14 @@ class SpoNavigationNodeSetCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Setting navigation node...`);
                 }
+                let url = args.options.url;
+                if (url === '') {
+                    url = 'http://linkless.header/';
+                }
                 const requestBody = {
                     Title: args.options.title,
                     IsExternal: args.options.isExternal,
-                    Url: args.options.url
+                    Url: url
                 };
                 if (args.options.audienceIds !== undefined) {
                     requestBody.AudienceIds = args.options.audienceIds === '' ? [] : args.options.audienceIds.split(',');

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-get.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 _SpoTenantApplicationCustomizerGetCommand_instances, _SpoTenantApplicationCustomizerGetCommand_initTelemetry, _SpoTenantApplicationCustomizerGetCommand_initOptions, _SpoTenantApplicationCustomizerGetCommand_initValidators, _SpoTenantApplicationCustomizerGetCommand_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 SpoTenantApplicationCustomizerGetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_APPLICATIONCUSTOMIZER_GET;
+    }
+    get description() {
+        return 'Get an application customizer that is installed tenant wide';
+    }
+    constructor() {
+        super();
+        _SpoTenantApplicationCustomizerGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantApplicationCustomizerGetCommand_instances, "m", _SpoTenantApplicationCustomizerGetCommand_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 = '';
+            if (args.options.title) {
+                filter = `Title eq '${args.options.title}'`;
+            }
+            else if (args.options.id) {
+                filter = `GUID eq '${args.options.id}'`;
+            }
+            else if (args.options.clientSideComponentId) {
+                filter = `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'
+            };
+            let listItemInstances;
+            try {
+                listItemInstances = yield request_1.default.get(reqOptions);
+            }
+            catch (err) {
+                return this.handleRejectedODataJsonPromise(err);
+            }
+            if (listItemInstances) {
+                if (listItemInstances.value.length === 0) {
+                    throw new Command_1.CommandError('The specified application customizer was not found');
+                }
+                if (listItemInstances.value.length > 1) {
+                    throw new Command_1.CommandError(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.value.map(item => item.GUID).join(', ')}`);
+                }
+                listItemInstances.value.forEach(v => delete v['ID']);
+                logger.log(listItemInstances.value[0]);
+            }
+            else {
+                throw new Command_1.CommandError('The specified application customizer was not found');
+            }
+        });
+    }
+}
+_SpoTenantApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoTenantApplicationCustomizerGetCommand_initTelemetry = function _SpoTenantApplicationCustomizerGetCommand_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'
+        });
+    });
+}, _SpoTenantApplicationCustomizerGetCommand_initOptions = function _SpoTenantApplicationCustomizerGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    });
+}, _SpoTenantApplicationCustomizerGetCommand_initValidators = function _SpoTenantApplicationCustomizerGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoTenantApplicationCustomizerGetCommand_initOptionSets = function _SpoTenantApplicationCustomizerGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
+};
+module.exports = new SpoTenantApplicationCustomizerGetCommand();
+//# sourceMappingURL=tenant-applicationcustomizer-get.js.map

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

@@ -22,6 +22,7 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const os = require("os");
 class SpoTermGetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.TERM_GET;
@@ -50,32 +51,34 @@ class SpoTermGetCommand extends SpoCommand_1.default {
                     data = `<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="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="13" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="6" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="7" ParentId="6" Name="GetDefaultSiteCollectionTermStore" /><Method Id="13" ParentId="7" Name="GetTerm"><Parameters><Parameter Type="Guid">{${args.options.id}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
                 }
                 else {
-                    const termGroupQuery = args.options.termGroupId ? `<Method Id="98" ParentId="96" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="98" ParentId="96" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
-                    const termSetQuery = args.options.termSetId ? `<Method Id="103" ParentId="101" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="103" ParentId="101" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
-                    data = `<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="91" ObjectPathId="90" /><ObjectIdentityQuery Id="92" ObjectPathId="90" /><ObjectPath Id="94" ObjectPathId="93" /><ObjectIdentityQuery Id="95" ObjectPathId="93" /><ObjectPath Id="97" ObjectPathId="96" /><ObjectPath Id="99" ObjectPathId="98" /><ObjectIdentityQuery Id="100" ObjectPathId="98" /><ObjectPath Id="102" ObjectPathId="101" /><ObjectPath Id="104" ObjectPathId="103" /><ObjectIdentityQuery Id="105" ObjectPathId="103" /><ObjectPath Id="107" ObjectPathId="106" /><ObjectPath Id="109" ObjectPathId="108" /><ObjectIdentityQuery Id="110" ObjectPathId="108" /><Query Id="111" ObjectPathId="108"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="90" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="93" ParentId="90" Name="GetDefaultSiteCollectionTermStore" /><Property Id="96" ParentId="93" Name="Groups" />${termGroupQuery}<Property Id="101" ParentId="98" Name="TermSets" />${termSetQuery}<Property Id="106" ParentId="103" Name="Terms" /><Method Id="108" ParentId="106" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+                    data = `<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" /><ObjectIdentityQuery Id="3" ObjectPathId="1" /><ObjectPath Id="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><ObjectPath Id="8" ObjectPathId="7" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><ObjectPath Id="13" ObjectPathId="12" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectIdentityQuery Id="16" ObjectPathId="14" /><ObjectPath Id="18" ObjectPathId="17" /><SetProperty Id="19" ObjectPathId="17" Name="TrimUnavailable"><Parameter Type="Boolean">true</Parameter></SetProperty><SetProperty Id="20" ObjectPathId="17" Name="TermLabel"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></SetProperty><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><StaticMethod Id="1" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="4" ParentId="1" Name="GetDefaultSiteCollectionTermStore" /><Property Id="7" ParentId="4" Name="Groups" /><Method Id="9" ParentId="7" Name="${args.options.termGroupName === undefined ? "GetById" : "GetByName"}"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName) || args.options.termGroupId}</Parameter></Parameters></Method><Property Id="12" ParentId="9" Name="TermSets" /><Method Id="14" ParentId="12" Name="${args.options.termSetName === undefined ? "GetById" : "GetByName"}"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termSetName) || args.options.termSetId}</Parameter></Parameters></Method><Constructor Id="17" TypeId="{61a1d689-2744-4ea3-a88b-c95bee9803aa}" /><Method Id="21" ParentId="14" Name="GetTerms"><Parameters><Parameter ObjectPathId="17" /></Parameters></Method></ObjectPaths></Request>`;
                 }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    data: data
-                };
-                const processQuery = yield request_1.default.post(requestOptions);
-                const json = JSON.parse(processQuery);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
+                let term;
+                const csomResponse = yield this.executeCsomCall(data, spoAdminUrl, res);
+                if (csomResponse === null) {
+                    throw `Term with id '${args.options.id}' could not be found.`;
                 }
-                const term = json[json.length - 1];
-                if (!term) {
-                    return;
+                else if (csomResponse._Child_Items_ !== undefined) {
+                    const terms = csomResponse;
+                    if (terms._Child_Items_.length === 0) {
+                        throw `Term with name '${args.options.name}' could not be found.`;
+                    }
+                    if (terms._Child_Items_.length > 1) {
+                        const disambiguationText = terms._Child_Items_.map(c => {
+                            return `- ${this.getTermId(c.Id)} - ${c.PathOfTerm}`;
+                        }).join(os.EOL);
+                        throw new Error(`Multiple terms with the specific term name found. Please disambiguate:${os.EOL}${disambiguationText}`);
+                    }
+                    term = terms._Child_Items_[0];
+                }
+                else {
+                    term = csomResponse;
                 }
                 delete term._ObjectIdentity_;
                 delete term._ObjectType_;
-                term.CreatedDate = new Date(Number(term.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-                term.Id = term.Id.replace('/Guid(', '').replace(')/', '');
-                term.LastModifiedDate = new Date(Number(term.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                term.CreatedDate = this.parseTermDateToIsoString(term.CreatedDate);
+                term.Id = this.getTermId(term.Id);
+                term.LastModifiedDate = this.parseTermDateToIsoString(term.LastModifiedDate);
                 logger.log(term);
             }
             catch (err) {
@@ -83,6 +86,31 @@ class SpoTermGetCommand extends SpoCommand_1.default {
             }
         });
     }
+    executeCsomCall(data, spoAdminUrl, res) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': res.FormDigestValue
+                },
+                data: data
+            };
+            const processQuery = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(processQuery);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            const responseObject = json[json.length - 1];
+            return responseObject;
+        });
+    }
+    getTermId(termId) {
+        return termId.replace('/Guid(', '').replace(')/', '');
+    }
+    parseTermDateToIsoString(dateAsString) {
+        return new Date(Number(dateAsString.replace('/Date(', '').replace(')/', ''))).toISOString();
+    }
 }
 _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry = function _SpoTermGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -111,39 +139,31 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
     });
 }, _SpoTermGetCommand_initValidators = function _SpoTermGetCommand_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.name) {
-            if (!args.options.termGroupId && !args.options.termGroupName) {
-                return 'Specify termGroupId or termGroupName';
-            }
-            if (!args.options.termSetId && !args.options.termSetName) {
-                return 'Specify termSetId or termSetName';
-            }
+        if (args.options.termGroupId && !validation_1.validation.isValidGuid(args.options.termGroupId)) {
+            return `${args.options.termGroupId} is not a valid GUID`;
         }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
-        if (args.options.termGroupId) {
-            if (!validation_1.validation.isValidGuid(args.options.termGroupId)) {
-                return `${args.options.termGroupId} is not a valid GUID`;
-            }
-        }
-        if (args.options.termSetId && args.options.termSetName) {
-            return 'Specify termSetId or termSetName but not both';
-        }
-        if (args.options.termSetId) {
-            if (!validation_1.validation.isValidGuid(args.options.termSetId)) {
-                return `${args.options.termSetId} is not a valid GUID`;
-            }
+        if (args.options.termSetId && !validation_1.validation.isValidGuid(args.options.termSetId)) {
+            return `${args.options.termSetId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoTermGetCommand_initOptionSets = function _SpoTermGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({
+        options: ['id', 'name']
+    }, {
+        options: ['termGroupId', 'termGroupName'],
+        runsWhen: (args) => {
+            return args.options.name !== undefined;
+        }
+    }, {
+        options: ['termSetId', 'termSetName'],
+        runsWhen: (args) => {
+            return args.options.name !== undefined;
+        }
+    });
 };
 module.exports = new SpoTermGetCommand();
 //# sourceMappingURL=term-get.js.map

package/dist/m365/spo/commands/user/user-ensure.js

@@ -0,0 +1,105 @@
+"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 _SpoUserEnsureCommand_instances, _SpoUserEnsureCommand_initTelemetry, _SpoUserEnsureCommand_initOptions, _SpoUserEnsureCommand_initValidators, _SpoUserEnsureCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadUser_1 = require("../../../../utils/aadUser");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoUserEnsureCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.USER_ENSURE;
+    }
+    get description() {
+        return 'Ensures that a user is available on a specific site';
+    }
+    constructor() {
+        super();
+        _SpoUserEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Ensuring user ${args.options.aadId || args.options.userName} at site ${args.options.webUrl}`);
+            }
+            try {
+                const requestBody = {
+                    logonName: args.options.userName || (yield this.getUpnByUserId(args.options.aadId, logger))
+                };
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/ensureuser`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                const response = yield request_1.default.post(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getUpnByUserId(aadId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving user principal name for user with id ${aadId}`);
+            }
+            return yield aadUser_1.aadUser.getUpnByUserId(aadId);
+        });
+    }
+}
+_SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelemetry = function _SpoUserEnsureCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            aadId: typeof args.options.aadId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _SpoUserEnsureCommand_initOptions = function _SpoUserEnsureCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--aadId [aadId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _SpoUserEnsureCommand_initValidators = function _SpoUserEnsureCommand_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.aadId && !validation_1.validation.isValidGuid(args.options.aadId)) {
+            return `${args.options.aadId} is not a valid GUID.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        return true;
+    }));
+}, _SpoUserEnsureCommand_initOptionSets = function _SpoUserEnsureCommand_initOptionSets() {
+    this.optionSets.push({ options: ['aadId', 'userName'] });
+};
+module.exports = new SpoUserEnsureCommand();
+//# sourceMappingURL=user-ensure.js.map

package/dist/m365/spo/commands.js

@@ -23,6 +23,11 @@ exports.default = {
     CDN_POLICY_LIST: `${prefix} cdn policy list`,
     CDN_POLICY_SET: `${prefix} cdn policy set`,
     CDN_SET: `${prefix} cdn set`,
+    COMMANDSET_ADD: `${prefix} commandset add`,
+    COMMANDSET_GET: `${prefix} commandset get`,
+    COMMANDSET_LIST: `${prefix} commandset list`,
+    COMMANDSET_REMOVE: `${prefix} commandset remove`,
+    COMMANDSET_SET: `${prefix} commandset set`,
     CONTENTTYPE_ADD: `${prefix} contenttype add`,
     CONTENTTYPE_FIELD_REMOVE: `${prefix} contenttype field remove`,
     CONTENTTYPE_FIELD_SET: `${prefix} contenttype field set`,
@@ -279,6 +284,7 @@ exports.default = {
     TENANT_APPCATALOG_ADD: `${prefix} tenant appcatalog add`,
     TENANT_APPCATALOGURL_GET: `${prefix} tenant appcatalogurl get`,
     TENANT_APPLICATIONCUSTOMIZER_ADD: `${prefix} tenant applicationcustomizer add`,
+    TENANT_APPLICATIONCUSTOMIZER_GET: `${prefix} tenant applicationcustomizer get`,
     TENANT_RECYCLEBINITEM_LIST: `${prefix} tenant recyclebinitem list`,
     TENANT_RECYCLEBINITEM_REMOVE: `${prefix} tenant recyclebinitem remove`,
     TENANT_RECYCLEBINITEM_RESTORE: `${prefix} tenant recyclebinitem restore`,
@@ -298,6 +304,7 @@ exports.default = {
     THEME_LIST: `${prefix} theme list`,
     THEME_REMOVE: `${prefix} theme remove`,
     THEME_SET: `${prefix} theme set`,
+    USER_ENSURE: `${prefix} user ensure`,
     USER_GET: `${prefix} user get`,
     USER_LIST: `${prefix} user list`,
     USER_REMOVE: `${prefix} user remove`,