@pnp/cli-microsoft365 5.3.0 → 5.4.0-beta.1107211

package/.devcontainer/Dockerfile

@@ -27,7 +27,7 @@ RUN apt-get update && apt-get install -y \
   && apt-get install nodejs -y \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install mkdocs-material==7.1.7 pymdown-extensions==9.0
+RUN pip3 install mkdocs-material==7.1.7 pymdown-extensions==9.0 pygments==2.11
 
 RUN useradd \
   --user-group \

package/.eslintrc.js

@@ -11,6 +11,7 @@ const dictionary = [
   'assets',
   'bin',
   'catalog',
+  'checklist',
   'client',
   'comm',
   'content',

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

@@ -71,8 +71,11 @@ class AadAppSetCommand extends GraphCommand_1.default {
         if (this.verbose) {
             logger.logToStderr(`Configuring Azure AD application ID URI...`);
         }
+        const identifierUris = args.options.uri
+            .split(',')
+            .map(u => u.trim());
         const applicationInfo = {
-            identifierUris: [args.options.uri]
+            identifierUris: identifierUris
         };
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_CONVERSATION_POST_LIST;
@@ -35,24 +35,9 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
         if (args.options.groupId) {
             return Promise.resolve(encodeURIComponent(args.options.groupId));
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.groupDisplayName)}'&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(res => {
-            if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
-            }
-            if (res.value.length === 0) {
-                return Promise.reject(`The specified group does not exist`);
-            }
-            return Promise.reject(`Multiple groups found with name ${args.options.groupDisplayName} found. Please choose between the following IDs: ${res.value.map(a => a.id).join(', ')}`);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.groupDisplayName)
+            .then(group => group.id);
     }
     options() {
         const options = [

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupGetCommand extends GraphCommand_1.default {
@@ -13,15 +14,8 @@ class AadO365GroupGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let group;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${args.options.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
+        aadGroup_1.aadGroup
+            .getGroupById(args.options.id)
             .then((res) => {
             group = res;
             if (args.options.includeSiteUrl) {

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

@@ -0,0 +1,129 @@
+"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 cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.O365GROUP_RECYCLEBINITEM_REMOVE;
+    }
+    get description() {
+        return 'Permanently deletes a Microsoft 365 Group from the recycle bin in the current tenant';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
+        telemetryProps.mailNickname = typeof args.options.mailNickname !== 'undefined';
+        telemetryProps.confirm = !!args.options.confirm;
+        return telemetryProps;
+    }
+    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();
+                }
+                else {
+                    removeGroup();
+                }
+            });
+        }
+    }
+    getGroupId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, displayName, mailNickname } = options;
+            if (id) {
+                return id;
+            }
+            let filterValue = '';
+            if (displayName) {
+                filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+            }
+            if (mailNickname) {
+                filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            const groups = response.value;
+            if (groups.length === 0) {
+                throw Error(`The specified group '${displayName || mailNickname}' does not exist.`);
+            }
+            if (groups.length > 1) {
+                throw Error(`Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`);
+            }
+            return groups[0].id;
+        });
+    }
+    optionSets() {
+        return [['id', 'displayName', 'mailNickname']];
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-d, --displayName [displayName]'
+            },
+            {
+                option: '-m, --mailNickname [mailNickname]'
+            },
+            {
+                option: '--confirm'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadO365GroupRecycleBinItemRemoveCommand();
+//# sourceMappingURL=o365group-recyclebinitem-remove.js.map

package/dist/m365/aad/commands.js

@@ -29,6 +29,7 @@ exports.default = {
     O365GROUP_CONVERSATION_POST_LIST: `${prefix} o365group conversation post list`,
     O365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} o365group recyclebinitem clear`,
     O365GROUP_RECYCLEBINITEM_LIST: `${prefix} o365group recyclebinitem list`,
+    O365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} o365group recyclebinitem remove`,
     O365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} o365group recyclebinitem restore`,
     O365GROUP_SET: `${prefix} o365group set`,
     O365GROUP_TEAMIFY: `${prefix} o365group teamify`,

package/dist/m365/base/PlannerCommand.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../Command");
+class PlannerCommand extends Command_1.default {
+    get resource() {
+        return 'https://tasks.office.com';
+    }
+}
+exports.default = PlannerCommand;
+//# sourceMappingURL=PlannerCommand.js.map

package/dist/m365/flow/commands/flow-export.js

@@ -58,9 +58,9 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 logger.logToStderr(`Initiating package export for Microsoft Flow ${args.options.id}...`);
             }
             const requestOptions = {
-                url: `${this.resource}providers/${formatArgument === 'json' ?
-                    `Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
-                    : `Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/exportPackage?api-version=2016-11-01`}`,
+                url: formatArgument === 'json' ?
+                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
+                    : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/exportPackage?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

package/dist/m365/planner/commands/bucket/bucket-add.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -65,22 +66,9 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const group = response.value[0];
-            if (!group) {
-                return Promise.reject(`The specified owner group does not exist`);
-            }
-            return Promise.resolve(group.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -15,6 +15,7 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Auth_1 = require("../../../../Auth");
 const planner_1 = require("../../../../utils/planner");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.BUCKET_GET;
@@ -100,24 +101,9 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         if (ownerGroupId) {
             return Promise.resolve(ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            if (!response.value.length) {
-                return Promise.reject(`The specified owner group ${ownerGroupName} does not exist`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple owner groups with name ${ownerGroupName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(response.value[0].id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [
@@ -125,7 +111,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
                 option: '-i, --id [id]'
             },
             {
-                option: '--name [name]'
+                option: '-n, --name [name]'
             },
             {
                 option: '--planId [planId]'

package/dist/m365/planner/commands/bucket/bucket-list.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
-const request_1 = require("../../../../request");
 const planner_1 = require("../../../../utils/planner");
 const Auth_1 = require("../../../../Auth");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.BUCKET_LIST;
@@ -50,22 +50,9 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const group = response.value[0];
-            if (!group) {
-                return Promise.reject(`The specified owner group does not exist`);
-            }
-            return Promise.resolve(group.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -7,6 +7,7 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const planner_1 = require("../../../../utils/planner");
 const Auth_1 = require("../../../../Auth");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketRemoveCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.BUCKET_REMOVE;
@@ -114,32 +115,17 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
         if (ownerGroupId) {
             return Promise.resolve(ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            if (!response.value.length) {
-                return Promise.reject(`The specified owner group ${ownerGroupName} does not exist`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple owner groups with name ${ownerGroupName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(response.value[0].id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [
             {
-                option: '--id [id]'
+                option: '-i, --id [id]'
             },
             {
-                option: '--name [name]'
+                option: '-n, --name [name]'
             },
             {
                 option: '--planId [planId]'

package/dist/m365/planner/commands/bucket/bucket-set.js

@@ -6,6 +6,7 @@ const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const planner_1 = require("../../../../utils/planner");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketSetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.BUCKET_SET;
@@ -102,24 +103,9 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         if (ownerGroupId) {
             return Promise.resolve(ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            if (response.value.length === 0) {
-                return Promise.reject(`The specified owner group ${ownerGroupName} does not exist`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple owner groups with name ${ownerGroupName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(response.value[0].id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [
@@ -127,7 +113,7 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
                 option: '-i, --id [id]'
             },
             {
-                option: '--name [name]'
+                option: '-n, --name [name]'
             },
             {
                 option: '--planId [planId]'

package/dist/m365/planner/commands/plan/plan-add.js

@@ -5,6 +5,7 @@ const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerPlanAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_ADD;
@@ -51,22 +52,9 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const group = response.value[0];
-            if (!group) {
-                return Promise.reject(`The specified owner group does not exist`);
-            }
-            return Promise.resolve(group.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [

package/dist/m365/planner/commands/plan/plan-details-get.js

@@ -6,6 +6,7 @@ const request_1 = require("../../../../request");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerPlanDetailsGetCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
@@ -52,25 +53,9 @@ class PlannerPlanDetailsGetCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
-                return Promise.reject(`The specified ownerGroup does not exist`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple ownerGroups with name ${args.options.ownerGroupName} found: Please choose between the following IDs ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.ownerGroupName)
+            .then(group => group.id);
     }
     getPlanId(args) {
         if (args.options.planId) {

package/dist/m365/planner/commands/plan/plan-get.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
-const request_1 = require("../../../../request");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Auth_1 = require("../../../../Auth");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerPlanGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_GET;
@@ -53,22 +53,9 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const group = response.value[0];
-            if (!group) {
-                return Promise.reject(`The specified owner group does not exist`);
-            }
-            return Promise.resolve(group.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [

package/dist/m365/planner/commands/plan/plan-list.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const Auth_1 = require("../../../../Auth");
-const request_1 = require("../../../../request");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerPlanListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_LIST;
@@ -41,22 +41,9 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const group = response.value[0];
-            if (!group) {
-                return Promise.reject(`The specified owner group does not exist`);
-            }
-            return Promise.resolve(group.id);
-        });
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.ownerGroupName)
+            .then(group => group.id);
     }
     options() {
         const options = [