@pnp/cli-microsoft365 4.4.0 → 5.0.0-beta.2d81d43

package/.eslintrc.js

@@ -23,6 +23,7 @@ const dictionary = [
   'group',
   'groupify',
   'guest',
+  'health',
   'hide',
   'historical',
   'home',

package/dist/m365/aad/commands/oauth2grant/oauth2grant-list.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
-const AadCommand_1 = require("../../../base/AadCommand");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadOAuth2GrantListCommand extends AadCommand_1.default {
+class AadOAuth2GrantListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.OAUTH2GRANT_LIST;
     }
@@ -19,9 +19,9 @@ class AadOAuth2GrantListCommand extends AadCommand_1.default {
             logger.logToStderr(`Retrieving list of OAuth grants for the service principal...`);
         }
         const requestOptions = {
-            url: `${this.resource}/myorganization/oauth2PermissionGrants?api-version=1.6&$filter=clientId eq '${encodeURIComponent(args.options.clientId)}'`,
+            url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${encodeURIComponent(args.options.spObjectId)}'`,
             headers: {
-                accept: 'application/json;odata=nometadata'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
@@ -37,15 +37,15 @@ class AadOAuth2GrantListCommand extends AadCommand_1.default {
     options() {
         const options = [
             {
-                option: '-i, --clientId <clientId>'
+                option: '-i, --spObjectId <spObjectId>'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.clientId)) {
-            return `${args.options.clientId} is not a valid GUID`;
+        if (!Utils_1.default.isValidGuid(args.options.spObjectId)) {
+            return `${args.options.spObjectId} is not a valid GUID`;
         }
         return true;
     }

package/dist/m365/aad/commands/oauth2grant/oauth2grant-remove.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -11,24 +12,47 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand_1.default {
         return 'Remove specified service principal OAuth2 permissions';
     }
     commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Removing OAuth2 permissions...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
-            headers: {
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
+        const removeOauth2Grant = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing OAuth2 permissions...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .delete(requestOptions)
+                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
         };
-        request_1.default
-            .delete(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        if (args.options.confirm) {
+            removeOauth2Grant();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeOauth2Grant();
+                }
+            });
+        }
     }
     options() {
         const options = [
             {
                 option: '-i, --grantId <grantId>'
+            },
+            {
+                option: '--confirm'
             }
         ];
         const parentOptions = super.options();

package/dist/m365/aad/commands/sp/sp-get.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
-const AadCommand_1 = require("../../../base/AadCommand");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadSpGetCommand extends AadCommand_1.default {
+class AadSpGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.SP_GET;
     }
@@ -18,35 +18,58 @@ class AadSpGetCommand extends AadCommand_1.default {
         telemetryProps.objectId = (!(!args.options.objectId)).toString();
         return telemetryProps;
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving service principal information...`);
+    getSpId(args) {
+        if (args.options.objectId) {
+            return Promise.resolve(args.options.objectId);
         }
         let spMatchQuery = '';
-        if (args.options.appId) {
-            spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
-        }
-        else if (args.options.objectId) {
-            spMatchQuery = `objectId eq '${encodeURIComponent(args.options.objectId)}'`;
-        }
-        else {
+        if (args.options.displayName) {
             spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
         }
-        const requestOptions = {
-            url: `${this.resource}/myorganization/servicePrincipals?api-version=1.6&$filter=${spMatchQuery}`,
+        else if (args.options.appId) {
+            spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
+        }
+        const idRequestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
             headers: {
-                accept: 'application/json;odata=nometadata'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value && res.value.length > 0) {
-                logger.log(res.value[0]);
+        return request_1.default
+            .get(idRequestOptions)
+            .then(response => {
+            const spItem = response.value[0];
+            if (!spItem) {
+                return Promise.reject(`The specified Azure AD app does not exist`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
             }
+            return Promise.resolve(spItem.id);
+        });
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving service principal information...`);
+        }
+        this
+            .getSpId(args)
+            .then((id) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals/${id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((res) => {
+            logger.log(res);
             cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     options() {
         const options = [

package/dist/m365/aad/commands/user/user-list.js

@@ -15,6 +15,7 @@ class AadUserListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.properties = args.options.properties;
+        telemetryProps.deleted = typeof args.options.deleted !== 'undefined';
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
@@ -22,7 +23,8 @@ class AadUserListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             args.options.properties.split(',').map(p => p.trim()) :
             ['userPrincipalName', 'displayName'];
         const filter = this.getFilter(args.options);
-        const url = `${this.resource}/v1.0/users?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
+        const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
+        const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
         this
             .getAllItems(url, logger, true)
             .then(() => {
@@ -35,6 +37,8 @@ class AadUserListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         const excludeOptions = [
             'properties',
             'p',
+            'deleted',
+            'd',
             'debug',
             'verbose',
             'output',
@@ -55,9 +59,8 @@ class AadUserListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
     }
     options() {
         const options = [
-            {
-                option: '-p, --properties [properties]'
-            }
+            { option: '-p, --properties [properties]' },
+            { option: '-d, --deleted' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);

package/dist/m365/flow/commands/flow-get.js

@@ -29,8 +29,8 @@ class FlowGetCommand extends AzmgmtCommand_1.default {
             .then((res) => {
             res.displayName = res.properties.displayName;
             res.description = res.properties.definitionSummary.description || '';
-            res.triggers = Object.keys(res.properties.definition.triggers).join(', ');
-            res.actions = Object.keys(res.properties.definition.actions).join(', ');
+            res.triggers = res.properties.definitionSummary.triggers.map((t) => (t.type + (t.kind ? "-" + t.kind : ''))).join(', ');
+            res.actions = res.properties.definitionSummary.actions.map((a) => (a.type + (a.swaggerOperationId ? "-" + a.swaggerOperationId : ''))).join(', ');
             logger.log(res);
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));

package/dist/m365/planner/commands/task/task-details-get.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class PlannerTaskDetailsGetCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.TASK_DETAILS_GET;
+    }
+    get description() {
+        return 'Retrieve the details of the specified planner task';
+    }
+    commandAction(logger, args, cb) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.taskId)}/details`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --taskId <taskId>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new PlannerTaskDetailsGetCommand();
+//# sourceMappingURL=task-details-get.js.map

package/dist/m365/planner/commands/task/task-get.js

@@ -0,0 +1,37 @@
+"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 PlannerTaskGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.TASK_GET;
+    }
+    get description() {
+        return 'Retrieve the the specified planner task';
+    }
+    commandAction(logger, args, cb) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.id)}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            { option: '-i, --id <id>' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new PlannerTaskGetCommand();
+//# sourceMappingURL=task-get.js.map

package/dist/m365/planner/commands.js

@@ -8,6 +8,8 @@ exports.default = {
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
     TASK_ADD: `${prefix} task add`,
+    TASK_DETAILS_GET: `${prefix} task details get`,
+    TASK_GET: `${prefix} task get`,
     TASK_LIST: `${prefix} task list`,
     TASK_SET: `${prefix} task set`
 };

package/dist/m365/spo/commands/group/group-user-remove.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.GROUP_USER_REMOVE;
+    }
+    get description() {
+        return 'Removes the specified user from a SharePoint group';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.groupId = (!(!args.options.groupId)).toString();
+        telemetryProps.groupName = (!(!args.options.groupName)).toString();
+        telemetryProps.confirm = (!(!args.options.confirm)).toString();
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const removeUserfromSPGroup = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+            }
+            const loginName = `i:0#.f|membership|${args.options.userName}`;
+            const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
+                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .post(requestOptions)
+                .then(() => {
+                cb();
+            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        };
+        if (args.options.confirm) {
+            if (this.debug) {
+                logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
+            }
+            removeUserfromSPGroup();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeUserfromSPGroup();
+                }
+            });
+        }
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            },
+            {
+                option: '--groupId [groupId]'
+            },
+            {
+                option: '--groupName [groupName]'
+            },
+            {
+                option: '--userName <userName>'
+            },
+            {
+                option: '--confirm'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.groupId && args.options.groupName) {
+            return 'Use either "groupName" or "groupId", but not both';
+        }
+        if (!args.options.groupId && !args.options.groupName) {
+            return 'Either "groupName" or "groupId" is required';
+        }
+        if (args.options.groupId && isNaN(args.options.groupId)) {
+            return `Specified "groupId" ${args.options.groupId} is not valid`;
+        }
+        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoGroupUserRemoveCommand();
+//# sourceMappingURL=group-user-remove.js.map

package/dist/m365/spo/commands.js

@@ -64,6 +64,7 @@ exports.default = {
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_USER_ADD: `${prefix} group user add`,
     GROUP_USER_LIST: `${prefix} group user list`,
+    GROUP_USER_REMOVE: `${prefix} group user remove`,
     HIDEDEFAULTTHEMES_GET: `${prefix} hidedefaultthemes get`,
     HIDEDEFAULTTHEMES_SET: `${prefix} hidedefaultthemes set`,
     HOMESITE_GET: `${prefix} homesite get`,

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const request_1 = require("../../../../request");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementHealthGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTH_GET;
+    }
+    get description() {
+        return 'This operation provides the health information of a specified service for a tenant';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.issues = typeof args.options.issues !== 'undefined';
+        return telemetryProps;
+    }
+    defaultProperties() {
+        return ['id', 'status', 'service'];
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getServiceHealth(args.options)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getServiceHealth(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/healthOverviews/${options.serviceName}${options.issues && (!options.output || options.output.toLocaleLowerCase() === 'json') ? '?$expand=issues' : ''}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const serviceHealth = response;
+            if (!serviceHealth) {
+                return Promise.reject(`Error fetching service health`);
+            }
+            return Promise.resolve(serviceHealth);
+        });
+    }
+    options() {
+        const options = [
+            { option: '-s, --serviceName <serviceName>' },
+            { option: '-i, --issues' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthGetCommand();
+//# sourceMappingURL=serviceannouncement-health-get.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-list.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const request_1 = require("../../../../request");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementHealthListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTH_LIST;
+    }
+    get description() {
+        return 'This operation provides the health report of all subscribed services for a tenant';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.issues = typeof args.options.issues !== 'undefined';
+        return telemetryProps;
+    }
+    defaultProperties() {
+        return ['id', 'status', 'service'];
+    }
+    commandAction(logger, args, cb) {
+        this
+            .listServiceHealth(args.options)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    listServiceHealth(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/healthOverviews${options.issues && (!options.output || options.output.toLocaleLowerCase() === 'json') ? '?$expand=issues' : ''}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const serviceHealthList = response.value;
+            if (!serviceHealthList) {
+                return Promise.reject(`Error fetching service health`);
+            }
+            return Promise.resolve(serviceHealthList);
+        });
+    }
+    options() {
+        const options = [
+            { option: '-i, --issues' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthListCommand();
+//# sourceMappingURL=serviceannouncement-health-list.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-get.js

@@ -0,0 +1,39 @@
+"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 TenantServiceAnnouncementHealthIssueGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTHISSUE_GET;
+    }
+    get description() {
+        return 'Gets a specified service health issue for tenant';
+    }
+    commandAction(logger, args, cb) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/issues/${encodeURIComponent(args.options.id)}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id <id>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthIssueGetCommand();
+//# sourceMappingURL=serviceannouncement-healthissue-get.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-list.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementHealthIssueListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTHISSUE_LIST;
+    }
+    get description() {
+        return 'Gets all service health issues for the tenant';
+    }
+    defaultProperties() {
+        return ['id', 'title'];
+    }
+    commandAction(logger, args, cb) {
+        let endpoint = `${this.resource}/v1.0/admin/serviceAnnouncement/issues`;
+        if (args.options.service) {
+            endpoint += `?$filter=service eq '${encodeURIComponent(args.options.service)}'`;
+        }
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-s, --service [service]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthIssueListCommand();
+//# sourceMappingURL=serviceannouncement-healthissue-list.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-get.js

@@ -0,0 +1,51 @@
+"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 TenantServiceAnnouncementMessageGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_MESSAGE_GET;
+    }
+    get description() {
+        return 'Retrieves a specified service update message for the tenant';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving service update message ${args.options.id}`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/messages/${args.options.id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id <id>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    isValidId(id) {
+        return (/MC\d{6}/).test(id);
+    }
+    validate(args) {
+        if (!this.isValidId(args.options.id)) {
+            return `${args.options.id} is not a valid message ID`;
+        }
+        return true;
+    }
+}
+module.exports = new TenantServiceAnnouncementMessageGetCommand();
+//# sourceMappingURL=serviceannouncement-message-get.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-list.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementMessageListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_MESSAGE_LIST;
+    }
+    get description() {
+        return 'Gets all service update messages for the tenant';
+    }
+    defaultProperties() {
+        return ['id', 'title'];
+    }
+    commandAction(logger, args, cb) {
+        let endpoint = `${this.resource}/v1.0/admin/serviceAnnouncement/messages`;
+        if (args.options.service) {
+            endpoint += `?$filter=services/any(c:c+eq+'${encodeURIComponent(args.options.service)}')`;
+        }
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-s, --service [service]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementMessageListCommand();
+//# sourceMappingURL=serviceannouncement-message-list.js.map

package/dist/m365/tenant/commands.js

@@ -10,9 +10,15 @@ exports.default = {
     REPORT_OFFICE365ACTIVATIONSUSERDETAIL: `${prefix} report office365activationsuserdetail`,
     REPORT_OFFICE365ACTIVATIONSUSERCOUNTS: `${prefix} report office365activationsusercounts`,
     REPORT_SERVICESUSERCOUNTS: `${prefix} report servicesusercounts`,
+    SERVICEANNOUNCEMENT_HEALTHISSUE_GET: `${prefix} serviceannouncement healthissue get`,
     SERVICE_LIST: `${prefix} service list`,
     SERVICE_MESSAGE_LIST: `${prefix} service message list`,
     SERVICE_REPORT_HISTORICALSERVICESTATUS: `${prefix} service report historicalservicestatus`,
+    SERVICEANNOUNCEMENT_HEALTH_GET: `${prefix} serviceannouncement health get`,
+    SERVICEANNOUNCEMENT_HEALTH_LIST: `${prefix} serviceannouncement health list`,
+    SERVICEANNOUNCEMENT_HEALTHISSUE_LIST: `${prefix} serviceannouncement healthissue list`,
+    SERVICEANNOUNCEMENT_MESSAGE_GET: `${prefix} serviceannouncement message get`,
+    SERVICEANNOUNCEMENT_MESSAGE_LIST: `${prefix} serviceannouncement message list`,
     STATUS_LIST: `${prefix} status list`
 };
 //# sourceMappingURL=commands.js.map

package/docs/docs/cmd/aad/oauth2grant/oauth2grant-list.md

@@ -10,7 +10,7 @@ m365 aad oauth2grant list [options]
 
 ## Options
 
-`-i, --clientId <clientId>`
+`-i, --spObjectId <spObjectId>`
 : objectId of the service principal for which the configured OAuth2 permission grants should be retrieved
 
 --8<-- "docs/cmd/_global.md"
@@ -26,9 +26,10 @@ When using the text output type (default), the command lists only the values of
 List OAuth2 permissions granted to service principal with `objectId` _b2307a39-e878-458b-bc90-03bc578531d6_.
 
 ```sh
-m365 aad oauth2grant list --clientId b2307a39-e878-458b-bc90-03bc578531d6
+m365 aad oauth2grant list --spObjectId b2307a39-e878-458b-bc90-03bc578531d6
 ```
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
+- List oauth2PermissionGrants: [https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/oauth2permissiongrant-list?view=graph-rest-1.0)

package/docs/docs/cmd/aad/oauth2grant/oauth2grant-remove.md

@@ -13,6 +13,9 @@ m365 aad oauth2grant remove [options]
 `-i, --grantId <grantId>`
 : `objectId` of OAuth2 permission grant to remove
 
+`--confirm`
+: Do not prompt for confirmation before removing OAuth2 permission grant
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
@@ -33,6 +36,12 @@ Remove the OAuth2 permission grant with ID _YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXk
 m365 aad oauth2grant remove --grantId YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXkiV8i-ek
 ```
 
+Remove the OAuth2 permission grant with ID _YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXkiV8i-ek_ without being asked for confirmation
+
+```sh
+m365 aad oauth2grant remove --grantId YgA60KYa4UOPSdc-lpxYEnQkr8KVLDpCsOXkiV8i-ek --confirm
+```
+
 ## More information
 
 - Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)

package/docs/docs/cmd/aad/sp/sp-get.md

@@ -47,4 +47,5 @@ m365 aad sp get --objectId b2307a39-e878-458b-bc90-03bc578531dd
 
 ## More information
 
-- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
+- Application and service principal objects in Azure Active Directory (Azure AD): [https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects](https://docs.microsoft.com/en-us/azure/active-directory/develop/active-directory-application-objects)
+- Get servicePrincipal: [https://docs.microsoft.com/en-us/graph/api/serviceprincipal-get?view=graph-rest-1.0](https://docs.microsoft.com/en-us/graph/api/serviceprincipal-get?view=graph-rest-1.0)

package/docs/docs/cmd/aad/user/user-list.md

@@ -13,6 +13,9 @@ m365 aad user list [options]
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve
 
+`-d, --deleted`
+: Use to retrieve deleted users
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
@@ -31,6 +34,12 @@ List all users in the tenant
 m365 aad user list
 ```
 
+List all recently deleted users in the tenant
+
+```sh
+m365 aad user list --deleted
+```
+
 List all users in the tenant. For each one return the display name and e-mail address
 
 ```sh

package/docs/docs/cmd/planner/task/task-details-get.md

@@ -0,0 +1,24 @@
+# planner task details get
+
+Retrieve the details of the specified planner task
+
+## Usage
+
+```sh
+m365 planner task details get [options]
+```
+
+## Options
+
+`-i, --taskId <taskId>`
+: ID of the task to retrieve details from
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Retrieve the details of the specified planner task
+
+```sh
+m365 planner task details get --taskId 'vzCcZoOv-U27PwydxHB8opcADJo-'
+```

package/docs/docs/cmd/planner/task/task-get.md

@@ -0,0 +1,24 @@
+# planner task get
+
+Retrieve the the specified planner task
+
+## Usage
+
+```sh
+m365 planner task get [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: ID of the task to retrieve details from
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Retrieve the the specified planner task
+
+```sh
+m365 planner task get --id 'vzCcZoOv-U27PwydxHB8opcADJo-'
+```

package/docs/docs/cmd/spo/group/group-user-remove.md

@@ -0,0 +1,39 @@
+# spo group user remove
+
+Removes the specified user from a SharePoint group
+
+## Usage
+
+```sh
+m365 spo group user remove [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site where the SharePoint group is available
+
+`--groupId [groupId]`
+: Id of the SharePoint group from which user has to be removed from. Use either `groupName` or `groupId`, but not both
+
+`--groupName  [groupName]`
+: Name of the SharePoint group from which user has to be removed from. Use either `groupName` or `groupId`, but not both
+
+`--userName <userName>`
+: User's UPN (user principal name, eg. megan.bowen@contoso.com).
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Remove a user from SharePoint group with id _5_ available on the web _https://contoso.sharepoint.com/sites/SiteA_
+
+```sh
+m365 spo group user remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupId 5 --userName "Alex.Wilber@contoso.com"
+```
+
+Remove a user from SharePoint group with Name _Site A Visitors_ available on the web _https://contoso.sharepoint.com/sites/SiteA_
+
+```sh
+m365 spo group user remove --webUrl https://contoso.sharepoint.com/sites/SiteA --groupName "Site A Visitors" --userName "Alex.Wilber@contoso.com"
+```

package/docs/docs/cmd/teams/channel/channel-get.md

@@ -16,7 +16,7 @@ m365 teams channel get [options]
 `--teamName [teamName]`
 : The display name of the team to which the channel belongs to. Specify either teamId or teamName but not both
 
-`-c, --channelId <channelId>`
+`-c, --channelId [channelId]`
 : The ID of the channel for which to retrieve more information. Specify either channelId or channelName but not both
 
 `--channelName [channelName]`

package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-health-get.md

@@ -0,0 +1,33 @@
+# tenant service announcement health get
+
+Get the health report of a specified service for a tenant
+
+## Usage
+
+```sh
+m365 tenant serviceannouncement health get [options]
+```
+
+## Options
+
+`-s, --serviceName <serviceName>`
+: The service name to retrieve the health report for.
+
+`-i, --issues`
+: Return the collection of issues that happened on the service, with detailed information for each issue. Is only returned in JSON output mode.
+
+--8<-- "docs/cmd/\_global.md"
+
+## Examples
+
+Get the health report for the service _Exchange Online_
+
+```sh
+m365 tenant serviceannouncement health get --serviceName "Exchange Online"
+```
+
+Get the health report for the service _Exchange Online_ including the issues of the service
+
+```sh
+m365 tenant serviceannouncement health get --serviceName "Exchange Online" --issues
+```

package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-health-list.md

@@ -0,0 +1,30 @@
+# tenant service announcement health list
+
+Gets the health report of all subscribed services for a tenant
+
+## Usage
+
+```sh
+m365 tenant serviceannouncement health list [options]
+```
+
+## Options
+
+`-i, --issues`
+: Return the collection of issues that happened on the service, with detailed information for each issue. Is only returned in JSON output mode.
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Get the health report of all subscribed services for a tenant
+
+```sh
+m365 tenant serviceannouncement health list
+```
+
+Get the health report of all subscribed services for a tenant including the issues that happend on each service
+
+```sh
+m365 tenant serviceannouncement health list --issues
+```

package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-healthissue-get.md

@@ -0,0 +1,24 @@
+# tenant serviceannouncement healthissue get
+
+Gets a specified service health issue for tenant.
+
+## Usage
+
+```sh
+m365 tenant serviceannouncement healthissue get [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: The issue id to get details for
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Gets information about issue with ID _MO226784_
+
+```sh
+m365 tenant serviceannouncement healthissue get --id MO226784
+```

package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-healthissue-list.md

@@ -0,0 +1,34 @@
+# tenant serviceannouncement healthissue list
+
+Gets all service health issues for the tenant.
+
+## Usage
+
+```sh
+m365 tenant serviceannouncement healthissue list [options]
+```
+
+## Options
+
+`-s, --service [service]`
+: Retrieve service health issues for the particular service. If not provided, retrieves health issues for all services
+
+--8<-- "docs/cmd/\_global.md"
+
+## Examples
+
+Get service health issues of all services in Microsoft 365
+
+```sh
+m365 tenant serviceannouncement healthissue list
+```
+
+Get service health issues for Microsoft Forms
+
+```sh
+m365 tenant serviceannouncement healthissue list --service "Microsoft Forms"
+```
+
+## More information
+
+- List serviceAnnouncement issues: [https://docs.microsoft.com/en-us/graph/api/serviceannouncement-list-issues](https://docs.microsoft.com/en-us/graph/api/serviceannouncement-list-issues)

package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-message-get.md

@@ -0,0 +1,28 @@
+# tenant serviceannouncement message get
+
+Retrieves a specified service update message for the tenant
+
+## Usage
+
+```sh
+m365 tenant serviceannouncement message get [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: The ID of the service update message.
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Get service update message with ID MC001337
+
+```sh
+m365 tenant serviceannouncement message get --id MC001337
+```
+
+## More information
+
+- Microsoft Graph REST API reference: [https://docs.microsoft.com/en-us/graph/api/serviceupdatemessage-get](https://docs.microsoft.com/en-us/graph/api/serviceupdatemessage-get)

package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-message-list.md

@@ -0,0 +1,34 @@
+# tenant serviceannouncement message list
+
+Gets all service update messages for the tenant.
+
+## Usage
+
+```sh
+m365 tenant serviceannouncement message list [options]
+```
+
+## Options
+
+`-s, --service [service]`
+: Retrieve service update messages for the particular service. If not provided, retrieves messages for all services
+
+--8<-- "docs/cmd/\_global.md"
+
+## Examples
+
+Get service update messages of all services in Microsoft 365
+
+```sh
+m365 tenant serviceannouncement message list
+```
+
+Get service update messages for Microsoft Teams
+
+```sh
+m365 tenant serviceannouncement message list --service "Microsoft Teams"
+```
+
+## More information
+
+- List serviceAnnouncement messages: [https://docs.microsoft.com/en-us/graph/api/serviceannouncement-list-messages](https://docs.microsoft.com/en-us/graph/api/serviceannouncement-list-messages)

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "4.4.0",
+  "version": "5.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pnp/cli-microsoft365",
-      "version": "4.4.0",
+      "version": "5.0.0",
       "license": "MIT",
       "dependencies": {
         "@azure/msal-node": "^1.5.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "4.4.0",
+  "version": "5.0.0-beta.2d81d43",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -226,4 +226,4 @@
     "rimraf": "^3.0.2",
     "sinon": "^12.0.1"
   }
-}
+}

package/dist/m365/base/AadCommand.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../Command");
-class AadCommand extends Command_1.default {
-    get resource() {
-        return 'https://graph.windows.net';
-    }
-}
-exports.default = AadCommand;
-//# sourceMappingURL=AadCommand.js.map