@pnp/cli-microsoft365 6.0.0-beta.a644c64 → 6.0.0-beta.aa5918d

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

@@ -1,95 +1,95 @@
 "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 _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _PlannerTaskListCommand_initOptions, _PlannerTaskListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const aadGroup_1 = require("../../../../utils/aadGroup");
+const formatting_1 = require("../../../../utils/formatting");
 class PlannerTaskListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerTaskListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.TASK_LIST;
     }
     get description() {
         return 'Lists planner tasks in a bucket, plan, or tasks for the currently logged in user';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
-        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
-        telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
-        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'title', 'startDateTime', 'dueDateTime', 'completedDateTime'];
     }
-    commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        const bucketName = args.options.bucketName;
-        let bucketId = args.options.bucketId;
-        const planTitle = args.options.planTitle;
-        let planId = args.options.planId;
-        let taskItems = [];
-        if (bucketId || bucketName) {
-            this
-                .getBucketId(args)
-                .then((retrievedBucketId) => {
-                bucketId = retrievedBucketId;
-                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`);
-            })
-                .then((tasks) => {
-                taskItems = tasks;
-                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`);
-            })
-                .then((betaTasks) => {
-                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else if (planId || planTitle) {
-            this
-                .getPlanId(args)
-                .then((retrievedPlanId) => {
-                planId = retrievedPlanId;
-                return utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`);
-            })
-                .then((tasks) => {
-                taskItems = tasks;
-                return utils_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`);
-            })
-                .then((betaTasks) => {
-                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else {
-            utils_1.odata
-                .getAllItems(`${this.resource}/v1.0/me/planner/tasks`)
-                .then((tasks) => {
-                taskItems = tasks;
-                return utils_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`);
-            })
-                .then((betaTasks) => {
-                logger.log(this.mergeTaskPriority(taskItems, betaTasks));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
+    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.');
+                return;
+            }
+            const bucketName = args.options.bucketName;
+            let bucketId = args.options.bucketId;
+            const planTitle = args.options.planTitle;
+            let planId = args.options.planId;
+            let taskItems = [];
+            if (bucketId || bucketName) {
+                try {
+                    bucketId = yield this.getBucketId(args);
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/buckets/${bucketId}/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/buckets/${bucketId}/tasks`);
+                    logger.log(this.mergeTaskPriority(taskItems, betaTasks));
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            }
+            else if (planId || planTitle) {
+                try {
+                    planId = yield this.getPlanId(args);
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/planner/plans/${planId}/tasks`);
+                    logger.log(this.mergeTaskPriority(taskItems, betaTasks));
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            }
+            else {
+                try {
+                    taskItems = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/me/planner/tasks`);
+                    const betaTasks = yield odata_1.odata.getAllItems(`${this.resource}/beta/me/planner/tasks`);
+                    logger.log(this.mergeTaskPriority(taskItems, betaTasks));
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            }
+        });
     }
     getBucketId(args) {
         if (args.options.bucketId) {
-            return Promise.resolve(encodeURIComponent(args.options.bucketId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.bucketId));
         }
         return this
             .getPlanId(args)
@@ -113,7 +113,7 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         if (args.options.planId) {
-            return Promise.resolve(encodeURIComponent(args.options.planId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.planId));
         }
         return this
             .getGroupId(args)
@@ -122,7 +122,7 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {
-            return Promise.resolve(encodeURIComponent(args.options.ownerGroupId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.ownerGroupId));
         }
         return aadGroup_1.aadGroup
             .getGroupByDisplayName(args.options.ownerGroupName)
@@ -139,54 +139,54 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         });
         return taskItems;
     }
-    options() {
-        const options = [
-            {
-                option: '--bucketId [bucketId]'
-            },
-            {
-                option: '--bucketName [bucketName]'
-            },
-            {
-                option: '--planId [planId]'
-            },
-            {
-                option: '--planName [planName]'
-            },
-            {
-                option: '--planTitle [planTitle]'
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initTelemetry = function _PlannerTaskListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            bucketId: typeof args.options.bucketId !== 'undefined',
+            bucketName: typeof args.options.bucketName !== 'undefined',
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+        });
+    });
+}, _PlannerTaskListCommand_initOptions = function _PlannerTaskListCommand_initOptions() {
+    this.options.unshift({
+        option: '--bucketId [bucketId]'
+    }, {
+        option: '--bucketName [bucketName]'
+    }, {
+        option: '--planId [planId]'
+    }, {
+        option: '--planTitle [planTitle]'
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    });
+}, _PlannerTaskListCommand_initValidators = function _PlannerTaskListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.bucketId && args.options.bucketName) {
             return 'To retrieve tasks from a bucket, specify bucketId or bucketName, but not both';
         }
-        if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
+        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle when using bucketName';
         }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.planId && args.options.planTitle) {
             return 'Specify either planId or planTitle but not both';
         }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PlannerTaskListCommand();
 //# sourceMappingURL=task-list.js.map

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

@@ -1,44 +1,67 @@
 "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 _PlannerTaskReferenceAddCommand_instances, _PlannerTaskReferenceAddCommand_initTelemetry, _PlannerTaskReferenceAddCommand_initOptions, _PlannerTaskReferenceAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskReferenceAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerTaskReferenceAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerTaskReferenceAddCommand_instances, "m", _PlannerTaskReferenceAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskReferenceAddCommand_instances, "m", _PlannerTaskReferenceAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskReferenceAddCommand_instances, "m", _PlannerTaskReferenceAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.TASK_REFERENCE_ADD;
     }
     get description() {
         return 'Adds a new reference to a Planner task';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTaskDetailsEtag(args.options.taskId)
-            .then(etag => {
-            const requestOptionsTaskDetails = {
-                url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.taskId)}/details`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none',
-                    'If-Match': etag,
-                    'Prefer': 'return=representation'
-                },
-                responseType: 'json',
-                data: {
-                    references: {
-                        [utils_1.formatting.openTypesEncoder(args.options.url)]: Object.assign(Object.assign({ '@odata.type': 'microsoft.graph.plannerExternalReference', previewPriority: ' !' }, (args.options.alias && { alias: args.options.alias })), (args.options.type && { type: args.options.type }))
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const etag = yield this.getTaskDetailsEtag(args.options.taskId);
+                const requestOptionsTaskDetails = {
+                    url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(args.options.taskId)}/details`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none',
+                        'If-Match': etag,
+                        'Prefer': 'return=representation'
+                    },
+                    responseType: 'json',
+                    data: {
+                        references: {
+                            [formatting_1.formatting.openTypesEncoder(args.options.url)]: Object.assign(Object.assign({ '@odata.type': 'microsoft.graph.plannerExternalReference', previewPriority: ' !' }, (args.options.alias && { alias: args.options.alias })), (args.options.type && { type: args.options.type }))
+                        }
                     }
-                }
-            };
-            return request_1.default.patch(requestOptionsTaskDetails);
-        })
-            .then((res) => {
-            logger.log(res.references);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                };
+                const res = yield request_1.default.patch(requestOptionsTaskDetails);
+                logger.log(res.references);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTaskDetailsEtag(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
             headers: {
                 accept: 'application/json'
             },
@@ -48,22 +71,26 @@ class PlannerTaskReferenceAddCommand extends GraphCommand_1.default {
             .get(requestOptions)
             .then((response) => response['@odata.etag']);
     }
-    options() {
-        const options = [
-            { option: '-i, --taskId <taskId>' },
-            { option: '-u, --url <url>' },
-            { option: '--alias [alias]' },
-            { option: '--type [type]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PlannerTaskReferenceAddCommand_instances = new WeakSet(), _PlannerTaskReferenceAddCommand_initTelemetry = function _PlannerTaskReferenceAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            alias: typeof args.options.alias !== 'undefined',
+            type: args.options.type
+        });
+    });
+}, _PlannerTaskReferenceAddCommand_initOptions = function _PlannerTaskReferenceAddCommand_initOptions() {
+    this.options.unshift({ option: '-i, --taskId <taskId>' }, { option: '-u, --url <url>' }, { option: '--alias [alias]' }, {
+        option: '--type [type]',
+        autocomplete: ['PowerPoint', 'Word', 'Excel', 'Other']
+    });
+}, _PlannerTaskReferenceAddCommand_initValidators = function _PlannerTaskReferenceAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.type && ['powerpoint', 'word', 'excel', 'other'].indexOf(args.options.type.toLocaleLowerCase()) === -1) {
             return `${args.options.type} is not a valid type value. Allowed values PowerPoint|Word|Excel|Other`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PlannerTaskReferenceAddCommand();
 //# sourceMappingURL=task-reference-add.js.map

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

@@ -1,45 +1,65 @@
 "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 _PlannerTaskReferenceListCommand_instances, _PlannerTaskReferenceListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const utils_1 = require("../../../../utils");
-const Auth_1 = require("../../../../Auth");
 class PlannerTaskReferenceListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerTaskReferenceListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerTaskReferenceListCommand_instances, "m", _PlannerTaskReferenceListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.TASK_REFERENCE_LIST;
     }
     get description() {
         return 'Retrieve the references of the specified planner task';
     }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.taskId)}/details?$select=references`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.references);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --taskId <taskId>'
+    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.');
+                return;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(args.options.taskId)}/details?$select=references`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.references);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_PlannerTaskReferenceListCommand_instances = new WeakSet(), _PlannerTaskReferenceListCommand_initOptions = function _PlannerTaskReferenceListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --taskId <taskId>'
+    });
+};
 module.exports = new PlannerTaskReferenceListCommand();
 //# sourceMappingURL=task-reference-list.js.map