@pnp/cli-microsoft365 6.3.0-beta.82f99fc → 6.3.0-beta.98b4bc2

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

@@ -0,0 +1,223 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadUserAddCommand_instances, _AadUserAddCommand_initTelemetry, _AadUserAddCommand_initOptions, _AadUserAddCommand_initValidators, _AadUserAddCommand_initOptionSets, _AadUserAddCommand_initTypes;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_ADD;
+    }
+    get description() {
+        return 'Creates a new user';
+    }
+    constructor() {
+        super();
+        _AadUserAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserAddCommand_instances, "m", _AadUserAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserAddCommand_instances, "m", _AadUserAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserAddCommand_instances, "m", _AadUserAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserAddCommand_instances, "m", _AadUserAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadUserAddCommand_instances, "m", _AadUserAddCommand_initTypes).call(this);
+    }
+    commandAction(logger, args) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding user to AAD with displayName ${args.options.displayName} and userPrincipalName ${args.options.userName}`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/users`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        accountEnabled: (_a = args.options.accountEnabled) !== null && _a !== void 0 ? _a : true,
+                        displayName: args.options.displayName,
+                        userPrincipalName: args.options.userName,
+                        mailNickName: (_b = args.options.mailNickname) !== null && _b !== void 0 ? _b : args.options.userName.split('@')[0],
+                        passwordProfile: {
+                            forceChangePasswordNextSignIn: args.options.forceChangePasswordNextSignIn || false,
+                            forceChangePasswordNextSignInWithMfa: args.options.forceChangePasswordNextSignInWithMfa || false,
+                            password: (_c = args.options.password) !== null && _c !== void 0 ? _c : this.generatePassword()
+                        },
+                        givenName: args.options.firstName,
+                        surName: args.options.lastName,
+                        usageLocation: args.options.usageLocation,
+                        officeLocation: args.options.officeLocation,
+                        jobTitle: args.options.jobTitle,
+                        companyName: args.options.companyName,
+                        department: args.options.department,
+                        preferredLanguage: args.options.preferredLanguage
+                    }
+                };
+                const user = yield request_1.default.post(requestOptions);
+                user.password = requestOptions.data.passwordProfile.password;
+                if (args.options.managerUserId || args.options.managerUserName) {
+                    const managerRequestOptions = {
+                        url: `${this.resource}/v1.0/users/${user.id}/manager/$ref`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        data: {
+                            '@odata.id': `${this.resource}/v1.0/users/${args.options.managerUserId || args.options.managerUserName}`
+                        }
+                    };
+                    yield request_1.default.put(managerRequestOptions);
+                }
+                logger.log(user);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    /**
+     * Generate a password with at least: one digit, one lowercase chracter, one uppercase character and special character.
+     */
+    generatePassword() {
+        const numberChars = '0123456789';
+        const upperChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        const lowerChars = 'abcdefghijklmnopqrstuvwxyz';
+        const specialChars = '-_@%$#*&';
+        const allChars = numberChars + upperChars + lowerChars + specialChars;
+        let randPasswordArray = Array(15);
+        randPasswordArray[0] = numberChars;
+        randPasswordArray[1] = upperChars;
+        randPasswordArray[2] = lowerChars;
+        randPasswordArray[3] = specialChars;
+        randPasswordArray = randPasswordArray.fill(allChars, 4);
+        const randomCharacterArray = randPasswordArray.map((charSet) => charSet[Math.floor(Math.random() * charSet.length)]);
+        return this.shuffleArray(randomCharacterArray).join('');
+    }
+    shuffleArray(characterArray) {
+        for (let i = characterArray.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            const temp = characterArray[i];
+            characterArray[i] = characterArray[j];
+            characterArray[j] = temp;
+        }
+        return characterArray;
+    }
+}
+_AadUserAddCommand_instances = new WeakSet(), _AadUserAddCommand_initTelemetry = function _AadUserAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            accountEnabled: typeof args.options.accountEnabled !== 'undefined',
+            mailNickname: typeof args.options.mailNickname !== 'undefined',
+            password: typeof args.options.password !== 'undefined',
+            firstName: typeof args.options.firstName !== 'undefined',
+            lastName: typeof args.options.lastName !== 'undefined',
+            forceChangePasswordNextSignIn: !!args.options.forceChangePasswordNextSignIn,
+            forceChangePasswordNextSignInWithMfa: !!args.options.forceChangePasswordNextSignInWithMfa,
+            usageLocation: typeof args.options.usageLocation !== 'undefined',
+            officeLocation: typeof args.options.officeLocation !== 'undefined',
+            jobTitle: typeof args.options.jobTitle !== 'undefined',
+            companyName: typeof args.options.companyName !== 'undefined',
+            department: typeof args.options.department !== 'undefined',
+            preferredLanguage: typeof args.options.preferredLanguage !== 'undefined',
+            managerUserId: typeof args.options.managerUserId !== 'undefined',
+            managerUserName: typeof args.options.managerUserName !== 'undefined'
+        });
+    });
+}, _AadUserAddCommand_initOptions = function _AadUserAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--displayName <displayName>'
+    }, {
+        option: '--userName <userName>'
+    }, {
+        option: '--accountEnabled [accountEnabled]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--mailNickname [mailNickname]'
+    }, {
+        option: '--password [password]'
+    }, {
+        option: '--firstName [firstName]'
+    }, {
+        option: '--lastName [lastName]'
+    }, {
+        option: '--forceChangePasswordNextSignIn'
+    }, {
+        option: '--forceChangePasswordNextSignInWithMfa'
+    }, {
+        option: '--usageLocation [usageLocation]'
+    }, {
+        option: '--officeLocation [officeLocation]'
+    }, {
+        option: '--jobTitle [jobTitle]'
+    }, {
+        option: '--companyName [companyName]'
+    }, {
+        option: '--department [department]'
+    }, {
+        option: '--preferredLanguage [preferredLanguage]'
+    }, {
+        option: '--managerUserId [managerUserId]'
+    }, {
+        option: '--managerUserName [managerUserName]'
+    });
+}, _AadUserAddCommand_initValidators = function _AadUserAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        if (args.options.usageLocation) {
+            const regex = new RegExp('^[a-zA-Z]{2}$');
+            if (!regex.test(args.options.usageLocation)) {
+                return `'${args.options.usageLocation}' is not a valid usageLocation.`;
+            }
+        }
+        if (args.options.preferredLanguage && args.options.preferredLanguage.length < 2) {
+            return `'${args.options.preferredLanguage}' is not a valid preferredLanguage`;
+        }
+        if (args.options.firstName && args.options.firstName.length > 64) {
+            return `The maximum amount of characters for 'firstName' is 64.`;
+        }
+        if (args.options.lastName && args.options.lastName.length > 64) {
+            return `The maximum amount of characters for 'lastName' is 64.`;
+        }
+        if (args.options.jobTitle && args.options.jobTitle.length > 128) {
+            return `The maximum amount of characters for 'jobTitle' is 128.`;
+        }
+        if (args.options.companyName && args.options.companyName.length > 64) {
+            return `The maximum amount of characters for 'companyName' is 64.`;
+        }
+        if (args.options.department && args.options.department.length > 64) {
+            return `The maximum amount of characters for 'department' is 64.`;
+        }
+        if (args.options.managerUserName && !validation_1.validation.isValidUserPrincipalName(args.options.managerUserName)) {
+            return `'${args.options.managerUserName}' is not a valid user principal name.`;
+        }
+        if (args.options.managerUserId && !validation_1.validation.isValidGuid(args.options.managerUserId)) {
+            return `'${args.options.managerUserId}' is not a valid GUID.`;
+        }
+        return true;
+    }));
+}, _AadUserAddCommand_initOptionSets = function _AadUserAddCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['managerUserId', 'managerUserName'],
+        runsWhen: (args) => args.options.managerId || args.options.managerUserName
+    });
+}, _AadUserAddCommand_initTypes = function _AadUserAddCommand_initTypes() {
+    this.types.boolean.push('accountEnabled');
+};
+module.exports = new AadUserAddCommand();
+//# sourceMappingURL=user-add.js.map

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

@@ -0,0 +1,99 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadUserLicenseListCommand_instances, _AadUserLicenseListCommand_initTelemetry, _AadUserLicenseListCommand_initOptions, _AadUserLicenseListCommand_initValidators, _AadUserLicenseListCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const Auth_1 = require("../../../../Auth");
+class AadUserLicenseListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_LICENSE_LIST;
+    }
+    get description() {
+        return 'Lists the license details for a given user';
+    }
+    defaultProperties() {
+        return ['id', 'skuId', 'skuPartNumber'];
+    }
+    constructor() {
+        super();
+        _AadUserLicenseListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserLicenseListCommand_instances, "m", _AadUserLicenseListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserLicenseListCommand_instances, "m", _AadUserLicenseListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserLicenseListCommand_instances, "m", _AadUserLicenseListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserLicenseListCommand_instances, "m", _AadUserLicenseListCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+            if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
+                this.handleError(`Specify at least 'userId' or 'userName' when using application permissions.`);
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving licenses from user: ${args.options.userId || args.options.userName || 'current user'}.`);
+            }
+            let requestUrl = `${this.resource}/v1.0/`;
+            if (args.options.userId || args.options.userName) {
+                requestUrl += `users/${args.options.userId || args.options.userName}`;
+            }
+            else {
+                requestUrl += 'me';
+            }
+            requestUrl += '/licenseDetails';
+            try {
+                const items = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_AadUserLicenseListCommand_instances = new WeakSet(), _AadUserLicenseListCommand_initTelemetry = function _AadUserLicenseListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _AadUserLicenseListCommand_initOptions = function _AadUserLicenseListCommand_initOptions() {
+    this.options.unshift({
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _AadUserLicenseListCommand_initValidators = function _AadUserLicenseListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN)`;
+        }
+        return true;
+    }));
+}, _AadUserLicenseListCommand_initOptionSets = function _AadUserLicenseListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['userId', 'userName'],
+        runsWhen: (args) => args.options.userId || args.options.userName
+    });
+};
+module.exports = new AadUserLicenseListCommand();
+//# sourceMappingURL=user-license-list.js.map

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

@@ -0,0 +1,41 @@
+"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 AadUserRecycleBinItemListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_RECYCLEBINITEM_LIST;
+    }
+    get description() {
+        return 'Lists users from the recycle bin in the current tenant';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'userPrincipalName'];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving users from the recycle bin...');
+            }
+            try {
+                const users = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/directory/deletedItems/microsoft.graph.user`);
+                logger.log(users);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new AadUserRecycleBinItemListCommand();
+//# sourceMappingURL=user-recyclebinitem-list.js.map

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

@@ -0,0 +1,107 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadUserRemoveCommand_instances, _AadUserRemoveCommand_initTelemetry, _AadUserRemoveCommand_initOptions, _AadUserRemoveCommand_initOptionSets, _AadUserRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const Cli_1 = require("../../../../cli/Cli");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+class AadUserRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific user';
+    }
+    constructor() {
+        super();
+        _AadUserRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserRemoveCommand_instances, "m", _AadUserRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserRemoveCommand_instances, "m", _AadUserRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserRemoveCommand_instances, "m", _AadUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadUserRemoveCommand_instances, "m", _AadUserRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing user '${args.options.id || args.options.userName}'...`);
+            }
+            if (args.options.confirm) {
+                yield this.deleteUser(args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?`
+                });
+                if (result.continue) {
+                    yield this.deleteUser(args);
+                }
+            }
+        });
+    }
+    deleteUser(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/users/${args.options.id || args.options.userName}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_AadUserRemoveCommand_instances = new WeakSet(), _AadUserRemoveCommand_initTelemetry = function _AadUserRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _AadUserRemoveCommand_initOptions = function _AadUserRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--id [id]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--confirm'
+    });
+}, _AadUserRemoveCommand_initOptionSets = function _AadUserRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'userName'] });
+}, _AadUserRemoveCommand_initValidators = function _AadUserRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN)`;
+        }
+        return true;
+    }));
+};
+module.exports = new AadUserRemoveCommand();
+//# sourceMappingURL=user-remove.js.map

package/dist/m365/aad/commands.js

@@ -55,13 +55,17 @@ exports.default = {
     SITECLASSIFICATION_SET: `${prefix} siteclassification set`,
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
+    USER_ADD: `${prefix} user add`,
     USER_GET: `${prefix} user get`,
     USER_GUEST_ADD: `${prefix} user guest add`,
     USER_HIBP: `${prefix} user hibp`,
+    USER_LICENSE_LIST: `${prefix} user license list`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,
     USER_RECYCLEBINITEM_CLEAR: `${prefix} user recyclebinitem clear`,
+    USER_RECYCLEBINITEM_LIST: `${prefix} user recyclebinitem list`,
     USER_RECYCLEBINITEM_REMOVE: `${prefix} user recyclebinitem remove`,
+    USER_REMOVE: `${prefix} user remove`,
     USER_SET: `${prefix} user set`,
     USER_SIGNIN_LIST: `${prefix} user signin list`
 };

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

@@ -0,0 +1,168 @@
+# aad user add
+
+Creates a new user
+
+## Usage
+
+```sh
+m365 aad user add [options]
+```
+
+## Options
+
+`--displayName <displayName>`
+: The name to display in the address book for the user.
+
+`--userName <userName>`
+: The user principal name (someuser@contoso.com).
+
+`--accountEnabled [accountEnabled]`
+: Whether the account is enabled. Possible values: `true`, `false`. Default value is `true`.
+
+`--mailNickname [mailNickname]`
+: The mail alias for the user. By default this value will be extracted from `userName`.
+
+`--password [password]`
+: The password for the user. When not specified, a password will be generated.
+
+`--firstName [firstName]`
+: The given name (first name) of the user. Maximum length is 64 characters.
+
+`--lastName [lastName]`
+: The user's surname (family name or last name). Maximum length is 64 characters.
+
+`--forceChangePasswordNextSignIn`
+: Whether the user should change his/her password on the next login.
+
+`--forceChangePasswordNextSignInWithMfa`
+: Whether the user should change his/her password on the next login and setup MFA.
+
+`--usageLocation [usageLocation]`
+: A two letter [country code](https://learn.microsoft.com/en-us/partner-center/commercial-marketplace-co-sell-location-codes#country-and-region-codes) (ISO standard 3166). Required for users that will be assigned licenses.
+
+`--officeLocation [officeLocation]` 
+: The office location in the user's place of business.
+
+`--jobTitle [jobTitle]`
+: The user's job title. Maximum length is 128 characters.
+
+`--companyName [companyName]`
+: The company name which the user is associated. The maximum length is 64 characters.
+
+`--department [department]`
+: The name for the department in which the user works. Maximum length is 64 characters.
+
+`--preferredLanguage [preferredLanguage]`
+: The preferred language for the user. Should follow [ISO 639-1 Code](https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a). Example: `en-US`.
+
+`--managerUserId [managerUserId]`
+: User ID of the user's manager. Specify `managerUserId` or `managerUserName` but not both.
+
+`--managerUserName [managerUserName]`
+: User principal name of the manager. Specify `managerUserId` or `managerUserName` but not both.
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+!!! important
+    To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator
+
+!!! note
+    After running this command, it may take a minute before the user is effectively created in the tenant.
+
+## Examples
+
+Create a user and let him/her update the password at first login
+
+```sh
+m365 aad user add --displayName "John Doe" --userName "john.doe@contoso.com" --password "SomePassw0rd" --forceChangePasswordNextSignIn
+```
+
+Create a user with job information
+
+```sh
+m365 aad user add --displayName "John Doe" --userName "john.doe@contoso.com" --password "SomePassw0rd" --firstName John --lastName Doe --jobTitle "Sales Manager" --companyName Contoso --department Sales --officeLocation Vosselaar --forceChangePasswordNextSignIn
+```
+
+Create a user with language information
+
+```sh
+m365 aad user add --displayName "John Doe" --userName "john.doe@contoso.com" --preferredLanguage "nl-BE" --usageLocation BE --forceChangePasswordNextSignIn
+```
+
+Create a user with a manager
+
+```sh
+m365 aad user add --displayName "John Doe" --userName "john.doe@contoso.com" --managerUserName "adele@contoso.com"
+```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    {
+      "id": "990e2425-f595-43bc-85ed-b89a44093793",
+      "businessPhones": [],
+      "displayName": "John Doe",
+      "givenName": "John",
+      "jobTitle": "Sales Manager",
+      "mail": null,
+      "mobilePhone": null,
+      "officeLocation": "Vosselaar",
+      "preferredLanguage": "nl-BE",
+      "surname": "Doe",
+      "userPrincipalName": "john.doe@contoso.com",
+      "password": "SomePassw0rd"
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    businessPhones   : []
+    displayName      : John Doe
+    givenName        : John
+    id               : 990e2425-f595-43bc-85ed-b89a44093793
+    jobTitle         : Sales Manager
+    mail             : null
+    mobilePhone      : null
+    officeLocation   : Vosselaar
+    password         : SomePassw0rd
+    preferredLanguage: nl-BE
+    surname          : Doe
+    userPrincipalName: john.doe@contoso.com
+    ```
+
+=== "CSV"
+
+    ```csv
+    id,businessPhones,displayName,givenName,jobTitle,mail,mobilePhone,officeLocation,preferredLanguage,surname,userPrincipalName,password
+    990e2425-f595-43bc-85ed-b89a44093793,[],John Doe,John,Sales Manager,,,Vosselaar,nl-BE,Doe,john.doe@contoso.com,SomePassw0rd
+    ```
+
+=== "Markdown"
+
+    ```md
+    # aad user add --displayName "John Doe" --userName "john.doe@contoso.com" --password "SomePassw0rd" --firstName "John" --lastName "Doe" --jobTitle "Sales Manager" --officeLocation "Vosselaar" --preferredLanguage "nl-BE"
+
+    Date: 16/02/2023
+
+    ## John Doe (990e2425-f595-43bc-85ed-b89a44093793)
+
+    Property | Value
+    ---------|-------
+    id | 990e2425-f595-43bc-85ed-b89a44093793
+    businessPhones | []
+    displayName | John Doe
+    givenName | John
+    jobTitle | Sales Manager
+    mail | null
+    mobilePhone | null
+    officeLocation | Vosselaar
+    preferredLanguage | nl-BE
+    surname | Doe
+    userPrincipalName | john.doe@contoso.com
+    password | SomePassw0rd
+    ```

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

@@ -0,0 +1,98 @@
+# aad user license list
+
+Lists the license details for a given user
+
+## Usage
+
+```sh
+m365 aad user license list [options]
+```
+
+## Options
+
+`--userId [userId]`
+: The ID of the user. Specify either `userId` or `userName` but not both.
+
+`--userName [userName]`
+: User principal name of the user. Specify either `userId` or `userName` but not both.
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+!!! tip
+    If you don't specify any option, the command will list the license details of the current logged in user. This does not work when using application permissions.
+
+## Examples
+
+List license details of the current logged in user.
+
+```sh
+m365 aad user license list
+```
+
+List license details of a specific user by its UPN.
+
+```sh
+m365 aad user license list --userName john.doe@contoso.com
+```
+
+List license details of a specific user by its ID.
+
+```sh
+m365 aad user license list --userId 59f80e08-24b1-41f8-8586-16765fd830d3
+```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    [
+      {
+        "id": "x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw",
+        "skuId": "c42b9cae-ea4f-4ab7-9717-81576235ccac",
+        "skuPartNumber": "DEVELOPERPACK_E5",
+        "servicePlans": [
+          {
+            "servicePlanId": "7547a3fe-08ee-4ccb-b430-5077c5041653",
+            "servicePlanName": "YAMMER_ENTERPRISE",
+            "provisioningStatus": "Success",
+            "appliesTo": "User"
+          }
+        ]
+      }
+    ]
+    ```
+
+=== "Text"
+
+    ```text
+    id           : x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw
+    skuId        : c42b9cae-ea4f-4ab7-9717-81576235ccac
+    skuPartNumber: DEVELOPERPACK_E5
+    ```
+
+=== "CSV"
+
+    ```csv
+    id,skuId,skuPartNumber
+    x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw,c42b9cae-ea4f-4ab7-9717-81576235ccac,DEVELOPERPACK_E5
+    ```
+
+=== "Markdown"
+
+    ```md
+    # aad user license list --userId "0c9c625f-faa9-4c3b-8cd8-d874b869f78c"
+
+    Date: 2/19/2023
+
+    ## x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw
+
+    Property | Value
+    ---------|-------
+    id | x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw
+    skuId | c42b9cae-ea4f-4ab7-9717-81576235ccac
+    skuPartNumber | DEVELOPERPACK\_E5
+    servicePlans | [{"servicePlanId":"7547a3fe-08ee-4ccb-b430-5077c5041653","servicePlanName":"YAMMER\_ENTERPRISE","provisioningStatus":"Success","appliesTo":"User"}]
+    ```

package/docs/docs/cmd/aad/user/user-recyclebinitem-clear.md

@@ -18,7 +18,7 @@ m365 aad user recyclebinitem clear [options]
 ## Remarks
 
 !!! important
-    To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator
+    To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator.
 
 !!! note
     After running this command, it may take a minute before all deleted users are effectively removed from the tenant.

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

@@ -0,0 +1,82 @@
+# aad user recyclebinitem list
+
+Lists users from the recycle bin in the current tenant
+
+## Usage
+
+```sh
+m365 aad user recyclebinitem list [options]
+```
+
+## Options
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+List all removed users
+
+```sh
+m365 aad user recyclebinitem list
+```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    [
+      {
+        "businessPhones": [],
+        "displayName": "John Doe",
+        "givenName": "John Doe",
+        "jobTitle": "Developer",
+        "mail": "john@contoso.com",
+        "mobilePhone": "0476345130",
+        "officeLocation": "Washington",
+        "preferredLanguage": "nl-BE",
+        "surname": "John",
+        "userPrincipalName": "7e06b56615f340138bf879874d52e68ajohn@contoso.com",
+        "id": "7e06b566-15f3-4013-8bf8-79874d52e68a"
+      }
+    ]
+    ```
+
+=== "Text"
+
+    ```text
+    id                                    displayName  userPrincipalName
+    ------------------------------------  -----------  -----------------------------------------------
+    7e06b566-15f3-4013-8bf8-79874d52e68a  John Doe     7e06b56615f340138bf879874d52e68ajohn@contoso.com
+    ```
+
+=== "CSV"
+
+    ```csv
+    id,displayName,userPrincipalName
+    7e06b566-15f3-4013-8bf8-79874d52e68a,John Doe,7e06b56615f340138bf879874d52e68ajohn@contoso.com
+    ```
+
+=== "Markdown"
+
+    ```md
+    # aad user recyclebinitem list
+
+    Date: 14/02/2023
+
+    ## John Doe (7e06b566-15f3-4013-8bf8-79874d52e68a)
+
+    Property | Value
+    ---------|-------
+    businessPhones | []
+    displayName | John Doe
+    givenName | John Doe
+    jobTitle | Developer
+    mail | john@contoso.com
+    mobilePhone | 0476345130
+    officeLocation | Washington
+    preferredLanguage | nl-BE
+    surname | John
+    userPrincipalName | 7e06b56615f340138bf879874d52e68ajohn@contoso.com
+    id | 7e06b566-15f3-4013-8bf8-79874d52e68a
+    ```

package/docs/docs/cmd/aad/user/user-recyclebinitem-remove.md

@@ -21,7 +21,7 @@ m365 aad user recyclebinitem remove [options]
 ## Remarks
 
 !!! important
-    To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator
+    To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator.
 
 !!! note
     After running this command, it may take a minute before the deleted user is effectively removed from the tenant.

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

@@ -0,0 +1,51 @@
+# aad user remove
+
+Removes a specific user
+
+## Usage
+
+```sh
+m365 aad user remove [options]
+```
+
+## Options
+
+`--id [id]`
+: The ID of the user. Specify either `id` or `userName` but not both.
+
+`--userName [userName]`
+:	User principal name of the user. Specify either `id` or `userName` but not both.
+
+`--confirm`
+: Don't prompt for confirmation.
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+!!! important
+    If the user with the specified id or user name doesn't exist, you will get a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
+
+!!! important
+    To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator.
+
+!!! note
+    After running this command, it may take a minute before the user is effectively moved to the recycle bin.
+
+## Examples
+
+Removes a specific user by id
+
+```sh
+m365 aad user remove --id a33bd401-9117-4e0e-bb7b-3f61c1539e10
+```
+
+Removes a specific user by its UPN
+
+```sh
+m365 aad user remove --name john.doe@contoso.com
+```
+
+## Response
+
+The command won't return a response on success.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.3.0-beta.82f99fc",
+  "version": "6.3.0-beta.98b4bc2",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",