@pnp/cli-microsoft365 6.4.0-beta.6b65014 → 6.4.0-beta.8c5ba0e

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

@@ -15,15 +15,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
-const AadGroupGetCommand = require("../../../aad/commands/group/group-get");
-const SpoUserGetCommand = require("../user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const spo_1 = require("../../../../utils/spo");
 class SpoGroupMemberAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.GROUP_MEMBER_ADD;
@@ -48,21 +47,20 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
                 const groupId = yield this.getGroupId(args, logger);
                 const resolvedUsernameList = yield this.getValidUsers(args, logger);
                 if (this.verbose) {
-                    logger.logToStderr(`Adding user(s) to SharePoint Group ${args.options.groupId || args.options.groupName}`);
+                    logger.logToStderr(`Adding resource(s) to SharePoint Group ${args.options.groupId || args.options.groupName}`);
                 }
-                const data = {
-                    url: args.options.webUrl,
-                    peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
-                    roleValue: `group:${groupId}`
-                };
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
                     headers: {
-                        'Accept': 'application/json;odata=nometadata',
-                        'Content-type': 'application/json;odata=verbose'
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
                     },
-                    data: data,
-                    responseType: 'json'
+                    responseType: 'json',
+                    data: {
+                        url: args.options.webUrl,
+                        peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
+                        roleValue: `group:${groupId}`
+                    }
                 };
                 const sharingResult = yield request_1.default.post(requestOptions);
                 if (sharingResult.ErrorMessage !== null) {
@@ -83,7 +81,7 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
             `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
             `GetById('${args.options.groupId}')`;
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}`,
+            url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}?$select=Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -91,91 +89,52 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
         };
         return request_1.default
             .get(requestOptions)
-            .then(response => {
-            const groupId = response.Id;
-            if (!groupId) {
-                return Promise.reject(`The specified group does not exist in the SharePoint site`);
-            }
-            return groupId;
-        });
+            .then(response => response.Id);
     }
     getValidUsers(args, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Checking if the specified users exist`);
-        }
-        const validUserNames = [];
-        const invalidUserNames = [];
-        const userIdentifiers = args.options.userName || args.options.email || args.options.aadGroupId || args.options.aadGroupName || args.options.userId.toString();
-        return Promise
-            .all(userIdentifiers.split(',').map((userIdentifier) => __awaiter(this, void 0, void 0, function* () {
-            const user = userIdentifier.trim();
-            try {
-                if (args.options.userId) {
-                    yield this.spoUserGet(args.options, user, logger, validUserNames);
-                }
-                else if (args.options.aadGroupId || args.options.aadGroupName) {
-                    yield this.aadGroupGet(args.options, user, logger, validUserNames);
-                }
-                else {
-                    yield this.aadUserGet(args.options, user, logger, validUserNames);
-                }
-            }
-            catch (err) {
-                logger.logToStderr(err.stderr);
-                invalidUserNames.push(userIdentifier);
-                return err;
-            }
-        })))
-            .then(() => {
-            if (invalidUserNames.length > 0) {
-                return Promise.reject(`Users not added to the group because the following users don't exist: ${invalidUserNames.join(', ')}`);
-            }
-            return Promise.resolve(validUserNames);
-        });
-    }
-    aadUserGet(options, userIdentifier, logger, validUserNames) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Get UPN from Azure AD for user ${userIdentifier}`);
+                logger.logToStderr('Checking if the specified users and groups exist');
             }
-            const aadUserGetCommandoptions = Object.assign(Object.assign(Object.assign({}, (options.userName && { userName: userIdentifier })), (options.email && { email: userIdentifier })), { output: 'json', debug: options.debug, verbose: options.verbose });
-            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
-            if (this.debug) {
-                logger.logToStderr(aadUserGetOutput.stderr);
-            }
-            validUserNames.push(JSON.parse(aadUserGetOutput.stdout).userPrincipalName);
-        });
-    }
-    aadGroupGet(options, userIdentifier, logger, validUserNames) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.verbose) {
-                logger.logToStderr(`Get UPN from Azure AD for group ${userIdentifier}`);
-            }
-            const aadUserGetCommandoptions = Object.assign(Object.assign(Object.assign({}, (options.aadGroupId && { id: userIdentifier })), (options.aadGroupName && { title: userIdentifier })), { output: 'json', debug: options.debug, verbose: options.verbose });
-            const aadGroupGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadGroupGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
-            if (this.debug) {
-                logger.logToStderr(aadGroupGetOutput.stderr);
-            }
-            validUserNames.push(JSON.parse(aadGroupGetOutput.stdout).mail);
-        });
-    }
-    spoUserGet(options, userIdentifier, logger, validUserNames) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.verbose) {
-                logger.logToStderr(`Get UPN from SharePoint for user ${userIdentifier}`);
-            }
-            const spoUserGetCommandoptions = {
-                id: userIdentifier,
-                webUrl: options.webUrl,
-                output: 'json',
-                debug: options.debug,
-                verbose: options.verbose
-            };
-            const spoUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, spoUserGetCommandoptions), { _: [] }) });
-            if (this.debug) {
-                logger.logToStderr(spoUserGetOutput.stderr);
-            }
-            validUserNames.push(JSON.parse(spoUserGetOutput.stdout).UserPrincipalName);
+            const validUserNames = [];
+            const identifiers = (_d = (_c = (_b = (_a = args.options.userName) !== null && _a !== void 0 ? _a : args.options.email) !== null && _b !== void 0 ? _b : args.options.aadGroupId) !== null && _c !== void 0 ? _c : args.options.aadGroupName) !== null && _d !== void 0 ? _d : args.options.userId.toString();
+            yield Promise.all(identifiers.split(',').map((identifier) => __awaiter(this, void 0, void 0, function* () {
+                const trimmedIdentifier = identifier.trim();
+                try {
+                    if (args.options.userId) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Getting AAD ID of user with ID ${trimmedIdentifier}`);
+                        }
+                        const spoUserAzureId = yield spo_1.spo.getUserAzureIdBySpoId(args.options.webUrl, trimmedIdentifier);
+                        validUserNames.push(spoUserAzureId);
+                    }
+                    else if (args.options.userName) {
+                        validUserNames.push(trimmedIdentifier);
+                    }
+                    else if (args.options.aadGroupId) {
+                        validUserNames.push(trimmedIdentifier);
+                    }
+                    else if (args.options.aadGroupName) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
+                        }
+                        const groupId = yield aadGroup_1.aadGroup.getGroupIdByDisplayName(trimmedIdentifier);
+                        validUserNames.push(groupId);
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.logToStderr(`Getting Azure AD ID for user ${trimmedIdentifier}`);
+                        }
+                        const upn = yield aadUser_1.aadUser.getUserIdByEmail(trimmedIdentifier);
+                        validUserNames.push(upn);
+                    }
+                }
+                catch (err) {
+                    throw `Resource '${trimmedIdentifier}' does not exist.`;
+                }
+            })));
+            return validUserNames;
         });
     }
     getFormattedUserList(activeUserList) {

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/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

@@ -279,6 +279,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 +299,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`,

package/dist/utils/aadUser.js

@@ -33,6 +33,43 @@ exports.aadUser = {
             }
             return res.value[0].id;
         });
+    },
+    /**
+    * Retrieve the ID of a user by its email.
+    * @param mail User email.
+    */
+    getUserIdByEmail(email) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${graphResource}/v1.0/users?$filter=mail eq '${formatting_1.formatting.encodeQueryParameter(email)}'&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            if (res.value.length === 0) {
+                throw Error(`The specified user with email ${email} does not exist`);
+            }
+            return res.value[0].id;
+        });
+    },
+    /**
+     * Retrieve the UPN of a user by its ID.
+     * @param id User ID.
+     */
+    getUpnByUserId(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${graphResource}/v1.0/users/${id}?$select=userPrincipalName`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return res.userPrincipalName;
+        });
     }
 };
 //# sourceMappingURL=aadUser.js.map

package/dist/utils/md.js

@@ -51,6 +51,12 @@ function convertContentTabs(md) {
         return `  ${title}${os_1.EOL}${os_1.EOL}${content.replace(/^    /gms, '')}`;
     });
 }
+function convertMdOutput(md) {
+    const regex = new RegExp('(?<=^    ```md)(.*)(?=    ```)', 'gms');
+    return md.replace(regex, (match, content) => {
+        return content.replace(/^    /gms, '');
+    });
+}
 function convertCodeFences(md) {
     const regex = new RegExp('^```.*?(?:\r\n|\n)(.*?)```(?:\r\n|\n)', 'gms');
     return md.replace(regex, (match, code) => {
@@ -79,6 +85,7 @@ const convertFunctions = [
     convertAdmonitions,
     convertDd,
     convertHyperlinks,
+    convertMdOutput,
     convertContentTabs,
     convertCodeFences,
     removeInlineMarkup,

package/dist/utils/spo.js

@@ -536,6 +536,38 @@ exports.spo = {
             const customActionOnSite = yield getById(webUrl, id, "Site");
             return customActionOnSite;
         });
+    },
+    getTenantAppCatalogUrl(logger, debug) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spoUrl = yield exports.spo.getSpoUrl(logger, debug);
+            const requestOptions = {
+                url: `${spoUrl}/_api/SP_TenantSettings_Current`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const result = yield request_1.default.get(requestOptions);
+            return result.CorporateCatalogUrl;
+        });
+    },
+    /**
+     * Retrieves the Azure AD ID from a SP user.
+     * @param webUrl Web url
+     * @param id The Id of the user
+     */
+    getUserAzureIdBySpoId(webUrl, id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${webUrl}/_api/web/siteusers/GetById('${formatting_1.formatting.encodeQueryParameter(id)}')?$select=AadObjectId`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return res.AadObjectId.NameId;
+        });
     }
 };
 //# sourceMappingURL=spo.js.map

package/docs/docs/cmd/cli/completion/completion-clink-update.md

@@ -12,16 +12,16 @@ m365 cli completion clink update [options]
 
 --8<-- "docs/cmd/_global.md"
 
-!!! important
-    Before running this command, change the working directory to where your shell stores completion plugins. For cmder, it's `%CMDER_ROOT%\vendor\clink-completions`, where `%CMDER_ROOT%` is the folder where you installed cmder. After running this command, restart your terminal to load the completion.
-
 ## Remarks
 
 This commands updates the list of commands and their options used by command completion in Clink (cmder). You should run this command each time after upgrading the CLI for Microsoft 365.
 
+!!! important
+    Before running this command, change the working directory to where your shell stores completion plugins. For cmder, it's `%CMDER_ROOT%\vendor\clink-completions`, where `%CMDER_ROOT%` is the folder where you installed cmder. After running this command, restart your terminal to load the completion.
+
 ## Examples
 
-Write the list of commands for Clink (cmder) command completion to a file named `m365.lua` in the current directory
+Write the list of commands for Clink (cmder) command completion to a file named `m365.lua` in the current directory.
 
 ```powershell
 m365 cli completion clink update > m365.lua

package/docs/docs/cmd/onenote/page/page-list.md

@@ -118,7 +118,7 @@ m365 onenote page list --webUrl https://contoso.sharepoint.com/sites/testsite
 === "Markdown"
 
     ```md
-    # onenote page list --userName "mathijs@mathijsdev2.onmicrosoft.com"
+    # onenote page list --userName "john.doe@contoso.onmicrosoft.com"
 
     Date: 07/01/2023