@pnp/cli-microsoft365 6.8.0 → 6.9.0-beta.148279d

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

@@ -82,12 +82,11 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         });
     }
     getBucketId(args) {
-        if (args.options.bucketId) {
-            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.bucketId));
-        }
-        return this
-            .getPlanId(args)
-            .then((planId) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.bucketId) {
+                return formatting_1.formatting.encodeQueryParameter(args.options.bucketId);
+            }
+            const planId = yield this.getPlanId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
                 headers: {
@@ -95,32 +94,32 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(response => {
+            const response = yield request_1.default.get(requestOptions);
             const bucket = response.value.find(val => val.name === args.options.bucketName);
             if (!bucket) {
-                return Promise.reject(`The specified bucket does not exist`);
+                throw `The specified bucket does not exist`;
             }
-            return Promise.resolve(bucket.id);
+            return bucket.id;
         });
     }
     getPlanId(args) {
-        if (args.options.planId) {
-            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.planId));
-        }
-        return this
-            .getGroupId(args)
-            .then((groupId) => planner_1.planner.getPlanByTitle(args.options.planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.planId) {
+                return formatting_1.formatting.encodeQueryParameter(args.options.planId);
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.ownerGroupId));
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return formatting_1.formatting.encodeQueryParameter(args.options.ownerGroupId);
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
     mergeTaskPriority(taskItems, betaTaskItems) {
         const findBetaTask = (id) => betaTaskItems.find(task => task.id === id);

package/dist/m365/planner/commands/task/task-reference-add.js

@@ -60,16 +60,17 @@ class PlannerTaskReferenceAddCommand extends GraphCommand_1.default {
         });
     }
     getTaskDetailsEtag(taskId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => response['@odata.etag']);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response['@odata.etag'];
+        });
     }
 }
 _PlannerTaskReferenceAddCommand_instances = new WeakSet(), _PlannerTaskReferenceAddCommand_initTelemetry = function _PlannerTaskReferenceAddCommand_initTelemetry() {

package/dist/m365/planner/commands/task/task-reference-remove.js

@@ -79,17 +79,16 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
         });
     }
     getTaskDetailsEtagAndUrl(options) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(options.taskId)}/details`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        let url = options.url;
-        return request_1.default
-            .get(requestOptions)
-            .then((taskDetails) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(options.taskId)}/details`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            let url = options.url;
+            const taskDetails = yield request_1.default.get(requestOptions);
             if (options.alias) {
                 const urls = [];
                 if (taskDetails.references) {
@@ -101,14 +100,14 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
                     });
                 }
                 if (urls.length === 0) {
-                    return Promise.reject(`The specified reference with alias ${options.alias} does not exist`);
+                    throw `The specified reference with alias ${options.alias} does not exist`;
                 }
                 if (urls.length > 1) {
-                    return Promise.reject(`Multiple references with alias ${options.alias} found. Pass one of the following urls within the "--url" option : ${urls}`);
+                    throw `Multiple references with alias ${options.alias} found. Pass one of the following urls within the "--url" option : ${urls}`;
                 }
                 url = urls[0];
             }
-            return Promise.resolve({ etag: taskDetails['@odata.etag'], url });
+            return { etag: taskDetails['@odata.etag'], url };
         });
     }
 }

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

@@ -75,42 +75,38 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
         });
     }
     getTask(options) {
-        const { id, title } = options;
-        if (id) {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/tasks/${id}`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        }
-        return this
-            .getBucketId(options)
-            .then(bucketId => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, title } = options;
+            if (id) {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/tasks/${id}`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return yield request_1.default.get(requestOptions);
+            }
+            const bucketId = yield this.getBucketId(options);
             // $filter is not working on the buckets/{bucketId}/tasks endpoint, hence it is not being used.
-            return odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks?$select=title,id`, 'minimal');
-        })
-            .then(tasks => {
+            const tasks = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks?$select=title,id`, 'minimal');
             const filteredtasks = tasks.filter(b => title.toLocaleLowerCase() === b.title.toLocaleLowerCase());
             if (filteredtasks.length === 0) {
-                return Promise.reject(`The specified task ${title} does not exist`);
+                throw `The specified task ${title} does not exist`;
             }
             if (filteredtasks.length > 1) {
-                return Promise.reject(`Multiple tasks with title ${title} found: Please disambiguate: ${os.EOL}${filteredtasks.map(f => `- ${f.id}`).join(os.EOL)}`);
+                throw `Multiple tasks with title ${title} found: Please disambiguate: ${os.EOL}${filteredtasks.map(f => `- ${f.id}`).join(os.EOL)}`;
             }
-            return Promise.resolve(filteredtasks[0]);
+            return filteredtasks[0];
         });
     }
     getBucketId(options) {
-        const { bucketId, bucketName } = options;
-        if (bucketId) {
-            return Promise.resolve(bucketId);
-        }
-        return this
-            .getPlanId(options)
-            .then(planId => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { bucketId, bucketName } = options;
+            if (bucketId) {
+                return bucketId;
+            }
+            const planId = yield this.getPlanId(options);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets?$select=id,name`,
                 headers: {
@@ -118,37 +114,37 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then((buckets) => {
+            const buckets = yield request_1.default.get(requestOptions);
             const filteredBuckets = buckets.value.filter(b => bucketName.toLocaleLowerCase() === b.name.toLocaleLowerCase());
             if (filteredBuckets.length === 0) {
-                return Promise.reject(`The specified bucket ${bucketName} does not exist`);
+                throw `The specified bucket ${bucketName} does not exist`;
             }
             if (filteredBuckets.length > 1) {
-                return Promise.reject(`Multiple buckets with name ${bucketName} found: Please disambiguate:${os.EOL}${filteredBuckets.map(f => `- ${f.id}`).join(os.EOL)}`);
+                throw `Multiple buckets with name ${bucketName} found: Please disambiguate:${os.EOL}${filteredBuckets.map(f => `- ${f.id}`).join(os.EOL)}`;
             }
-            return Promise.resolve(filteredBuckets[0].id);
+            return filteredBuckets[0].id;
         });
     }
     getPlanId(options) {
-        const { planId, planTitle } = options;
-        if (planId) {
-            return Promise.resolve(planId);
-        }
-        return this
-            .getGroupId(options)
-            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { planId, planTitle } = options;
+            if (planId) {
+                return planId;
+            }
+            const groupId = yield this.getGroupId(options);
+            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(options) {
-        const { ownerGroupId, ownerGroupName } = options;
-        if (ownerGroupId) {
-            return Promise.resolve(ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerTaskRemoveCommand_instances = new WeakSet(), _PlannerTaskRemoveCommand_initTelemetry = function _PlannerTaskRemoveCommand_initTelemetry() {

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

@@ -66,13 +66,12 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         });
     }
     updateTaskDetails(options, newTask) {
-        if (!options.description) {
-            return Promise.resolve(newTask);
-        }
-        const taskId = newTask.id;
-        return this
-            .getTaskDetailsEtag(taskId)
-            .then(etag => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.description) {
+                return newTask;
+            }
+            const taskId = newTask.id;
+            const etag = yield this.getTaskDetailsEtag(taskId);
             const requestOptionsTaskDetails = {
                 url: `${this.resource}/v1.0/planner/tasks/${taskId}/details`,
                 headers: {
@@ -85,35 +84,35 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
                     description: options.description
                 }
             };
-            return request_1.default.patch(requestOptionsTaskDetails);
-        })
-            .then(taskDetails => {
+            const taskDetails = yield request_1.default.patch(requestOptionsTaskDetails);
             return Object.assign(Object.assign({}, newTask), taskDetails);
         });
     }
     getTaskDetailsEtag(taskId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => response['@odata.etag']);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response['@odata.etag'];
+        });
     }
     getTaskEtag(taskId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => response['@odata.etag']);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response['@odata.etag'];
+        });
     }
     generateAppliedCategories(options) {
         if (!options.appliedCategories) {
@@ -124,62 +123,59 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         return categories;
     }
     generateUserAssignments(options) {
-        const assignments = {};
-        if (!options.assignedToUserIds && !options.assignedToUserNames) {
-            return Promise.resolve(assignments);
-        }
-        return this
-            .getUserIds(options)
-            .then((userIds) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const assignments = {};
+            if (!options.assignedToUserIds && !options.assignedToUserNames) {
+                return assignments;
+            }
+            const userIds = yield this.getUserIds(options);
             userIds.forEach(x => assignments[x] = {
                 '@odata.type': '#microsoft.graph.plannerAssignment',
                 orderHint: ' !'
             });
-            return Promise.resolve(assignments);
+            return assignments;
         });
     }
     getUserIds(options) {
-        if (options.assignedToUserIds) {
-            return Promise.resolve(options.assignedToUserIds.split(',').map(o => o.trim()));
-        }
-        // Hitting this section means assignedToUserNames won't be undefined
-        const userNames = options.assignedToUserNames;
-        const userArr = userNames.split(',').map(o => o.trim());
-        let userIds = [];
-        const promises = userArr.map(user => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
-                headers: {
-                    'accept ': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        });
-        return Promise
-            .all(promises)
-            .then((usersRes) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.assignedToUserIds) {
+                return options.assignedToUserIds.split(',').map(o => o.trim());
+            }
+            // Hitting this section means assignedToUserNames won't be undefined
+            const userNames = options.assignedToUserNames;
+            const userArr = userNames.split(',').map(o => o.trim());
+            let userIds = [];
+            const promises = userArr.map(user => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                    headers: {
+                        'accept ': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.get(requestOptions);
+            });
+            const usersRes = yield Promise.all(promises);
             let userUpns = [];
             userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
             userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
             // Find the members where no graph response was found
             const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
             if (invalidUsers && invalidUsers.length > 0) {
-                return Promise.reject(`Cannot proceed with planner task update. The following users provided are invalid : ${invalidUsers.join(',')}`);
+                throw `Cannot proceed with planner task update. The following users provided are invalid : ${invalidUsers.join(',')}`;
             }
-            return Promise.resolve(userIds);
+            return userIds;
         });
     }
     getBucketId(options) {
-        if (options.bucketId) {
-            return Promise.resolve(options.bucketId);
-        }
-        if (!options.bucketName) {
-            return Promise.resolve(undefined);
-        }
-        return this
-            .getPlanId(options)
-            .then(planId => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.bucketId) {
+                return options.bucketId;
+            }
+            if (!options.bucketName) {
+                return undefined;
+            }
+            const planId = yield this.getPlanId(options);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets?$select=id,name`,
                 headers: {
@@ -187,32 +183,32 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then((response) => {
+            const response = yield request_1.default.get(requestOptions);
             const bucket = response.value.find(val => val.name === options.bucketName);
             if (!bucket) {
-                return Promise.reject(`The specified bucket does not exist`);
+                throw 'The specified bucket does not exist';
             }
-            return Promise.resolve(bucket.id);
+            return bucket.id;
         });
     }
     getPlanId(options) {
-        if (options.planId) {
-            return Promise.resolve(options.planId);
-        }
-        return this
-            .getGroupId(options)
-            .then((groupId) => planner_1.planner.getPlanByTitle(options.planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.planId) {
+                return options.planId;
+            }
+            const groupId = yield this.getGroupId(options);
+            const plan = yield planner_1.planner.getPlanByTitle(options.planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(options) {
-        if (options.ownerGroupId) {
-            return Promise.resolve(options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.ownerGroupId) {
+                return options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(options.ownerGroupName);
+            return group.id;
+        });
     }
     mapRequestBody(options, appliedCategories) {
         const requestBody = {};

package/dist/m365/pp/commands/card/card-get.js

@@ -20,6 +20,7 @@ const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
+const Cli_1 = require("../../../../cli/Cli");
 class PpCardGetCommand extends PowerPlatformCommand_1.default {
     get name() {
         return commands_1.default.CARD_GET;
@@ -72,7 +73,11 @@ class PpCardGetCommand extends PowerPlatformCommand_1.default {
                 throw `The specified card '${options.name}' does not exist.`;
             }
             if (result.value.length > 1) {
-                throw `Multiple cards with name '${options.name}' found: ${result.value.map(x => x.cardid).join(',')}`;
+                const resultAsKeyValuePair = {};
+                result.value.forEach((obj) => {
+                    resultAsKeyValuePair[obj.cardid] = obj;
+                });
+                return Cli_1.Cli.handleMultipleResultsFound(`Multiple cards with name '${options.name}' found. Choose the correct ID:`, `Multiple cards with name '${options.name}' found.`, resultAsKeyValuePair);
             }
             return result.value[0];
         });

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -56,31 +56,30 @@ class PpManagementAppAddCommand extends PowerPlatformCommand_1.default {
         });
     }
     getAppId(args) {
-        if (args.options.appId) {
-            return Promise.resolve(args.options.appId);
-        }
-        const { objectId, name } = args.options;
-        const filter = objectId ?
-            `id eq '${formatting_1.formatting.encodeQueryParameter(objectId)}'` :
-            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
-        const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/myorganization/applications?$filter=${filter}&$select=appId`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get((requestOptions))
-            .then((aadApps) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appId) {
+                return args.options.appId;
+            }
+            const { objectId, name } = args.options;
+            const filter = objectId ?
+                `id eq '${formatting_1.formatting.encodeQueryParameter(objectId)}'` :
+                `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/myorganization/applications?$filter=${filter}&$select=appId`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const aadApps = yield request_1.default.get((requestOptions));
             if (aadApps.value.length === 0) {
                 const applicationIdentifier = objectId ? `ID ${objectId}` : `name ${name}`;
-                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+                throw `No Azure AD application registration with ${applicationIdentifier} found`;
             }
             if (aadApps.value.length === 1 && aadApps.value[0].appId) {
-                return Promise.resolve(aadApps.value[0].appId);
+                return aadApps.value[0].appId;
             }
-            return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please disambiguate (app IDs): ${aadApps.value.map(a => a.appId).join(', ')}`);
+            throw `Multiple Azure AD application registration with name ${name} found. Please disambiguate (app IDs): ${aadApps.value.map(a => a.appId).join(', ')}`;
         });
     }
 }

package/dist/m365/purview/commands/retentionevent/retentionevent-add.js

@@ -17,8 +17,6 @@ var _PurviewRetentionEventAddCommand_instances, _PurviewRetentionEventAddCommand
 Object.defineProperty(exports, "__esModule", { value: true });
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const accessToken_1 = require("../../../../utils/accessToken");
-const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const odata_1 = require("../../../../utils/odata");
@@ -39,9 +37,6 @@ class PurviewRetentionEventAddCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-                this.handleError('This command does not support application permissions.');
-            }
             if (this.verbose) {
                 logger.logToStderr(`Creating retention event...`);
             }
@@ -54,7 +49,7 @@ class PurviewRetentionEventAddCommand extends GraphCommand_1.default {
             }
             const eventTypeId = yield this.getEventTypeId(logger, args);
             const data = {
-                'retentionEventType@odata.bind': `https://graph.microsoft.com/beta/security/triggerTypes/retentionEventTypes/${eventTypeId}`,
+                'retentionEventType@odata.bind': `https://graph.microsoft.com/v1.0/security/triggerTypes/retentionEventTypes/${eventTypeId}`,
                 displayName: args.options.displayName,
                 description: args.options.description,
                 eventQueries: eventQueries,
@@ -62,7 +57,7 @@ class PurviewRetentionEventAddCommand extends GraphCommand_1.default {
             };
             try {
                 const requestOptions = {
-                    url: `${this.resource}/beta/security/triggers/retentionEvents`,
+                    url: `${this.resource}/v1.0/security/triggers/retentionEvents`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -85,7 +80,7 @@ class PurviewRetentionEventAddCommand extends GraphCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving the event type id for event type ${args.options.eventTypeName}`);
             }
-            const items = yield odata_1.odata.getAllItems(`${this.resource}/beta/security/triggerTypes/retentionEventTypes`);
+            const items = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/security/triggerTypes/retentionEventTypes`);
             const eventTypes = items.filter((x) => x.displayName === args.options.eventTypeName);
             if (eventTypes.length === 0) {
                 throw `The specified event type '${args.options.eventTypeName}' does not exist.`;