@pnp/cli-microsoft365 5.0.0-beta.a1bb50f → 5.0.0-beta.c4100fe

package/.devcontainer/devcontainer.json

@@ -3,17 +3,20 @@
   "dockerFile": "Dockerfile",
   "settings": {
     "terminal.integrated.profiles.linux": {
-        "zsh": {
-          "path": "/bin/zsh",
-          "args": [
-            "-l"
-          ]
-        }
-      },
-      "terminal.integrated.defaultProfile.linux": "zsh"
+      "zsh": {
+        "path": "/bin/zsh",
+        "args": [
+          "-l"
+        ]
+      }
+    },
+    "terminal.integrated.defaultProfile.linux": "zsh"
   },
   "postCreateCommand": "npm i && npm run clean && npm run build && npm link",
   "extensions": [
-    "dbaeumer.vscode-eslint"
+    "dbaeumer.vscode-eslint",
+    "hbenl.vscode-test-explorer",
+    "hbenl.vscode-mocha-test-adapter",
+    "eamodio.gitlens"
   ]
 }

package/.eslintrc.js

@@ -23,6 +23,7 @@ const dictionary = [
   'group',
   'groupify',
   'guest',
+  'health',
   'hide',
   'historical',
   'home',
@@ -48,6 +49,7 @@ const dictionary = [
   'records',
   'recycle',
   'role',
+  'room',
   'schema',
   'service',
   'setting',

package/.mocharc.json

@@ -0,0 +1,9 @@
+{
+  "extension": [
+    "ts"
+  ],
+  "spec": "dist/**/*.spec.js",
+  "require": "source-map-support/register",
+  "watch": "dist/**/*.js",
+  "logpanel": true
+}

package/README.md

@@ -208,9 +208,9 @@ If you want to get involved with helping us grow the CLI, whether that is sugges
 
 Checkout our [Wiki](https://github.com/pnp/cli-microsoft365/wiki) for guides on how to contribute to this project.
 
-## Sharing is Caring
+## Microsoft 365 Platform Community
 
-This project is associated with the [Microsoft 365 Patterns and Practices](https://pnp.github.io) (PnP) organisation, which is a virtual team consisting of Microsoft employees and community members focused on helping the community make the best use of Microsoft products.
+CLI for Microsoft 365 is a [Microsoft 365 Platform Community](https://pnp.github.io) (PnP) project. Microsoft 365 Platform Community is a virtual team consisting of Microsoft employees and community members focused on helping the community make the best use of Microsoft products. CLI for Microsoft 365 is an open-source project not affiliated with Microsoft and not covered by Microsoft support. If you experience any issues using the CLI, please submit an issue in the [issues list](https://github.com/pnp/cli-microsoft365/issues).
 
 ## Disclaimer
 

package/dist/Command.js

@@ -113,7 +113,7 @@ class Command {
             },
             {
                 option: '-o, --output [output]',
-                autocomplete: ['json', 'text']
+                autocomplete: ['csv', 'json', 'text']
             },
             {
                 option: '--verbose'

package/dist/Utils.js

@@ -51,6 +51,10 @@ class Utils {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);
         return guidRegEx.test(guid);
     }
+    static isValidTeamsChatId(guid) {
+        const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+(@thread\.v2|@unq\.gbl\.spaces)$/i);
+        return guidRegEx.test(guid);
+    }
     static isValidUserPrincipalName(upn) {
         const upnRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i);
         return upnRegEx.test(upn);

package/dist/api.d.ts

@@ -0,0 +1,11 @@
+export interface CommandOutput {
+  error?: {
+    message: string;
+    code?: number;
+  }
+  stdout: string;
+  stderr: string;
+}
+
+export declare function executeCommand(commandName: string, options: any): Promise<CommandOutput>;
+export declare function on(eventName: string, listener: (...args: any[]) => void): void;

package/dist/api.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeCommand = void 0;
+const cli_1 = require("./cli");
+const path = require("path");
+function executeCommand(commandName, options, listener) {
+    const cli = cli_1.Cli.getInstance();
+    cli.commandsFolder = path.join(__dirname, 'm365');
+    cli.commands = [];
+    cli.loadCommandFromArgs(commandName.split(' '));
+    if (cli.commands.length !== 1) {
+        return Promise.reject(`Command not found: ${commandName}`);
+    }
+    return cli_1.Cli.executeCommandWithOutput(cli.commands[0].command, { options: options !== null && options !== void 0 ? options : {} }, listener);
+}
+exports.executeCommand = executeCommand;
+//# sourceMappingURL=api.js.map

package/dist/cli/Cli.js

@@ -189,23 +189,38 @@ class Cli {
             });
         });
     }
-    static executeCommandWithOutput(command, args) {
+    static executeCommandWithOutput(command, args, listener) {
         return new Promise((resolve, reject) => {
             const log = [];
             const logErr = [];
             const logger = {
                 log: (message) => {
-                    log.push(Cli.formatOutput(message, args.options));
+                    const formattedMessage = Cli.formatOutput(message, args.options);
+                    if (listener && listener.stdout) {
+                        listener.stdout(formattedMessage);
+                    }
+                    log.push(formattedMessage);
                 },
                 logRaw: (message) => {
-                    log.push(Cli.formatOutput(message, args.options));
+                    const formattedMessage = Cli.formatOutput(message, args.options);
+                    if (listener && listener.stdout) {
+                        listener.stdout(formattedMessage);
+                    }
+                    log.push(formattedMessage);
                 },
                 logToStderr: (message) => {
+                    if (listener && listener.stderr) {
+                        listener.stderr(message);
+                    }
                     logErr.push(message);
                 }
             };
             if (args.options.debug) {
-                logErr.push(`Executing command ${command.name} with options ${JSON.stringify(args)}`);
+                const message = `Executing command ${command.name} with options ${JSON.stringify(args)}`;
+                if (listener && listener.stderr) {
+                    listener.stderr(message);
+                }
+                logErr.push(message);
             }
             // store the current command name, if any and set the name to the name of
             // the command to execute
@@ -447,16 +462,14 @@ class Cli {
         }
         if (options.output === 'csv') {
             const { stringify } = require('csv-stringify/sync');
-            /*
-              https://csv.js.org/stringify/options/
-              header: Display the column names on the first line if the columns option is provided or discovered.
-              escape: Single character used for escaping; only apply to characters matching the quote and the escape options default to ".
-              quote: The quote characters surrounding a field, defaults to the " (double quotation marks), an empty quote value will preserve the original field, whether it contains quotation marks or not.
-              quoted: Boolean, default to false, quote all the non-empty fields even if not required.
-              quotedEmpty: Quote empty strings and overrides quoted_string on empty strings when defined; default is false.
-            */
+            const cli = Cli.getInstance();
+            // https://csv.js.org/stringify/options/
             return stringify(logStatement, {
-                header: true
+                header: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvHeader, true),
+                escape: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvEscape, '"'),
+                quote: cli.config.get(settingsNames_1.settingsNames.csvQuote),
+                quoted: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvQuoted, false),
+                quotedEmpty: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvQuotedEmpty, false)
             });
         }
         // display object as a list of key-value pairs

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

@@ -105,21 +105,49 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         if (!args.options.manifest) {
             return Promise.resolve(appInfo);
         }
-        const manifest = JSON.parse(args.options.manifest);
+        const v2Manifest = JSON.parse(args.options.manifest);
         // remove properties that might be coming from the original app that was
         // used to create the manifest and which can't be updated
-        delete manifest.id;
-        delete manifest.appId;
-        delete manifest.publisherDomain;
+        delete v2Manifest.id;
+        delete v2Manifest.appId;
+        delete v2Manifest.publisherDomain;
         // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
-        const transformedManifest = this.transformManifest(manifest);
+        const graphManifest = this.transformManifest(v2Manifest);
         const updateAppRequestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
             headers: {
                 'content-type': 'application/json'
             },
             responseType: 'json',
-            data: transformedManifest
+            data: graphManifest
+        };
+        return request_1.default
+            .patch(updateAppRequestOptions)
+            .then(_ => this.updatePreAuthorizedAppsFromManifest(v2Manifest, appInfo))
+            .then(_ => Promise.resolve(appInfo));
+    }
+    updatePreAuthorizedAppsFromManifest(manifest, appInfo) {
+        if (!manifest ||
+            !manifest.preAuthorizedApplications ||
+            manifest.preAuthorizedApplications.length === 0) {
+            return Promise.resolve(appInfo);
+        }
+        const graphManifest = {
+            api: {
+                preAuthorizedApplications: manifest.preAuthorizedApplications
+            }
+        };
+        graphManifest.api.preAuthorizedApplications.forEach((p) => {
+            p.delegatedPermissionIds = p.permissionIds;
+            delete p.permissionIds;
+        });
+        const updateAppRequestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
+            headers: {
+                'content-type': 'application/json'
+            },
+            responseType: 'json',
+            data: graphManifest
         };
         return request_1.default
             .patch(updateAppRequestOptions)
@@ -180,8 +208,16 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         delete graphManifest.oauth2AllowIdTokenImplicitFlow;
         graphManifest.api.oauth2PermissionScopes = v2Manifest.oauth2Permissions;
         delete graphManifest.oauth2Permissions;
+        if (graphManifest.api.oauth2PermissionScopes) {
+            graphManifest.api.oauth2PermissionScopes.forEach((scope) => {
+                delete scope.lang;
+                delete scope.origin;
+            });
+        }
         delete graphManifest.oauth2RequiredPostResponse;
-        graphManifest.api.preAuthorizedApplications = v2Manifest.preAuthorizedApplications;
+        // MS Graph doesn't support creating OAuth2 permissions and pre-authorized
+        // apps in one request. This is why we need to remove it here and do it in
+        // the next request
         delete graphManifest.preAuthorizedApplications;
         if (v2Manifest.replyUrlsWithType) {
             v2Manifest.replyUrlsWithType.forEach((urlWithType) => {

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

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadAppDeleteCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.APP_DELETE;
+    }
+    get description() {
+        return 'Removes an Azure AD app registration';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.appId = typeof args.options.appId !== 'undefined';
+        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        telemetryProps.confirm = (!(!args.options.confirm)).toString();
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const deleteApp = () => {
+            this
+                .getObjectId(args, logger)
+                .then((objectId) => {
+                if (this.verbose) {
+                    logger.logToStderr(`Deleting Azure AD app ${objectId}...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.delete(requestOptions);
+            })
+                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        };
+        if (args.options.confirm) {
+            deleteApp();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to delete the App?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    deleteApp();
+                }
+            });
+        }
+    }
+    getObjectId(args, logger) {
+        if (args.options.objectId) {
+            return Promise.resolve(args.options.objectId);
+        }
+        const { appId, name } = args.options;
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
+        }
+        const filter = appId ?
+            `appId eq '${encodeURIComponent(appId)}'` :
+            `displayName eq '${encodeURIComponent(name)}'`;
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0].id);
+            }
+            if (res.value.length === 0) {
+                const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
+                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+            }
+            return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please choose one of the object IDs: ${res.value.map(a => a.id).join(', ')}`);
+        });
+    }
+    options() {
+        const options = [
+            { option: '--appId [appId]' },
+            { option: '--objectId [objectId]' },
+            { option: '--name [name]' },
+            { option: '--confirm' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!args.options.appId &&
+            !args.options.objectId &&
+            !args.options.name) {
+            return 'Specify either appId, objectId, or name';
+        }
+        if ((args.options.appId && args.options.objectId) ||
+            (args.options.appId && args.options.name) ||
+            (args.options.objectId && args.options.name)) {
+            return 'Specify either appId, objectId, or name';
+        }
+        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+            return `${args.options.objectId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadAppDeleteCommand();
+//# sourceMappingURL=app-delete.js.map

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -21,16 +22,8 @@ class AadAppGetCommand extends GraphCommand_1.default {
     commandAction(logger, args, cb) {
         this
             .getAppObjectId(args)
-            .then((appObjectId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
+            .then(appObjectId => this.getAppInfo(appObjectId))
+            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
             .then((res) => {
             logger.log(res);
             cb();
@@ -64,11 +57,63 @@ class AadAppGetCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
         });
     }
+    getAppInfo(appObjectId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions);
+    }
+    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 = [];
+        }
+        if (!m365rc.apps.some(a => a.appId === appInfo.appId)) {
+            m365rc.apps.push({
+                appId: appInfo.appId,
+                name: appInfo.displayName
+            });
+            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 = [
             { option: '--appId [appId]' },
             { option: '--objectId [objectId]' },
-            { option: '--name [name]' }
+            { option: '--name [name]' },
+            { option: '--save' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);

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

@@ -15,6 +15,9 @@ class AadAppSetCommand extends GraphCommand_1.default {
         telemetryProps.appId = typeof args.options.appId !== 'undefined';
         telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
         telemetryProps.name = typeof args.options.name !== 'undefined';
+        telemetryProps.platform = typeof args.options.platform !== 'undefined';
+        telemetryProps.redirectUris = typeof args.options.redirectUris !== 'undefined';
+        telemetryProps.redirectUrisToRemove = typeof args.options.redirectUrisToRemove !== 'undefined';
         telemetryProps.uri = typeof args.options.uri !== 'undefined';
         return telemetryProps;
     }
@@ -22,6 +25,7 @@ class AadAppSetCommand extends GraphCommand_1.default {
         this
             .getAppObjectId(args, logger)
             .then(objectId => this.configureUri(args, objectId, logger))
+            .then(objectId => this.configureRedirectUris(args, objectId, logger))
             .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
     getAppObjectId(args, logger) {
@@ -57,7 +61,7 @@ class AadAppSetCommand extends GraphCommand_1.default {
     }
     configureUri(args, objectId, logger) {
         if (!args.options.uri) {
-            return Promise.resolve();
+            return Promise.resolve(objectId);
         }
         if (this.verbose) {
             logger.logToStderr(`Configuring Azure AD application ID URI...`);
@@ -73,14 +77,97 @@ class AadAppSetCommand extends GraphCommand_1.default {
             responseType: 'json',
             data: applicationInfo
         };
-        return request_1.default.patch(requestOptions);
+        return request_1.default
+            .patch(requestOptions)
+            .then(_ => Promise.resolve(objectId));
+    }
+    configureRedirectUris(args, objectId, logger) {
+        if (!args.options.redirectUris && !args.options.redirectUrisToRemove) {
+            return Promise.resolve(objectId);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Configuring Azure AD application redirect URIs...`);
+        }
+        const getAppRequestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(getAppRequestOptions)
+            .then((application) => {
+            const publicClientRedirectUris = application.publicClient.redirectUris;
+            const spaRedirectUris = application.spa.redirectUris;
+            const webRedirectUris = application.web.redirectUris;
+            // start with existing redirect URIs
+            const applicationPatch = {
+                publicClient: {
+                    redirectUris: publicClientRedirectUris
+                },
+                spa: {
+                    redirectUris: spaRedirectUris
+                },
+                web: {
+                    redirectUris: webRedirectUris
+                }
+            };
+            if (args.options.redirectUrisToRemove) {
+                // remove redirect URIs from all platforms
+                const redirectUrisToRemove = args.options.redirectUrisToRemove
+                    .split(',')
+                    .map(u => u.trim());
+                applicationPatch.publicClient.redirectUris =
+                    publicClientRedirectUris.filter(u => !redirectUrisToRemove.includes(u));
+                applicationPatch.spa.redirectUris =
+                    spaRedirectUris.filter(u => !redirectUrisToRemove.includes(u));
+                applicationPatch.web.redirectUris =
+                    webRedirectUris.filter(u => !redirectUrisToRemove.includes(u));
+            }
+            if (args.options.redirectUris) {
+                const urlsToAdd = args.options.redirectUris
+                    .split(',')
+                    .map(u => u.trim());
+                // add new redirect URIs. If the URI is already present, it will be ignored
+                switch (args.options.platform) {
+                    case 'spa':
+                        applicationPatch.spa.redirectUris
+                            .push(...urlsToAdd.filter(u => !spaRedirectUris.includes(u)));
+                        break;
+                    case 'publicClient':
+                        applicationPatch.publicClient.redirectUris
+                            .push(...urlsToAdd.filter(u => !publicClientRedirectUris.includes(u)));
+                        break;
+                    case 'web':
+                        applicationPatch.web.redirectUris
+                            .push(...urlsToAdd.filter(u => !webRedirectUris.includes(u)));
+                }
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: applicationPatch
+            };
+            return request_1.default.patch(requestOptions);
+        })
+            .then(_ => Promise.resolve(objectId));
     }
     options() {
         const options = [
             { option: '--appId [appId]' },
             { option: '--objectId [objectId]' },
             { option: '-n, --name [name]' },
-            { option: '-u, --uri [uri]' }
+            { option: '-u, --uri [uri]' },
+            { option: '-r, --redirectUris [redirectUris]' },
+            {
+                option: '--platform [platform]',
+                autocomplete: AadAppSetCommand.aadApplicationPlatform
+            },
+            { option: '--redirectUrisToRemove [redirectUrisToRemove]' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
@@ -96,8 +183,16 @@ class AadAppSetCommand extends GraphCommand_1.default {
             (args.options.objectId && args.options.name)) {
             return 'Specify either appId, objectId or name but not both';
         }
+        if (args.options.redirectUris && !args.options.platform) {
+            return `When you specify redirectUris you also need to specify platform`;
+        }
+        if (args.options.platform &&
+            AadAppSetCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
+            return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppSetCommand.aadApplicationPlatform.join(', ')}`;
+        }
         return true;
     }
 }
+AadAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 module.exports = new AadAppSetCommand();
 //# sourceMappingURL=app-set.js.map

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

@@ -9,12 +9,18 @@ class AadGroupListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
     get description() {
         return 'Lists all groups defined in Azure Active Directory.';
     }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.deleted = args.options.deleted;
+        return telemetryProps;
+    }
     defaultProperties() {
         return ['id', 'displayName', 'groupType'];
     }
     commandAction(logger, args, cb) {
+        const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
         this
-            .getAllItems(`${this.resource}/v1.0/groups`, logger, true)
+            .getAllItems(`${this.resource}/v1.0/${endpoint}`, logger, true)
             .then(() => {
             if (args.options.output === 'text') {
                 this.items.forEach((group) => {
@@ -36,6 +42,13 @@ class AadGroupListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    options() {
+        const options = [
+            { option: '-d, --deleted' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
 }
 module.exports = new AadGroupListCommand();
 //# sourceMappingURL=group-list.js.map