@pnp/cli-microsoft365 5.0.0-beta.fc638c4 → 5.1.0-beta.efe1dcb

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/Auth.js

@@ -12,9 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Auth = exports.CertificateType = exports.AuthType = exports.Service = void 0;
 const FileTokenStorage_1 = require("./auth/FileTokenStorage");
 const msalCachePlugin_1 = require("./auth/msalCachePlugin");
+const cli_1 = require("./cli");
 const Command_1 = require("./Command");
 const config_1 = require("./config");
 const request_1 = require("./request");
+const settingsNames_1 = require("./settingsNames");
 class Service {
     constructor() {
         this.connected = false;
@@ -285,20 +287,31 @@ class Auth {
             }
             this.deviceCodeRequest = {
                 // deviceCodeCallback is called by MSAL which we're not testing
-                /* c8 ignore next 9 */
-                deviceCodeCallback: response => {
-                    if (debug) {
-                        logger.logToStderr('Response:');
-                        logger.logToStderr(response);
-                        logger.logToStderr('');
-                    }
-                    logger.log(response.message);
-                },
+                /* c8 ignore next 1 */
+                deviceCodeCallback: response => this.processDeviceCodeCallback(response, logger, debug),
                 scopes: [`${resource}/.default`]
             };
             return this.clientApplication.acquireTokenByDeviceCode(this.deviceCodeRequest);
         });
     }
+    processDeviceCodeCallback(response, logger, debug) {
+        if (debug) {
+            logger.logToStderr('Response:');
+            logger.logToStderr(response);
+            logger.logToStderr('');
+        }
+        logger.log(response.message);
+        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenBrowserOnLogin, false)) {
+            // _open is never set before hitting this line, but this check
+            // is implemented so that we can support lazy loading
+            // but also stub it for testing
+            /* c8 ignore next 3 */
+            if (!this._open) {
+                this._open = require('open');
+            }
+            this._open(response.verificationUri);
+        }
+    }
     ensureAccessTokenWithPassword(resource, logger, debug) {
         return __awaiter(this, void 0, void 0, function* () {
             if (debug) {

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/api.d.ts

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

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

@@ -19,7 +19,7 @@ const Command_1 = require("../Command");
 const config_1 = require("../config");
 const request_1 = require("../request");
 const settingsNames_1 = require("../settingsNames");
-const Utils_1 = require("../Utils");
+const utils_1 = require("../utils");
 const packageJSON = require('../../package.json');
 class Cli {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -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
@@ -233,7 +248,7 @@ class Cli {
         });
     }
     loadAllCommands() {
-        const files = Utils_1.default.readdirR(this.commandsFolder);
+        const files = utils_1.fsUtil.readdirR(this.commandsFolder);
         files.forEach(file => {
             if (file.indexOf(`${path.sep}commands${path.sep}`) > -1 &&
                 file.indexOf(`${path.sep}assets${path.sep}`) < 0 &&
@@ -441,7 +456,7 @@ class Cli {
                         Array.isArray(logStatement[0].value)) {
                         logStatement = logStatement[0].value;
                     }
-                    logStatement = logStatement.map((s) => Utils_1.default.filterObject(s, currentCommand.defaultProperties));
+                    logStatement = logStatement.map((s) => utils_1.formatting.filterObject(s, currentCommand.defaultProperties));
                 }
             }
         }

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

@@ -4,10 +4,10 @@ const fs = require("fs");
 const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadAppAddCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
         this.appName = '';
@@ -42,7 +42,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             // 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);
+            appInfo.tenantId = utils_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
             return Promise.resolve(appInfo);
         })
             .then(appInfo => this.updateAppFromManifest(args, appInfo))
@@ -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) => {
@@ -242,15 +278,15 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         if (this.verbose) {
             logger.logToStderr('Resolving requested APIs...');
         }
-        return this
-            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=servicePrincipalNames,appId,oauth2PermissionScopes,appRoles`, logger, true)
-            .then(_ => {
+        return utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=servicePrincipalNames,appId,oauth2PermissionScopes,appRoles`, logger)
+            .then(servicePrincipals => {
             try {
-                const resolvedApis = this.getRequiredResourceAccessForApis(args.options.apisDelegated, 'Scope', logger);
+                const resolvedApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisDelegated, 'Scope', logger);
                 if (this.debug) {
                     logger.logToStderr(`Resolved delegated permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
                 }
-                const resolvedApplicationApis = this.getRequiredResourceAccessForApis(args.options.apisApplication, 'Role', logger);
+                const resolvedApplicationApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisApplication, 'Role', logger);
                 if (this.debug) {
                     logger.logToStderr(`Resolved application permissions: ${JSON.stringify(resolvedApplicationApis, null, 2)}`);
                 }
@@ -274,7 +310,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             }
         });
     }
-    getRequiredResourceAccessForApis(apis, scopeType, logger) {
+    getRequiredResourceAccessForApis(servicePrincipals, apis, scopeType, logger) {
         if (!apis) {
             return [];
         }
@@ -289,7 +325,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
                 logger.logToStderr(`Permission name: ${permissionName}`);
                 logger.logToStderr(`Service principal name: ${servicePrincipalName}`);
             }
-            const servicePrincipal = this.items.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
+            const servicePrincipal = servicePrincipals.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
                 sp.servicePrincipalNames.indexOf(`${servicePrincipalName}/`) > -1));
             if (!servicePrincipal) {
                 throw `Service principal ${servicePrincipalName} not found`;

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.validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.objectId && !utils_1.validation.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,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppGetCommand extends GraphCommand_1.default {
@@ -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);
@@ -84,10 +129,10 @@ class AadAppGetCommand extends GraphCommand_1.default {
             (args.options.objectId && args.options.name)) {
             return 'Specify either appId, objectId, or name but not both';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleDeleteCommand extends GraphCommand_1.default {
@@ -194,7 +194,7 @@ class AadAppRoleDeleteCommand extends GraphCommand_1.default {
             return `Specify either name, claim or id of the role`;
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

package/dist/m365/aad/commands/app/app-role-list.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadAppRoleListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadAppRoleListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.APP_ROLE_LIST;
     }
@@ -23,9 +24,9 @@ class AadAppRoleListCommand extends GraphItemsListCommand_1.GraphItemsListComman
     commandAction(logger, args, cb) {
         this
             .getAppObjectId(args, logger)
-            .then(objectId => this.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`, logger, true))
-            .then(_ => {
-            logger.log(this.items);
+            .then(objectId => utils_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`, logger))
+            .then(appRoles => {
+            logger.log(appRoles);
             cb();
         }, rawRes => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }