@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.21a8d94

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupGetCommand_instances, _AadO365GroupGetCommand_initOptions, _AadO365GroupGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -33,33 +33,28 @@ class AadO365GroupGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets information about the specified Microsoft 365 Group or Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        let group;
-        aadGroup_1.aadGroup
-            .getGroupById(args.options.id)
-            .then((res) => {
-            group = res;
-            if (args.options.includeSiteUrl) {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let group;
+            try {
+                group = yield aadGroup_1.aadGroup.getGroupById(args.options.id);
+                if (args.options.includeSiteUrl) {
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    const res = yield request_1.default.get(requestOptions);
+                    group.siteUrl = res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : '';
+                }
+                logger.log(group);
             }
-            else {
-                return Promise.resolve(undefined);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })
-            .then((res) => {
-            if (res) {
-                group.siteUrl = res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : '';
-            }
-            logger.log(group);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initOptions = function _AadO365GroupGetCommand_initOptions() {
@@ -70,7 +65,7 @@ _AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initO
     });
 }, _AadO365GroupGetCommand_initValidators = function _AadO365GroupGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupListCommand_instances, _AadO365GroupListCommand_initTelemetry, _AadO365GroupListCommand_initOptions, _AadO365GroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupListCommand extends GraphCommand_1.default {
@@ -36,52 +36,47 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname', 'deletedDateTime', 'siteUrl'];
     }
-    commandAction(logger, args, cb) {
-        const groupFilter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-        const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
-        const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
-        const expandOwners = args.options.orphaned ? '&$expand=owners' : '';
-        const topCount = '&$top=100';
-        let endpoint = `${this.resource}/v1.0/groups${groupFilter}${displayNameFilter}${mailNicknameFilter}${expandOwners}${topCount}`;
-        if (args.options.deleted) {
-            endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${groupFilter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
-        }
-        let groups = [];
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((_groups) => {
-            groups = _groups;
-            if (args.options.orphaned) {
-                const orphanedGroups = [];
-                groups.forEach((group) => {
-                    if (!group.owners || group.owners.length === 0) {
-                        orphanedGroups.push(group);
-                    }
-                });
-                groups = orphanedGroups;
-            }
-            if (args.options.includeSiteUrl) {
-                return Promise.all(groups.map(g => this.getGroupSiteUrl(g.id)));
-            }
-            else {
-                return Promise.resolve();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const groupFilter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
+            const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
+            const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
+            const expandOwners = args.options.orphaned ? '&$expand=owners' : '';
+            const topCount = '&$top=100';
+            let endpoint = `${this.resource}/v1.0/groups${groupFilter}${displayNameFilter}${mailNicknameFilter}${expandOwners}${topCount}`;
+            if (args.options.deleted) {
+                endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${groupFilter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
             }
-        })
-            .then((res) => {
-            if (res) {
-                res.forEach(r => {
-                    for (let i = 0; i < groups.length; i++) {
-                        if (groups[i].id !== r.id) {
-                            continue;
+            try {
+                let groups = [];
+                groups = yield odata_1.odata.getAllItems(endpoint);
+                if (args.options.orphaned) {
+                    const orphanedGroups = [];
+                    groups.forEach((group) => {
+                        if (!group.owners || group.owners.length === 0) {
+                            orphanedGroups.push(group);
                         }
-                        groups[i].siteUrl = r.url;
-                        break;
-                    }
-                });
+                    });
+                    groups = orphanedGroups;
+                }
+                if (args.options.includeSiteUrl) {
+                    const res = yield Promise.all(groups.map(g => this.getGroupSiteUrl(g.id)));
+                    res.forEach(r => {
+                        for (let i = 0; i < groups.length; i++) {
+                            if (groups[i].id !== r.id) {
+                                continue;
+                            }
+                            groups[i].siteUrl = r.url;
+                            break;
+                        }
+                    });
+                }
+                logger.log(groups);
             }
-            logger.log(groups);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getGroupSiteUrl(groupId) {
         return new Promise((resolve, reject) => {

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

@@ -1,4 +1,13 @@
 "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");
@@ -6,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemClearCommand_instances, _AadO365GroupRecycleBinItemClearCommand_initTelemetry, _AadO365GroupRecycleBinItemClearCommand_initOptions;
 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 odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
@@ -24,34 +33,37 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
     get description() {
         return 'Clears all O365 Groups from recycle bin.';
     }
-    commandAction(logger, args, cb) {
-        const clearO365GroupRecycleBinItems = () => {
-            this.processRecycleBinItemsClear().then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            clearO365GroupRecycleBinItems();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear all O365 Groups from recycle bin ?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clearO365GroupRecycleBinItems = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.processRecycleBinItemsClear();
                 }
-                else {
-                    clearO365GroupRecycleBinItems();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield clearO365GroupRecycleBinItems();
+            }
+            else {
+                const response = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to clear all O365 Groups from recycle bin ?`
+                });
+                if (response.continue) {
+                    yield clearO365GroupRecycleBinItems();
+                }
+            }
+        });
     }
     processRecycleBinItemsClear() {
         const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${topCount}`;
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(endpoint)
             .then((recycleBinItems) => {
             if (recycleBinItems.length === 0) {

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

@@ -1,4 +1,13 @@
 "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");
@@ -6,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemListCommand_instances, _AadO365GroupRecycleBinItemListCommand_initTelemetry, _AadO365GroupRecycleBinItemListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
@@ -25,18 +34,21 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname'];
     }
-    commandAction(logger, args, cb) {
-        const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-        const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
-        const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
-        const topCount = '&$top=100';
-        const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((recycleBinItems) => {
-            logger.log(recycleBinItems);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
+                const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
+                const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
+                const topCount = '&$top=100';
+                const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
+                const recycleBinItems = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(recycleBinItems);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadO365GroupRecycleBinItemListCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemListCommand_initTelemetry = function _AadO365GroupRecycleBinItemListCommand_initTelemetry() {

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemRemoveCommand_instances, _AadO365GroupRecycleBinItemRemoveCommand_initTelemetry, _AadO365GroupRecycleBinItemRemoveCommand_initOptions, _AadO365GroupRecycleBinItemRemoveCommand_initValidators, _AadO365GroupRecycleBinItemRemoveCommand_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 AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
@@ -35,42 +36,39 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Permanently deletes a Microsoft 365 Group from the recycle bin in the current tenant';
     }
-    commandAction(logger, args, cb) {
-        const removeGroup = () => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const groupId = yield this.getGroupId(args.options);
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/directory/deletedItems/${groupId}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                yield request_1.default.delete(requestOptions);
-                cb();
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err, logger, cb);
-            }
-        });
-        if (args.options.confirm) {
-            removeGroup();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeGroup = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const groupId = yield this.getGroupId(args.options);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/directory/deletedItems/${groupId}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeGroup();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeGroup();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?`
+                });
+                if (result.continue) {
+                    yield removeGroup();
+                }
+            }
+        });
     }
     getGroupId(options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -80,10 +78,10 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
             }
             let filterValue = '';
             if (displayName) {
-                filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+                filterValue = `displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`;
             }
             if (mailNickname) {
-                filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
+                filterValue = `mailNickname eq '${formatting_1.formatting.encodeQueryParameter(mailNickname)}'`;
             }
             const requestOptions = {
                 url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
@@ -125,7 +123,7 @@ _AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365Grou
     });
 }, _AadO365GroupRecycleBinItemRemoveCommand_initValidators = function _AadO365GroupRecycleBinItemRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupRecycleBinItemRestoreCommand_instances, _AadO365GroupRecycleBinItemRestoreCommand_initTelemetry, _AadO365GroupRecycleBinItemRestoreCommand_initOptions, _AadO365GroupRecycleBinItemRestoreCommand_initValidators, _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
@@ -37,24 +38,27 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.O365GROUP_RESTORE];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Restoring Microsoft 365 Group: ${args.options.id || args.options.displayName || args.options.mailNickname}...`);
-        }
-        this
-            .getGroupId(args.options)
-            .then((groupId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/directory/deleteditems/${groupId}/restore`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restoring Microsoft 365 Group: ${args.options.id || args.options.displayName || args.options.mailNickname}...`);
+            }
+            try {
+                const groupId = yield this.getGroupId(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/directory/deleteditems/${groupId}/restore`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getGroupId(options) {
         const { id, displayName, mailNickname } = options;
@@ -63,10 +67,10 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
         }
         let filterValue = '';
         if (displayName) {
-            filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+            filterValue = `displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`;
         }
         if (mailNickname) {
-            filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
+            filterValue = `mailNickname eq '${formatting_1.formatting.encodeQueryParameter(mailNickname)}'`;
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
@@ -107,7 +111,7 @@ _AadO365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadO365Gro
     });
 }, _AadO365GroupRecycleBinItemRestoreCommand_initValidators = function _AadO365GroupRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRemoveCommand_instances, _AadO365GroupRemoveCommand_initTelemetry, _AadO365GroupRemoveCommand_initOptions, _AadO365GroupRemoveCommand_initValidators;
 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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRemoveCommand extends GraphCommand_1.default {
@@ -34,51 +34,49 @@ class AadO365GroupRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes an Microsoft 365 Group';
     }
-    commandAction(logger, args, cb) {
-        const removeGroup = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                }
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(() => {
-                if (!args.options.skipRecycleBin) {
-                    return Promise.resolve();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeGroup = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
                 }
-                const requestOptions2 = {
-                    url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
-                    headers: {
-                        'accept': 'application/json;odata.metadata=none'
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                        headers: {
+                            'accept': 'application/json;odata.metadata=none'
+                        }
+                    };
+                    yield request_1.default.delete(requestOptions);
+                    if (args.options.skipRecycleBin) {
+                        const requestOptions2 = {
+                            url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            }
+                        };
+                        yield request_1.default.delete(requestOptions2);
                     }
-                };
-                return request_1.default.delete(requestOptions2);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeGroup();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group ${args.options.id}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeGroup();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeGroup();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the group ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield removeGroup();
+                }
+            }
+        });
     }
 }
 _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand_initTelemetry = function _AadO365GroupRemoveCommand_initTelemetry() {
@@ -98,7 +96,7 @@ _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand
     });
 }, _AadO365GroupRemoveCommand_initValidators = function _AadO365GroupRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;