@pnp/cli-microsoft365 7.0.0-beta.a9cf617 → 7.0.0-beta.b7ec1d3

package/dist/Command.js

@@ -40,7 +40,7 @@ class CommandErrorWithOutput {
 exports.CommandErrorWithOutput = CommandErrorWithOutput;
 class Command {
     get allowedOutputs() {
-        return ['csv', 'json', 'md', 'text'];
+        return ['csv', 'json', 'md', 'text', 'none'];
     }
     constructor() {
         // These functions must be defined with # so that they're truly private

package/dist/cli/Cli.js

@@ -107,7 +107,9 @@ class Cli {
                 showHelp ||
                 parsedArgs.h ||
                 parsedArgs.help) {
-                this.printHelp(this.getHelpMode(parsedArgs));
+                if (parsedArgs.output !== 'none') {
+                    this.printHelp(this.getHelpMode(parsedArgs));
+                }
                 return Promise.resolve();
             }
             const optionsWithoutShorts = Cli.removeShortOptions(this.optionsFromArgs);
@@ -144,11 +146,21 @@ class Cli {
         return __awaiter(this, void 0, void 0, function* () {
             const logger = {
                 log: (message) => {
-                    const output = Cli.formatOutput(command, message, args.options);
-                    Cli.log(output);
+                    if (args.options.output !== 'none') {
+                        const output = Cli.formatOutput(command, message, args.options);
+                        Cli.log(output);
+                    }
+                },
+                logRaw: (message) => {
+                    if (args.options.output !== 'none') {
+                        Cli.log(message);
+                    }
                 },
-                logRaw: (message) => Cli.log(message),
-                logToStderr: (message) => Cli.error(message)
+                logToStderr: (message) => {
+                    if (args.options.output !== 'none') {
+                        Cli.error(message);
+                    }
+                }
             };
             if (args.options.debug) {
                 logger.logToStderr(`Executing command ${command.name} with options ${JSON.stringify(args)}`);
@@ -158,7 +170,7 @@ class Cli {
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
             cli.currentCommandName = command.getCommandName(cli.currentCommandName);
-            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true);
+            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true) && args.options.output !== 'none';
             // don't show spinner if running tests
             /* c8 ignore next 3 */
             if (showSpinner && typeof global.it === 'undefined') {
@@ -207,7 +219,7 @@ class Cli {
                     logErr.push(message);
                 }
             };
-            if (args.options.debug) {
+            if (args.options.debug && args.options.output !== 'none') {
                 const message = `Executing command ${command.name} with options ${JSON.stringify(args)}`;
                 if (listener && listener.stderr) {
                     listener.stderr(message);
@@ -730,8 +742,11 @@ class Cli {
         Cli.log();
     }
     closeWithError(error, args, showHelpIfEnabled = false) {
-        const chalk = require('chalk');
         let exitCode = 1;
+        if (args.options.output === 'none') {
+            return process.exit(exitCode);
+        }
+        const chalk = require('chalk');
         let errorMessage = error instanceof Command_1.CommandError ? error.message : error;
         if ((!args.options.output || args.options.output === 'json') &&
             !this.getSettingWithDefaultValue(settingsNames_1.settingsNames.printErrorsAsPlainText, true)) {

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

@@ -57,7 +57,7 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield deleteApp();
             }
             else {
@@ -110,11 +110,11 @@ _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemet
             appId: typeof args.options.appId !== 'undefined',
             objectId: typeof args.options.objectId !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _AadAppRemoveCommand_initOptions = function _AadAppRemoveCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--confirm' });
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '-f, --force' });
 }, _AadAppRemoveCommand_initValidators = function _AadAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {

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

@@ -46,7 +46,7 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield deleteAppRole();
             }
             else {
@@ -189,7 +189,7 @@ _AadAppRoleRemoveCommand_instances = new WeakSet(), _AadAppRoleRemoveCommand_ini
         });
     });
 }, _AadAppRoleRemoveCommand_initOptions = function _AadAppRoleRemoveCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name [name]' }, { option: '-i, --id [id]' }, { option: '-c, --claim [claim]' }, { option: '--confirm' });
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name [name]' }, { option: '-i, --id [id]' }, { option: '-c, --claim [claim]' }, { option: '-f, --force' });
 }, _AadAppRoleRemoveCommand_initValidators = function _AadAppRoleRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {

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

@@ -119,7 +119,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeAppRoleAssignment();
             }
             else {
@@ -166,7 +166,7 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined',
             appObjectId: typeof args.options.appObjectId !== 'undefined',
-            confirm: (!!args.options.confirm).toString()
+            force: (!!args.options.force).toString()
         });
     });
 }, _AadAppRoleAssignmentRemoveCommand_initOptions = function _AadAppRoleAssignmentRemoveCommand_initOptions() {
@@ -182,7 +182,7 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     }, {
         option: '-s, --scope <scope>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _AadAppRoleAssignmentRemoveCommand_initValidators = function _AadAppRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -53,7 +53,7 @@ class AadGroupSettingRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeGroupSetting();
             }
             else {
@@ -73,14 +73,14 @@ class AadGroupSettingRemoveCommand extends GraphCommand_1.default {
 _AadGroupSettingRemoveCommand_instances = new WeakSet(), _AadGroupSettingRemoveCommand_initTelemetry = function _AadGroupSettingRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _AadGroupSettingRemoveCommand_initOptions = function _AadGroupSettingRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _AadGroupSettingRemoveCommand_initValidators = function _AadGroupSettingRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-clear.js

@@ -43,7 +43,7 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield clearO365GroupRecycleBinItems();
             }
             else {
@@ -85,12 +85,12 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
 _AadO365GroupRecycleBinItemClearCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemClearCommand_initTelemetry = function _AadO365GroupRecycleBinItemClearCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: typeof args.options.confirm !== 'undefined'
+            force: typeof args.options.force !== 'undefined'
         });
     });
 }, _AadO365GroupRecycleBinItemClearCommand_initOptions = function _AadO365GroupRecycleBinItemClearCommand_initOptions() {
     this.options.unshift({
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new AadO365GroupRecycleBinItemClearCommand();

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-remove.js

@@ -54,7 +54,7 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeGroup();
             }
             else {
@@ -108,7 +108,7 @@ _AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365Grou
             id: typeof args.options.id !== 'undefined',
             displayName: typeof args.options.displayName !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _AadO365GroupRecycleBinItemRemoveCommand_initOptions = function _AadO365GroupRecycleBinItemRemoveCommand_initOptions() {
@@ -119,7 +119,7 @@ _AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365Grou
     }, {
         option: '-m, --mailNickname [mailNickname]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _AadO365GroupRecycleBinItemRemoveCommand_initValidators = function _AadO365GroupRecycleBinItemRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -62,7 +62,7 @@ class AadO365GroupRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeGroup();
             }
             else {
@@ -82,7 +82,7 @@ class AadO365GroupRemoveCommand extends GraphCommand_1.default {
 _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand_initTelemetry = function _AadO365GroupRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString(),
+            force: (!(!args.options.force)).toString(),
             skipRecycleBin: args.options.skipRecycleBin
         });
     });
@@ -90,7 +90,7 @@ _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     }, {
         option: '--skipRecycleBin'
     });

package/dist/m365/aad/commands/o365group/o365group-user-remove.js

@@ -95,7 +95,7 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeUser();
             }
             else {
@@ -115,7 +115,7 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
 _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemoveCommand_initTelemetry = function _AadO365GroupUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString(),
+            force: (!(!args.options.force)).toString(),
             teamId: typeof args.options.teamId !== 'undefined',
             groupId: typeof args.options.groupId !== 'undefined'
         });
@@ -128,7 +128,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
     }, {
         option: '-n, --userName <userName>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _AadO365GroupUserRemoveCommand_initValidators = function _AadO365GroupUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -52,7 +52,7 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeOauth2Grant();
             }
             else {
@@ -73,7 +73,7 @@ _AadOAuth2GrantRemoveCommand_instances = new WeakSet(), _AadOAuth2GrantRemoveCom
     this.options.unshift({
         option: '-i, --grantId <grantId>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new AadOAuth2GrantRemoveCommand();

package/dist/m365/aad/commands/siteclassification/siteclassification-disable.js

@@ -71,7 +71,7 @@ class AadSiteClassificationDisableCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield disableSiteClassification();
             }
             else {
@@ -91,12 +91,12 @@ class AadSiteClassificationDisableCommand extends GraphCommand_1.default {
 _AadSiteClassificationDisableCommand_instances = new WeakSet(), _AadSiteClassificationDisableCommand_initTelemetry = function _AadSiteClassificationDisableCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _AadSiteClassificationDisableCommand_initOptions = function _AadSiteClassificationDisableCommand_initOptions() {
     this.options.unshift({
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new AadSiteClassificationDisableCommand();

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

@@ -50,6 +50,9 @@ class AadUserGetCommand extends GraphCommand_1.default {
             else if (args.options.email) {
                 requestUrl += `?$filter=mail eq '${formatting_1.formatting.encodeQueryParameter(args.options.email)}'${properties}`;
             }
+            if (args.options.withManager) {
+                requestUrl += '&$expand=manager($select=displayName,userPrincipalName,id,mail)';
+            }
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -82,7 +85,8 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
             id: typeof args.options.id !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
             email: typeof args.options.email !== 'undefined',
-            properties: args.options.properties
+            properties: args.options.properties,
+            withManager: typeof args.options.withManager !== 'undefined'
         });
     });
 }, _AadUserGetCommand_initOptions = function _AadUserGetCommand_initOptions() {
@@ -94,6 +98,8 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
         option: '--email [email]'
     }, {
         option: '-p, --properties [properties]'
+    }, {
+        option: '--withManager'
     });
 }, _AadUserGetCommand_initValidators = function _AadUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/aad/commands/user/user-license-remove.js

@@ -40,7 +40,7 @@ class AadUserLicenseRemoveCommand extends GraphCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing the licenses for the user '${args.options.userId || args.options.userName}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteUserLicenses(args);
             }
             else {
@@ -82,7 +82,7 @@ _AadUserLicenseRemoveCommand_instances = new WeakSet(), _AadUserLicenseRemoveCom
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _AadUserLicenseRemoveCommand_initOptions = function _AadUserLicenseRemoveCommand_initOptions() {
@@ -93,7 +93,7 @@ _AadUserLicenseRemoveCommand_instances = new WeakSet(), _AadUserLicenseRemoveCom
     }, {
         option: '--ids <ids>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _AadUserLicenseRemoveCommand_initOptionSets = function _AadUserLicenseRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['userId', 'userName'] });

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

@@ -48,8 +48,7 @@ class AadUserListCommand extends GraphCommand_1.default {
                 catch (ex) {
                     throw ex;
                 }
-                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`;
+                const url = `${this.resource}/v1.0/users?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
                 const users = yield odata_1.odata.getAllItems(url);
                 logger.log(users);
             }
@@ -63,7 +62,6 @@ class AadUserListCommand extends GraphCommand_1.default {
         const excludeOptions = [
             'properties',
             'p',
-            'deleted',
             'd',
             'debug',
             'verbose',
@@ -90,12 +88,11 @@ class AadUserListCommand extends GraphCommand_1.default {
 _AadUserListCommand_instances = new WeakSet(), _AadUserListCommand_initTelemetry = function _AadUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            properties: args.options.properties,
-            deleted: typeof args.options.deleted !== 'undefined'
+            properties: args.options.properties
         });
     });
 }, _AadUserListCommand_initOptions = function _AadUserListCommand_initOptions() {
-    this.options.unshift({ option: '-p, --properties [properties]' }, { option: '-d, --deleted' });
+    this.options.unshift({ option: '-p, --properties [properties]' });
 };
 module.exports = new AadUserListCommand();
 //# sourceMappingURL=user-list.js.map

package/dist/m365/aad/commands/user/user-recyclebinitem-clear.js

@@ -71,7 +71,7 @@ class AadUserRecycleBinItemClearCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield clearRecycleBinUsers();
             }
             else {
@@ -91,12 +91,12 @@ class AadUserRecycleBinItemClearCommand extends GraphCommand_1.default {
 _AadUserRecycleBinItemClearCommand_instances = new WeakSet(), _AadUserRecycleBinItemClearCommand_initTelemetry = function _AadUserRecycleBinItemClearCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _AadUserRecycleBinItemClearCommand_initOptions = function _AadUserRecycleBinItemClearCommand_initOptions() {
     this.options.unshift({
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new AadUserRecycleBinItemClearCommand();

package/dist/m365/aad/commands/user/user-recyclebinitem-remove.js

@@ -51,7 +51,7 @@ class AadUserRecycleBinItemRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield clearRecycleBinItem();
             }
             else {
@@ -71,14 +71,14 @@ class AadUserRecycleBinItemRemoveCommand extends GraphCommand_1.default {
 _AadUserRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadUserRecycleBinItemRemoveCommand_initTelemetry = function _AadUserRecycleBinItemRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _AadUserRecycleBinItemRemoveCommand_initOptions = function _AadUserRecycleBinItemRemoveCommand_initOptions() {
     this.options.unshift({
         option: '--id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _AadUserRecycleBinItemRemoveCommand_initValidators = function _AadUserRecycleBinItemRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -40,7 +40,7 @@ class AadUserRemoveCommand extends GraphCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing user '${args.options.id || args.options.userName}'...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.deleteUser(args);
             }
             else {
@@ -79,7 +79,7 @@ _AadUserRemoveCommand_instances = new WeakSet(), _AadUserRemoveCommand_initTelem
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _AadUserRemoveCommand_initOptions = function _AadUserRemoveCommand_initOptions() {
@@ -88,7 +88,7 @@ _AadUserRemoveCommand_instances = new WeakSet(), _AadUserRemoveCommand_initTelem
     }, {
         option: '--userName [userName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _AadUserRemoveCommand_initOptionSets = function _AadUserRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'userName'] });

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

@@ -45,21 +45,21 @@ class AadUserSetCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (args.options.currentPassword) {
-                    if (args.options.objectId && args.options.objectId !== accessToken_1.accessToken.getUserIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)) {
-                        throw `You can only change your own password. Please use --objectId @meId to reference to your own userId`;
+                    if (args.options.id && args.options.id !== accessToken_1.accessToken.getUserIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)) {
+                        throw `You can only change your own password. Please use --id @meId to reference to your own userId`;
                     }
-                    else if (args.options.userPrincipalName && args.options.userPrincipalName.toLowerCase() !== accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken).toLowerCase()) {
-                        throw 'You can only change your own password. Please use --userPrincipalName @meUserName to reference to your own user principal name';
+                    else if (args.options.userName && args.options.userName.toLowerCase() !== accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken).toLowerCase()) {
+                        throw 'You can only change your own password. Please use --userName @meUserName to reference to your own user principal name';
                     }
                 }
                 if (this.verbose) {
-                    logger.logToStderr(`Updating user ${args.options.userPrincipalName || args.options.objectId}`);
+                    logger.logToStderr(`Updating user ${args.options.userName || args.options.id}`);
                 }
-                const requestUrl = `${this.resource}/v1.0/users/${formatting_1.formatting.encodeQueryParameter(args.options.objectId ? args.options.objectId : args.options.userPrincipalName)}`;
+                const requestUrl = `${this.resource}/v1.0/users/${formatting_1.formatting.encodeQueryParameter(args.options.id ? args.options.id : args.options.userName)}`;
                 const manifest = this.mapRequestBody(args.options);
                 if (Object.keys(manifest).some(k => manifest[k] !== undefined)) {
                     if (this.verbose) {
-                        logger.logToStderr(`Setting the updated properties for user ${args.options.userPrincipalName || args.options.objectId}`);
+                        logger.logToStderr(`Setting the updated properties for user ${args.options.userName || args.options.id}`);
                     }
                     const requestOptions = {
                         url: requestUrl,
@@ -84,7 +84,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
                     if (this.verbose) {
                         logger.logToStderr('Removing the manager');
                     }
-                    const user = args.options.objectId || args.options.userPrincipalName;
+                    const user = args.options.id || args.options.userName;
                     yield this.removeManager(user);
                 }
             }
@@ -125,7 +125,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
     changePassword(requestUrl, options, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Changing password for user ${options.userPrincipalName || options.objectId}`);
+                logger.logToStderr(`Changing password for user ${options.userName || options.id}`);
             }
             const requestBody = {
                 currentPassword: options.currentPassword,
@@ -145,7 +145,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
     updateManager(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const managerRequestOptions = {
-                url: `${this.resource}/v1.0/users/${options.objectId || options.userPrincipalName}/manager/$ref`,
+                url: `${this.resource}/v1.0/users/${options.id || options.userName}/manager/$ref`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -171,8 +171,8 @@ class AadUserSetCommand extends GraphCommand_1.default {
 _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry = function _AadUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            objectId: typeof args.options.objectId !== 'undefined',
-            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
             accountEnabled: !!args.options.accountEnabled,
             resetPassword: !!args.options.resetPassword,
             forceChangePasswordNextSignIn: !!args.options.forceChangePasswordNextSignIn,
@@ -195,9 +195,9 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     });
 }, _AadUserSetCommand_initOptions = function _AadUserSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --objectId [objectId]'
+        option: '-i, --id [id]'
     }, {
-        option: '-n, --userPrincipalName [userPrincipalName]'
+        option: '-n, --userName [userName]'
     }, {
         option: '--accountEnabled [accountEnabled]',
         autocomplete: ['true', 'false']
@@ -240,12 +240,12 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     this.types.boolean.push('accountEnabled');
 }, _AadUserSetCommand_initValidators = function _AadUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.objectId &&
-            !validation_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
+        if (args.options.id &&
+            !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.userPrincipalName && !validation_1.validation.isValidUserPrincipalName(args.options.userPrincipalName)) {
-            return `${args.options.userPrincipalName} is not a valid userPrincipalName`;
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
         }
         if (!args.options.resetPassword && ((args.options.currentPassword && !args.options.newPassword) || (args.options.newPassword && !args.options.currentPassword))) {
             return `Specify both currentPassword and newPassword when you want to change your password`;
@@ -296,7 +296,7 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
     }));
 }, _AadUserSetCommand_initOptionSets = function _AadUserSetCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['objectId', 'userPrincipalName']
+        options: ['id', 'userName']
     }, {
         options: ['managerUserId', 'managerUserName', 'removeManager'],
         runsWhen: (args) => args.options.managerUserId || args.options.managerUserName || args.options.removeManager

package/dist/m365/booking/commands/business/business-get.js

@@ -56,26 +56,25 @@ class BookingBusinessGetCommand extends GraphCommand_1.default {
         });
     }
     getBusinessId(options) {
-        if (options.id) {
-            return Promise.resolve(options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/solutions/bookingBusinesses`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/solutions/bookingBusinesses`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             const name = options.name;
             const bookingBusinesses = response.value.filter(val => { var _a; return ((_a = val.displayName) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === name.toLocaleLowerCase(); });
             if (!bookingBusinesses.length) {
-                return Promise.reject(`The specified business with name ${options.name} does not exist.`);
+                throw `The specified business with name ${options.name} does not exist.`;
             }
             if (bookingBusinesses.length > 1) {
-                return Promise.reject(`Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`);
+                throw `Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`;
             }
             return bookingBusinesses[0].id;
         });