@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

package/.eslintrc.js

@@ -17,6 +17,7 @@ const dictionary = [
   'content',
   'conversation',
   'custom',
+  'dataverse',
   'default',
   'external',
   'externalize',
@@ -61,6 +62,7 @@ const dictionary = [
   'site',
   'status',
   'storage',
+  'table',
   'teams',
   'token',
   'type',
@@ -172,7 +174,19 @@ module.exports = {
     "eqeqeq": [
       "error",
       "always"
-    ]
+    ],
+    "@typescript-eslint/naming-convention": [
+      "error",
+      {
+        "selector": [
+          "method"
+        ],
+        "format": [
+          "camelCase"
+        ]
+      }
+    ],
+    "@typescript-eslint/explicit-function-return-type": ["error", { "allowExpressions": true }]
   },
   "overrides": [
     {
@@ -183,7 +197,8 @@ module.exports = {
         "no-console": "error",
         "@typescript-eslint/no-empty-function": "off",
         "cli-microsoft365/correct-command-class-name": "off",
-        "cli-microsoft365/correct-command-name": "off"
+        "cli-microsoft365/correct-command-name": "off",
+        "@typescript-eslint/explicit-function-return-type": "off"
       }
     },
     {

package/README.md

@@ -15,6 +15,11 @@
       alt="GitHub" />
   </a>
 
+  <a href="https://discord.com/invite/7rfW4kg6B5">
+    <img src="https://img.shields.io/badge/Discord-Join-7289da?style=flat-square"
+      alt="Discord" />
+  </a>
+
   <a href="https://twitter.com/climicrosoft365">
     <img src="https://img.shields.io/badge/Twitter-%40climicrosoft365-blue?style=flat-square"
       alt="Twitter" />

package/dist/Auth.js

@@ -12,7 +12,7 @@ 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 Cli_1 = require("./cli/Cli");
 const Command_1 = require("./Command");
 const config_1 = require("./config");
 const request_1 = require("./request");
@@ -301,7 +301,7 @@ class Auth {
             logger.logToStderr('');
         }
         logger.log(response.message);
-        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
+        if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, 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
@@ -311,7 +311,7 @@ class Auth {
             }
             this._open(response.verificationUri);
         }
-        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.copyDeviceCodeToClipboard, false)) {
+        if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.copyDeviceCodeToClipboard, false)) {
             // _clipboardy 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

package/dist/Command.js

@@ -19,10 +19,10 @@ exports.CommandErrorWithOutput = exports.CommandError = void 0;
 const os = require("os");
 const appInsights_1 = require("./appInsights");
 const Auth_1 = require("./Auth");
-const cli_1 = require("./cli");
+const Cli_1 = require("./cli/Cli");
 const request_1 = require("./request");
 const settingsNames_1 = require("./settingsNames");
-const utils_1 = require("./utils");
+const accessToken_1 = require("./utils/accessToken");
 class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -61,6 +61,9 @@ class Command {
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initOptions).call(this);
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initValidators).call(this);
     }
+    get allowedOutputs() {
+        return ['csv', 'json', 'text'];
+    }
     validateUnknownOptions(args, command) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.allowUnknownOptions()) {
@@ -87,7 +90,7 @@ class Command {
     }
     validateRequiredOptions(args, command) {
         return __awaiter(this, void 0, void 0, function* () {
-            const shouldPrompt = cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
+            const shouldPrompt = Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
             let inquirer;
             let prompted = false;
             for (let i = 0; i < command.options.length; i++) {
@@ -100,7 +103,7 @@ class Command {
                 }
                 if (!prompted) {
                     prompted = true;
-                    cli_1.Cli.log('Provide values for the following parameters:');
+                    Cli_1.Cli.log('Provide values for the following parameters:');
                 }
                 if (!inquirer) {
                     inquirer = require('inquirer');
@@ -135,6 +138,17 @@ class Command {
             return true;
         });
     }
+    validateOutput(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.output &&
+                this.allowedOutputs.indexOf(args.options.output) < 0) {
+                return `'${args.options.output}' is not a valid output type. Allowed output types are ${this.allowedOutputs.join(', ')}`;
+            }
+            else {
+                return true;
+            }
+        });
+    }
     alias() {
         return;
     }
@@ -359,15 +373,15 @@ class Command {
             }
             const lowerCaseValue = value.toLowerCase();
             if (lowerCaseValue === '@meid') {
-                args.options[option] = utils_1.accessToken.getUserIdFromAccessToken(token);
+                args.options[option] = accessToken_1.accessToken.getUserIdFromAccessToken(token);
             }
             if (lowerCaseValue === '@meusername') {
-                args.options[option] = utils_1.accessToken.getUserNameFromAccessToken(token);
+                args.options[option] = accessToken_1.accessToken.getUserNameFromAccessToken(token);
             }
         });
     }
     showDeprecationWarning(logger, deprecated, recommended) {
-        const cli = cli_1.Cli.getInstance();
+        const cli = Cli_1.Cli.getInstance();
         if (cli.currentCommandName &&
             cli.currentCommandName.indexOf(deprecated) === 0) {
             const chalk = require('chalk');
@@ -379,7 +393,7 @@ class Command {
         logger.logToStderr(chalk.yellow(warning));
     }
     getUsedCommandName() {
-        const cli = cli_1.Cli.getInstance();
+        const cli = Cli_1.Cli.getInstance();
         const commandName = this.getCommandName();
         if (!cli.currentCommandName) {
             return commandName;
@@ -417,9 +431,9 @@ _Command_instances = new WeakSet(), _Command_initTelemetry = function _Command_i
 }, _Command_initOptions = function _Command_initOptions() {
     this.options.unshift({ option: '--query [query]' }, {
         option: '-o, --output [output]',
-        autocomplete: ['csv', 'json', 'text']
+        autocomplete: this.allowedOutputs
     }, { option: '--verbose' }, { option: '--debug' });
 }, _Command_initValidators = function _Command_initValidators() {
-    this.validators.push((args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), (args, command) => this.validateOptionSets(args, command));
+    this.validators.push((args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), args => this.validateOutput(args), (args, command) => this.validateOptionSets(args, command));
 };
 //# sourceMappingURL=Command.js.map

package/dist/api.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCommand = void 0;
-const cli_1 = require("./cli");
+const Cli_1 = require("./cli/Cli");
 const path = require("path");
 function executeCommand(commandName, options, listener) {
-    const cli = cli_1.Cli.getInstance();
+    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);
+    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/appInsights.js

@@ -10,6 +10,7 @@ const appInsights = require("applicationinsights");
 const crypto = require("crypto");
 const fs = require("fs");
 const path = require("path");
+const pid_1 = require("./utils/pid");
 const config = appInsights.setup('6b908c80-d09f-4cf6-8274-e54349a0149a');
 config.setInternalLogging(false, false);
 // append -dev to the version number when ran locally
@@ -20,6 +21,7 @@ const env = process.env.CLIMICROSOFT365_ENV !== undefined ? process.env.CLIMICRO
 appInsights.defaultClient.commonProperties = {
     version: version,
     node: process.version,
+    shell: pid_1.pid.getProcessName(process.ppid) || '',
     env: env,
     ci: Boolean(process.env.CI).toString()
 };

package/dist/cli/Cli.js

@@ -19,7 +19,9 @@ 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 formatting_1 = require("../utils/formatting");
+const fsUtil_1 = require("../utils/fsUtil");
+const md_1 = require("../utils/md");
 const packageJSON = require('../../package.json');
 class Cli {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -200,31 +202,28 @@ class Cli {
             const currentLogger = request_1.default.logger;
             try {
                 yield command.action(logger, args);
-                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                // restore the original logger
-                request_1.default.logger = currentLogger;
                 return ({
                     stdout: log.join(os.EOL),
                     stderr: logErr.join(os.EOL)
                 });
             }
             catch (err) {
-                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                // restore the original logger
-                request_1.default.logger = currentLogger;
                 throw {
                     error: err,
                     stderr: logErr.join(os.EOL)
                 };
             }
+            /* c8 ignore next */
+            finally {
+                // restore the original command name
+                cli.currentCommandName = parentCommandName;
+                // restore the original logger
+                request_1.default.logger = currentLogger;
+            }
         });
     }
     loadAllCommands() {
-        const files = utils_1.fsUtil.readdirR(this.commandsFolder);
+        const files = fsUtil_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 &&
@@ -435,7 +434,7 @@ class Cli {
                         Array.isArray(logStatement[0].value)) {
                         logStatement = logStatement[0].value;
                     }
-                    logStatement = logStatement.map((s) => utils_1.formatting.filterObject(s, currentCommand.defaultProperties));
+                    logStatement = logStatement.map((s) => formatting_1.formatting.filterObject(s, currentCommand.defaultProperties));
                 }
             }
         }
@@ -537,7 +536,7 @@ class Cli {
         helpFilePath = path.join(...pathChunks);
         if (fs.existsSync(helpFilePath)) {
             Cli.log();
-            Cli.log(utils_1.md.md2plain(fs.readFileSync(helpFilePath, 'utf8'), path.join(this.commandsFolder, '..', '..', 'docs')));
+            Cli.log(md_1.md.md2plain(fs.readFileSync(helpFilePath, 'utf8'), path.join(this.commandsFolder, '..', '..', 'docs')));
         }
     }
     printAvailableCommands() {

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const appInsights_1 = require("./appInsights");
-const cli_1 = require("./cli");
+const Cli_1 = require("./cli/Cli");
 const packageJSON = require('../package.json');
 // required to make console.log() in combination with piped output synchronous
 // on Windows/in PowerShell so that the output is not trimmed by calling
@@ -19,7 +19,7 @@ if (!process.env.CLIMICROSOFT365_NOUPDATE) {
 }
 fs.realpath(__dirname, (err, resolvedPath) => {
     try {
-        const cli = cli_1.Cli.getInstance();
+        const cli = Cli_1.Cli.getInstance();
         cli.execute(path.join(resolvedPath, 'm365'), process.argv.slice(2));
     }
     catch (e) {

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

@@ -13,13 +13,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators;
+var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppAddCommand extends GraphCommand_1.default {
@@ -31,6 +32,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_ADD;
@@ -47,7 +49,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
                 // 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.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+                appInfo.tenantId = accessToken_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
                 appInfo = yield this.updateAppFromManifest(args, appInfo);
                 appInfo = yield this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger);
                 appInfo = yield this.configureUri(args, appInfo, logger);
@@ -205,8 +207,6 @@ class AadAppAddCommand extends GraphCommand_1.default {
         delete v2Manifest.appId;
         delete v2Manifest.publisherDomain;
         // extract secrets from the manifest. Store them in a separate variable
-        // and remove them from the manifest because we need to create them
-        // separately
         const secrets = this.getSecretsFromManifest(v2Manifest);
         // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
         if (args.options.apisApplication || args.options.apisDelegated) {
@@ -214,6 +214,33 @@ class AadAppAddCommand extends GraphCommand_1.default {
             // otherwise, they will be skipped in the app update
             v2Manifest.requiredResourceAccess = appInfo.requiredResourceAccess;
         }
+        if (args.options.redirectUris) {
+            // take submitted redirectUris/platform as options
+            // otherwise, they will be removed from the app
+            v2Manifest.replyUrlsWithType = args.options.redirectUris.split(',').map(u => {
+                return {
+                    url: u.trim(),
+                    type: this.translatePlatformToType(args.options.platform)
+                };
+            });
+        }
+        if (args.options.multitenant) {
+            // override manifest setting when using multitenant flag
+            v2Manifest.signInAudience = 'AzureADMultipleOrgs';
+        }
+        if (args.options.implicitFlow) {
+            // remove manifest settings when using implicitFlow flag
+            delete v2Manifest.oauth2AllowIdTokenImplicitFlow;
+            delete v2Manifest.oauth2AllowImplicitFlow;
+        }
+        if (args.options.scopeName) {
+            // override manifest setting when using options.
+            delete v2Manifest.oauth2Permissions;
+        }
+        if (args.options.certificateFile || args.options.certificateBase64Encoded) {
+            // override manifest setting when using options.
+            delete v2Manifest.keyCredentials;
+        }
         const graphManifest = this.transformManifest(v2Manifest);
         const updateAppRequestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
@@ -421,10 +448,9 @@ class AadAppAddCommand extends GraphCommand_1.default {
         if (this.verbose) {
             logger.logToStderr('Resolving requested APIs...');
         }
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`)
             .then(servicePrincipals => {
-            var _a;
             let resolvedApis = [];
             try {
                 if (args.options.apisDelegated || args.options.apisApplication) {
@@ -447,17 +473,10 @@ class AadAppAddCommand extends GraphCommand_1.default {
                         }
                     });
                 }
-                if (typeof ((_a = this.manifest) === null || _a === void 0 ? void 0 : _a.requiredResourceAccess) !== 'undefined' && this.manifest.requiredResourceAccess.length > 0) {
+                else {
                     const manifestApis = this.manifest.requiredResourceAccess;
                     manifestApis.forEach(manifestApi => {
-                        const requiredResource = resolvedApis.find(api => api.resourceAppId === manifestApi.resourceAppId);
-                        if (requiredResource) {
-                            // exclude if any duplicate required resources in both manifest and submitted options
-                            requiredResource.resourceAccess.push(...manifestApi.resourceAccess.filter(manRes => !requiredResource.resourceAccess.some(res => res.id === manRes.id)));
-                        }
-                        else {
-                            resolvedApis.push(manifestApi);
-                        }
+                        resolvedApis.push(manifestApi);
                         const app = servicePrincipals.find(servicePrincipals => servicePrincipals.appId === manifestApi.resourceAppId);
                         if (app) {
                             manifestApi.resourceAccess.forEach((res => {
@@ -546,7 +565,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
     }
     configureSecret(args, appInfo, logger) {
-        if (!args.options.withSecret) {
+        if (!args.options.withSecret || (appInfo.secrets && appInfo.secrets.length > 0)) {
             return Promise.resolve(appInfo);
         }
         if (this.verbose) {
@@ -642,6 +661,12 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
         return Promise.resolve(appInfo);
     }
+    translatePlatformToType(platform) {
+        if (platform === 'publicClient') {
+            return 'InstalledClient';
+        }
+        return platform.charAt(0).toUpperCase() + platform.substring(1);
+    }
 }
 _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = function _AadAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -707,9 +732,6 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
     });
 }, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.manifest && !args.options.name) {
-            return 'Specify either the name of the app to create or the manifest';
-        }
         if (args.options.platform &&
             AadAppAddCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
             return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppAddCommand.aadApplicationPlatform.join(', ')}`;
@@ -754,6 +776,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         }
         return true;
     }));
+}, _AadAppAddCommand_initOptionSets = function _AadAppAddCommand_initOptionSets() {
+    this.optionSets.push(['name', 'manifest']);
 };
 AadAppAddCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 AadAppAddCommand.aadAppScopeConsentBy = ['admins', 'adminsAndUsers'];

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

@@ -17,7 +17,8 @@ var _AadAppGetCommand_instances, _AadAppGetCommand_initTelemetry, _AadAppGetComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppGetCommand extends GraphCommand_1.default {
@@ -54,8 +55,8 @@ class AadAppGetCommand extends GraphCommand_1.default {
         }
         const { appId, name } = args.options;
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(name)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -140,10 +141,10 @@ _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = f
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--save' });
 }, _AadAppGetCommand_initValidators = function _AadAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_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)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

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

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadAppListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.APP_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of Azure AD app registrations';
+    }
+    defaultProperties() {
+        return ['appId', 'id', 'displayName', "signInAudience"];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const results = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/applications`);
+                logger.log(results);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new AadAppListCommand();
+//# sourceMappingURL=app-list.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppRemoveCommand_initOptions, _AadAppRemoveCommand_initValidators, _AadAppRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRemoveCommand extends GraphCommand_1.default {
@@ -60,7 +61,7 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
                 yield deleteApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -81,8 +82,8 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(name)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -117,10 +118,10 @@ _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemet
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--confirm' });
 }, _AadAppRemoveCommand_initValidators = function _AadAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_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)) {
+        if (args.options.objectId && !validation_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-add.js

@@ -17,6 +17,7 @@ var _AadAppRoleAddCommand_instances, _AadAppRoleAddCommand_initTelemetry, _AadAp
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAddCommand extends GraphCommand_1.default {
@@ -99,8 +100,8 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(appName)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadAppRoleListCommand_instances, _AadAppRoleListCommand_initTelemetry, _AadAppRoleListCommand_initOptions, _AadAppRoleListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleListCommand extends GraphCommand_1.default {
@@ -40,7 +41,7 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const objectId = yield this.getAppObjectId(args, logger);
-                const appRoles = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`);
+                const appRoles = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`);
                 logger.log(appRoles);
             }
             catch (err) {
@@ -57,8 +58,8 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(appName)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {