@pnp/cli-microsoft365 5.0.0-beta.431ccea → 5.0.0-beta.5f22572

package/dist/m365/aad/commands/app/app-add.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
 const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -7,6 +8,10 @@ const Utils_1 = require("../../../../Utils");
 const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
 const commands_1 = require("../../commands");
 class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    constructor() {
+        super(...arguments);
+        this.appName = '';
+    }
     get name() {
         return commands_1.default.APP_ADD;
     }
@@ -32,18 +37,23 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         this
             .resolveApis(args, logger)
             .then(apis => this.createAppRegistration(args, apis, logger))
+            .then(appInfo => {
+            // based on the assumption that we're adding AAD app to the current
+            // directory. If we in the future extend the command with allowing
+            // users to create AAD app in a different directory, we'll need to
+            // adjust this
+            appInfo.tenantId = Utils_1.default.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+            return Promise.resolve(appInfo);
+        })
             .then(appInfo => this.updateAppFromManifest(args, appInfo))
             .then(appInfo => this.configureUri(args, appInfo, logger))
             .then(appInfo => this.configureSecret(args, appInfo, logger))
+            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
             .then((_appInfo) => {
             const appInfo = {
                 appId: _appInfo.appId,
                 objectId: _appInfo.id,
-                // based on the assumption that we're adding AAD app to the current
-                // directory. If we in the future extend the command with allowing
-                // users to create AAD app in a different directory, we'll need to
-                // adjust this
-                tenantId: Utils_1.default.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                tenantId: _appInfo.tenantId
             };
             if (_appInfo.secret) {
                 appInfo.secret = _appInfo.secret;
@@ -60,6 +70,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         if (!applicationInfo.displayName && this.manifest) {
             applicationInfo.displayName = this.manifest.name;
         }
+        this.appName = applicationInfo.displayName;
         if (apis.length > 0) {
             applicationInfo.requiredResourceAccess = apis;
         }
@@ -332,6 +343,45 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             return Promise.resolve(appInfo);
         });
     }
+    saveAppInfo(args, appInfo, logger) {
+        if (!args.options.save) {
+            return Promise.resolve(appInfo);
+        }
+        const filePath = '.m365rc.json';
+        if (this.verbose) {
+            logger.logToStderr(`Saving Azure AD app registration information to the ${filePath} file...`);
+        }
+        let m365rc = {};
+        if (fs.existsSync(filePath)) {
+            if (this.debug) {
+                logger.logToStderr(`Reading existing ${filePath}...`);
+            }
+            try {
+                const fileContents = fs.readFileSync(filePath, 'utf8');
+                if (fileContents) {
+                    m365rc = JSON.parse(fileContents);
+                }
+            }
+            catch (e) {
+                logger.logToStderr(`Error reading ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
+                return Promise.resolve(appInfo);
+            }
+        }
+        if (!m365rc.apps) {
+            m365rc.apps = [];
+        }
+        m365rc.apps.push({
+            appId: appInfo.appId,
+            name: this.appName
+        });
+        try {
+            fs.writeFileSync(filePath, JSON.stringify(m365rc, null, 2));
+        }
+        catch (e) {
+            logger.logToStderr(`Error writing ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
+        }
+        return Promise.resolve(appInfo);
+    }
     options() {
         const options = [
             {
@@ -377,6 +427,9 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             },
             {
                 option: '--manifest [manifest]'
+            },
+            {
+                option: '--save'
             }
         ];
         const parentOptions = super.options();

package/dist/m365/aad/commands/o365group/o365group-add.js

@@ -5,6 +5,7 @@ const path = require("path");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const Utils_1 = require("../../../../Utils");
 class AadO365GroupAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_ADD;
@@ -14,6 +15,8 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let group;
+        let ownerIds = [];
+        let memberIds = [];
         if (this.verbose) {
             logger.logToStderr(`Creating Microsoft 365 Group...`);
         }
@@ -35,8 +38,16 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                 visibility: args.options.isPrivate === 'true' ? 'Private' : 'Public'
             }
         };
-        request_1.default
-            .post(requestOptions)
+        this
+            .getUserIds(logger, args.options.owners)
+            .then((ownerIdsRes) => {
+            ownerIds = ownerIdsRes;
+            return this.getUserIds(logger, args.options.members);
+        })
+            .then((memberIdsRes) => {
+            memberIds = memberIdsRes;
+            return request_1.default.post(requestOptions);
+        })
             .then((res) => {
             group = res;
             if (!args.options.logoPath) {
@@ -61,72 +72,32 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
             });
         })
             .then(() => {
-            if (!args.options.owners) {
-                if (this.debug) {
-                    logger.logToStderr('Owners not set. Skipping');
-                }
-                return Promise.resolve(undefined);
-            }
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group owners...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            if (ownerIds.length === 0) {
+                return Promise.resolve([]);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
+            return Promise.all(ownerIds.map(ownerId => request_1.default.post({
                 url: `${this.resource}/v1.0/groups/${group.id}/owners/$ref`,
                 headers: {
                     'content-type': 'application/json'
                 },
                 responseType: 'json',
                 data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${ownerId}`
                 }
             })));
         })
             .then(() => {
-            if (!args.options.members) {
-                if (this.debug) {
-                    logger.logToStderr('Members not set. Skipping');
-                }
-                return Promise.resolve(undefined);
-            }
-            const members = args.options.members.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group members...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            if (memberIds.length === 0) {
+                return Promise.resolve([]);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
+            return Promise.all(memberIds.map(memberId => request_1.default.post({
                 url: `${this.resource}/v1.0/groups/${group.id}/members/$ref`,
                 headers: {
                     'content-type': 'application/json'
                 },
                 responseType: 'json',
                 data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${memberId}`
                 }
             })));
         })
@@ -135,6 +106,41 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
+    getUserIds(logger, users) {
+        if (!users) {
+            if (this.debug) {
+                logger.logToStderr('No users to validate, skipping.');
+            }
+            return Promise.resolve([]);
+        }
+        if (this.verbose) {
+            logger.logToStderr('Retrieving user information.');
+        }
+        const userArr = users.split(',').map(o => o.trim());
+        let promises = [];
+        let userIds = [];
+        promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise.all(promises).then((usersRes) => {
+            let userUpns = [];
+            userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with group creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
     setGroupLogo(requestOptions, retryLeft, resolve, reject, logger) {
         request_1.default
             .put(requestOptions)

package/dist/m365/base/M365RcJson.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=M365RcJson.js.map

package/dist/m365/search/commands/externalconnection/externalconnection-add.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class SearchExternalConnectionAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.EXTERNALCONNECTION_ADD;
+    }
+    get description() {
+        return 'Adds a new External Connection for Microsoft Search';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.authorizedAppIds = typeof args.options.authorizedAppIds !== undefined;
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        let appIds = [];
+        if (args.options.authorizedAppIds !== undefined &&
+            args.options.authorizedAppIds !== '') {
+            appIds = args.options.authorizedAppIds.split(',');
+        }
+        const commandData = {
+            id: args.options.id,
+            name: args.options.name,
+            description: args.options.description,
+            configuration: {
+                authorizedAppIds: appIds
+            }
+        };
+        const requestOptions = {
+            url: `${this.resource}/v1.0/external/connections`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: commandData
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), err => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id <id>'
+            },
+            {
+                option: '-n, --name <name>'
+            },
+            {
+                option: '-d, --description <description>'
+            },
+            {
+                option: '--authorizedAppIds [authorizedAppIds]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        const id = args.options.id;
+        if (id.length < 3 || id.length > 32) {
+            return 'ID must be between 3 and 32 characters in length.';
+        }
+        const alphaNumericRegEx = /[^\w]|_/g;
+        if (alphaNumericRegEx.test(id)) {
+            return 'ID must only contain alphanumeric characters.';
+        }
+        if (id.length > 9 &&
+            id.startsWith('Microsoft')) {
+            return 'ID cannot begin with Microsoft';
+        }
+        const invalidIds = ['None',
+            'Directory',
+            'Exchange',
+            'ExchangeArchive',
+            'LinkedIn',
+            'Mailbox',
+            'OneDriveBusiness',
+            'SharePoint',
+            'Teams',
+            'Yammer',
+            'Connectors',
+            'TaskFabric',
+            'PowerBI',
+            'Assistant',
+            'TopicEngine',
+            'MSFT_All_Connectors'
+        ];
+        if (invalidIds.indexOf(id) > -1) {
+            return `ID cannot be one of the following values: ${invalidIds.join(', ')}.`;
+        }
+        return true;
+    }
+}
+module.exports = new SearchExternalConnectionAddCommand();
+//# sourceMappingURL=externalconnection-add.js.map

package/dist/m365/search/commands.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'search';
+exports.default = {
+    EXTERNALCONNECTION_ADD: `${prefix} externalconnection add`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.13.1.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const FN001001_DEP_microsoft_sp_core_library_1 = require("./rules/FN001001_DEP_microsoft_sp_core_library");
+const FN001002_DEP_microsoft_sp_lodash_subset_1 = require("./rules/FN001002_DEP_microsoft_sp_lodash_subset");
+const FN001003_DEP_microsoft_sp_office_ui_fabric_core_1 = require("./rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core");
+const FN001004_DEP_microsoft_sp_webpart_base_1 = require("./rules/FN001004_DEP_microsoft_sp_webpart_base");
+const FN001011_DEP_microsoft_sp_dialog_1 = require("./rules/FN001011_DEP_microsoft_sp_dialog");
+const FN001012_DEP_microsoft_sp_application_base_1 = require("./rules/FN001012_DEP_microsoft_sp_application_base");
+const FN001013_DEP_microsoft_decorators_1 = require("./rules/FN001013_DEP_microsoft_decorators");
+const FN001014_DEP_microsoft_sp_listview_extensibility_1 = require("./rules/FN001014_DEP_microsoft_sp_listview_extensibility");
+const FN001021_DEP_microsoft_sp_property_pane_1 = require("./rules/FN001021_DEP_microsoft_sp_property_pane");
+const FN001023_DEP_microsoft_sp_component_base_1 = require("./rules/FN001023_DEP_microsoft_sp_component_base");
+const FN001024_DEP_microsoft_sp_diagnostics_1 = require("./rules/FN001024_DEP_microsoft_sp_diagnostics");
+const FN001025_DEP_microsoft_sp_dynamic_data_1 = require("./rules/FN001025_DEP_microsoft_sp_dynamic_data");
+const FN001026_DEP_microsoft_sp_extension_base_1 = require("./rules/FN001026_DEP_microsoft_sp_extension_base");
+const FN001027_DEP_microsoft_sp_http_1 = require("./rules/FN001027_DEP_microsoft_sp_http");
+const FN001028_DEP_microsoft_sp_list_subscription_1 = require("./rules/FN001028_DEP_microsoft_sp_list_subscription");
+const FN001029_DEP_microsoft_sp_loader_1 = require("./rules/FN001029_DEP_microsoft_sp_loader");
+const FN001030_DEP_microsoft_sp_module_interfaces_1 = require("./rules/FN001030_DEP_microsoft_sp_module_interfaces");
+const FN001031_DEP_microsoft_sp_odata_types_1 = require("./rules/FN001031_DEP_microsoft_sp_odata_types");
+const FN001032_DEP_microsoft_sp_page_context_1 = require("./rules/FN001032_DEP_microsoft_sp_page_context");
+const FN002001_DEVDEP_microsoft_sp_build_web_1 = require("./rules/FN002001_DEVDEP_microsoft_sp_build_web");
+const FN002002_DEVDEP_microsoft_sp_module_interfaces_1 = require("./rules/FN002002_DEVDEP_microsoft_sp_module_interfaces");
+const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
+const FN006004_CFG_PS_developer_1 = require("./rules/FN006004_CFG_PS_developer");
+const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
+module.exports = [
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.13.1'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.13.1'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.13.1'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.13.1'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.13.1'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.13.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.13.1'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.13.1'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.13.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.13.1'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.13.1'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.13.1'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.13.1'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.13.1'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.13.1'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.13.1'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.13.1'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.13.1'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.13.1'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.13.1'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.13.1'),
+    new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('1.13.1'),
+    new FN006004_CFG_PS_developer_1.FN006004_CFG_PS_developer('1.13.1'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.13.1')
+];
+//# sourceMappingURL=upgrade-1.13.1.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -41,7 +41,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.11.0',
             '1.12.0',
             '1.12.1',
-            '1.13.0'
+            '1.13.0',
+            '1.13.1'
         ];
     }
     get name() {

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -433,6 +433,25 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.13.1': {
+                gulp: {
+                    range: '^4',
+                    fix: 'npm i -g gulp@4'
+                },
+                node: {
+                    range: '^12 || ^14',
+                    fix: 'Install Node.js v12 or v14'
+                },
+                react: {
+                    range: '16.9.0',
+                    fix: 'npm i react@16.9.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
     }

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

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoContentTypeListCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.CONTENTTYPE_LIST;
+    }
+    get description() {
+        return 'Lists all available content types in the specified site';
+    }
+    defaultProperties() {
+        return ['StringId', 'Name', 'Hidden', 'ReadOnly', 'Sealed'];
+    }
+    commandAction(logger, args, cb) {
+        let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
+        if (args.options.category) {
+            requestUrl += `?$filter=Group eq '${encodeURIComponent(args.options.category)}'`;
+        }
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res.value);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            },
+            {
+                option: '-c, --category [category]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoContentTypeListCommand();
+//# sourceMappingURL=contenttype-list.js.map

package/dist/m365/spo/commands/page/Page.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Page = void 0;
+exports.Page = exports.supportedPromoteAs = exports.supportedPageLayouts = void 0;
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
 const clientsidepages_1 = require("./clientsidepages");
 const pageMethods_1 = require("./pageMethods");
+exports.supportedPageLayouts = ['Article', 'Home', 'SingleWebPartAppPage', 'RepostPage', 'HeaderlessSearchResults', 'Spaces', 'Topic'];
+exports.supportedPromoteAs = ['HomePage', 'NewsPage', 'Template'];
 class Page {
     static getPage(name, webUrl, logger, debug, verbose) {
         return new Promise((resolve, reject) => {

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

@@ -284,11 +284,11 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             },
             {
                 option: '-l, --layoutType [layoutType]',
-                autocomplete: ['Article', 'Home']
+                autocomplete: Page_1.supportedPageLayouts
             },
             {
                 option: '-p, --promoteAs [promoteAs]',
-                autocomplete: ['HomePage', 'NewsPage', 'Template']
+                autocomplete: Page_1.supportedPromoteAs
             },
             {
                 option: '--commentsEnabled'
@@ -312,20 +312,17 @@ class SpoPageAddCommand extends SpoCommand_1.default {
             return isValidSharePointUrl;
         }
         if (args.options.layoutType &&
-            args.options.layoutType !== 'Article' &&
-            args.options.layoutType !== 'Home') {
-            return `${args.options.layoutType} is not a valid option for layoutType. Allowed values Article|Home`;
+            Page_1.supportedPageLayouts.indexOf(args.options.layoutType) < 0) {
+            return `${args.options.layoutType} is not a valid option for layoutType. Allowed values ${Page_1.supportedPageLayouts.join(', ')}`;
         }
         if (args.options.promoteAs &&
-            args.options.promoteAs !== 'HomePage' &&
-            args.options.promoteAs !== 'NewsPage' &&
-            args.options.promoteAs !== 'Template') {
-            return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values HomePage|NewsPage|Template`;
+            Page_1.supportedPromoteAs.indexOf(args.options.promoteAs) < 0) {
+            return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values ${Page_1.supportedPromoteAs.join(', ')}`;
         }
         if (args.options.promoteAs === 'HomePage' && args.options.layoutType !== 'Home') {
             return 'You can only promote home pages as site home page';
         }
-        if (args.options.promoteAs === 'NewsPage' && args.options.layoutType === 'Home') {
+        if (args.options.promoteAs === 'NewsPage' && args.options.layoutType && args.options.layoutType !== 'Article') {
             return 'You can only promote article pages as news article';
         }
         return true;

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

@@ -283,11 +283,11 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             },
             {
                 option: '-l, --layoutType [layoutType]',
-                autocomplete: ['Article', 'Home']
+                autocomplete: Page_1.supportedPageLayouts
             },
             {
                 option: '-p, --promoteAs [promoteAs]',
-                autocomplete: ['HomePage', 'NewsPage', 'Template']
+                autocomplete: Page_1.supportedPromoteAs
             },
             {
                 option: '--commentsEnabled [commentsEnabled]',
@@ -315,20 +315,17 @@ class SpoPageSetCommand extends SpoCommand_1.default {
             return isValidSharePointUrl;
         }
         if (args.options.layoutType &&
-            args.options.layoutType !== 'Article' &&
-            args.options.layoutType !== 'Home') {
-            return `${args.options.layoutType} is not a valid option for layoutType. Allowed values Article|Home`;
+            Page_1.supportedPageLayouts.indexOf(args.options.layoutType) < 0) {
+            return `${args.options.layoutType} is not a valid option for layoutType. Allowed values ${Page_1.supportedPageLayouts.join(', ')}`;
         }
         if (args.options.promoteAs &&
-            args.options.promoteAs !== 'HomePage' &&
-            args.options.promoteAs !== 'NewsPage' &&
-            args.options.promoteAs !== 'Template') {
-            return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values HomePage|NewsPage|Template`;
+            Page_1.supportedPromoteAs.indexOf(args.options.promoteAs) < 0) {
+            return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values ${Page_1.supportedPromoteAs.join(', ')}`;
         }
         if (args.options.promoteAs === 'HomePage' && args.options.layoutType !== 'Home') {
             return 'You can only promote home pages as site home page';
         }
-        if (args.options.promoteAs === 'NewsPage' && args.options.layoutType === 'Home') {
+        if (args.options.promoteAs === 'NewsPage' && args.options.layoutType && args.options.layoutType !== 'Article') {
             return 'You can only promote article pages as news article';
         }
         if (typeof args.options.commentsEnabled !== 'undefined' &&

package/dist/m365/spo/commands.js

@@ -22,9 +22,10 @@ exports.default = {
     CDN_POLICY_SET: `${prefix} cdn policy set`,
     CDN_SET: `${prefix} cdn set`,
     CONTENTTYPE_ADD: `${prefix} contenttype add`,
-    CONTENTTYPE_GET: `${prefix} contenttype get`,
     CONTENTTYPE_FIELD_REMOVE: `${prefix} contenttype field remove`,
     CONTENTTYPE_FIELD_SET: `${prefix} contenttype field set`,
+    CONTENTTYPE_GET: `${prefix} contenttype get`,
+    CONTENTTYPE_LIST: `${prefix} contenttype list`,
     CONTENTTYPE_REMOVE: `${prefix} contenttype remove`,
     CONTENTTYPEHUB_GET: `${prefix} contenttypehub get`,
     CUSTOMACTION_ADD: `${prefix} customaction add`,

package/docs/docs/cmd/aad/app/app-add.md

@@ -52,6 +52,9 @@ m365 aad app add [options]
 `--manifest [manifest]`
 : Azure AD app manifest as retrieved from the Azure Portal to create the app registration from
 
+`--save`
+: Use to store the information about the created app in a local file
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
@@ -80,6 +83,8 @@ When using the `withSecret` option, this command will automatically generate a s
 
 After creating the Azure AD app registration, this command returns the app ID and object ID of the created app registration. If you used the `withSecret` option, it will also return the generated secret.
 
+If you want to store the information about the created Azure AD app registration, use the `--save` option. This is useful when you build solutions connected to Microsoft 365 and want to easily manage app registrations used with your solution. When you use the `--save` option, after you create the app registration, the command will write its ID and name to the `.m365rc.json` file in the current directory. If the file already exists, it will add the information about the to it, allowing you to track multiple apps. If the file doesn't exist, the command will create it.
+
 ## Examples
 
 Create new Azure AD app registration with the specified name
@@ -141,3 +146,9 @@ Create new Azure AD app registration with Application ID URI set to a value that
 ```sh
 m365 aad app add --name 'My AAD app' --uri api://caf406b91cd4.ngrok.io/_appId_ --scopeName access_as_user --scopeAdminConsentDescription 'Access as a user' --scopeAdminConsentDisplayName 'Access as a user' --scopeConsentBy adminsAndUsers
 ```
+
+Create new Azure AD app registration with the specified name. Store information about the created app registration in the _.m365rc.json_ file in the current directory.
+
+```sh
+m365 aad app add --name 'My AAD app' --save
+```

package/docs/docs/cmd/aad/o365group/o365group-add.md

@@ -36,6 +36,7 @@ m365 aad o365group add [options]
 ## Remarks
 
 When specifying the path to the logo image you can use both relative and absolute paths. Note, that ~ in the path, will not be resolved and will most likely result in an error.
+If an invalid user is provided in the comma-separated list or Owners or Members, the command operation will fail and the Micrsoft 365 Group will not be created.
 
 ## Examples
 

package/docs/docs/cmd/search/externalconnection/externalconnection-add.md

@@ -0,0 +1,43 @@
+# search externalconnection add
+
+Add a new external connection to be defined for Microsoft Search
+
+## Usage
+
+```sh
+m365 search externalconnection add [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: Developer-provided unique ID of the connection within the Azure Active Directory tenant
+
+`-n, --name <name>`
+: The display name of the connection to be displayed in the Microsoft 365 admin center. Maximum length of 128 characters
+
+`-d, --description <description>`
+: Description of the connection displayed in the Microsoft 365 admin center
+
+`--authorizedAppIds [authorizedAppIds]`
+: Comma-separated collection of application IDs for registered Azure Active Directory apps that are allowed to manage the external connection and to index content in the external connection.
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+The `id` must be at least 3 and no more than 32 characters long. It can contain only alphanumeric characters, can't begin with _Microsoft_ and can be any of the following values: *None, Directory, Exchange, ExchangeArchive, LinkedIn, Mailbox, OneDriveBusiness, SharePoint, Teams, Yammer, Connectors, TaskFabric, PowerBI, Assistant, TopicEngine, MSFT_All_Connectors*.
+
+## Examples
+
+Adds a new external connection with name and description of test
+
+```sh
+m365 search externalconnection add --id MyApp --name "My application" --description "Description of your application"
+```
+
+Adds a new external connection with a limited number of authorized apps
+
+```sh
+m365 search externalconnection add --id MyApp --name "My application" --description "Description of your application" --authorizedAppIds  "00000000-0000-0000-0000-000000000000,00000000-0000-0000-0000-000000000001,00000000-0000-0000-0000-000000000002"
+```

package/docs/docs/cmd/spfx/project/project-upgrade.md

@@ -32,7 +32,7 @@ m365 spfx project upgrade [options]
 
 ## Remarks
 
-The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.13.0).
+The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.13.1).
 
 This command doesn't change your project files. Instead, it gives you a report with all steps necessary to upgrade your project to the specified version of the SharePoint Framework. Changing project files is error-prone, especially when it comes to updating your solution's code. This is why at this moment, this command produces a report that you can use yourself to perform the necessary updates and verify that everything is working as expected.
 

package/docs/docs/cmd/spo/contenttype/contenttype-list.md

@@ -0,0 +1,33 @@
+# spo contenttype list
+
+Lists content types from specified site
+
+## Usage
+
+```sh
+m365 spo contenttype list [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: Absolute URL of the site for which to list content types
+
+`-c, --category [category]`
+: Category name of content types. When defined will return only content types from specified category
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Retrieve site content types
+
+```PowerShell
+m365 spo contenttype list --webUrl "https://contoso.sharepoint.com/sites/contoso-sales"
+```
+
+Retrieve site content types from the 'List Content Types' category
+
+```PowerShell
+m365 spo contenttype list --webUrl "https://contoso.sharepoint.com/sites/contoso-sales" --category "List Content Types"
+```

package/docs/docs/cmd/spo/page/page-add.md

@@ -20,10 +20,10 @@ m365 spo page add [options]
 : Title of the page to create. If not specified, will use the page name as its title
 
 `-l, --layoutType [layoutType]`
-: Layout of the page. Allowed values `Article,Home`. Default `Article`
+: Layout of the page. Allowed values `Article`, `Home`, `SingleWebPartAppPage`, `RepostPage`,`HeaderlessSearchResults`, `Spaces`, `Topic`. Default `Article`
 
 `-p, --promoteAs [promoteAs]`
-: Create the page for a specific purpose. Allowed values `HomePage,NewsPage`
+: Create the page for a specific purpose. Allowed values `HomePage`, `NewsPage`
 
 `--commentsEnabled`
 : Set to enable comments on the page

package/docs/docs/cmd/spo/page/page-set.md

@@ -17,13 +17,13 @@ m365 spo page set [options]
 : URL of the site where the page to update is located
 
 `-l, --layoutType [layoutType]`
-: Layout of the page. Allowed values `Article,Home`
+: Layout of the page. Allowed values `Article`, `Home`, `SingleWebPartAppPage`, `RepostPage`,`HeaderlessSearchResults`, `Spaces`, `Topic`
 
 `-p, --promoteAs [promoteAs]`
-: Update the page purpose. Allowed values `HomePage,NewsPage`
+: Update the page purpose. Allowed values `HomePage`, `NewsPage`
 
 `--commentsEnabled [commentsEnabled]`
-: Set to `true`, to enable comments on the page. Allowed values `true,false`
+: Set to `true`, to enable comments on the page. Allowed values `true`, `false`
 
 `--publish`
 : Set to publish the page

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "5.0.0-beta.431ccea",
+  "version": "5.0.0-beta.5f22572",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -122,6 +122,7 @@
     "Levert, Sebastien <slevert@outlook.com>",
     "Maillot, Michaël <battosaimykle@gmail.com>",
     "Mastykarz, Waldek <waldek@mastykarz.nl>",
+    "McDonnell, Kevin <kevin@mcd79.com>",
     "Menon, Arjun <arjun.umenon@gmail.com>",
     "Moujahid, Abderahman <rags_place@hotmail.com>",
     "Mücklisch, Steve <steve.muecklisch@gmail.com>",