@pnp/cli-microsoft365 6.0.0-beta.5637b93 → 6.0.0-beta.5bdba89

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

@@ -13,10 +13,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initValidators;
+var _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initOptionSets;
 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 TodoTaskListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class TodoTaskListCommand extends GraphCommand_1.default {
         _TodoTaskListCommand_instances.add(this);
         __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_LIST;
@@ -56,30 +56,31 @@ class TodoTaskListCommand extends GraphCommand_1.default {
             return Promise.resolve(taskList.id);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTodoListId(args)
-            .then((listId) => {
-            const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((items) => {
-            if (args.options.output === 'json') {
-                logger.log(items);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const listId = yield this.getTodoListId(args);
+                const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                if (args.options.output === 'json') {
+                    logger.log(items);
+                }
+                else {
+                    logger.log(items.map(m => {
+                        return {
+                            id: m.id,
+                            title: m.title,
+                            status: m.status,
+                            createdDateTime: m.createdDateTime,
+                            lastModifiedDateTime: m.lastModifiedDateTime
+                        };
+                    }));
+                }
             }
-            else {
-                logger.log(items.map(m => {
-                    return {
-                        id: m.id,
-                        title: m.title,
-                        status: m.status,
-                        createdDateTime: m.createdDateTime,
-                        lastModifiedDateTime: m.lastModifiedDateTime
-                    };
-                }));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _TodoTaskListCommand_instances = new WeakSet(), _TodoTaskListCommand_initTelemetry = function _TodoTaskListCommand_initTelemetry() {
@@ -95,16 +96,8 @@ _TodoTaskListCommand_instances = new WeakSet(), _TodoTaskListCommand_initTelemet
     }, {
         option: '--listId [listId]'
     });
-}, _TodoTaskListCommand_initValidators = function _TodoTaskListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.listId && args.options.listName) {
-            return 'Specify listId or listName, but not both';
-        }
-        if (!args.options.listId && !args.options.listName) {
-            return 'Specify listId or listName';
-        }
-        return true;
-    }));
+}, _TodoTaskListCommand_initOptionSets = function _TodoTaskListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listName']);
 };
 module.exports = new TodoTaskListCommand();
 //# sourceMappingURL=task-list.js.map

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

@@ -13,9 +13,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TodoTaskRemoveCommand_instances, _TodoTaskRemoveCommand_initTelemetry, _TodoTaskRemoveCommand_initOptions, _TodoTaskRemoveCommand_initValidators;
+var _TodoTaskRemoveCommand_instances, _TodoTaskRemoveCommand_initTelemetry, _TodoTaskRemoveCommand_initOptions, _TodoTaskRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -25,7 +25,7 @@ class TodoTaskRemoveCommand extends GraphCommand_1.default {
         _TodoTaskRemoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_REMOVE;
@@ -33,58 +33,57 @@ class TodoTaskRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the specified Microsoft To Do task';
     }
-    commandAction(logger, args, cb) {
-        const getToDoListId = () => {
-            if (args.options.listName) {
-                // Search list by its name
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default
-                    .get(requestOptions)
-                    .then((response) => response.value && response.value.length === 1 ? response.value[0].id : undefined);
-            }
-            return Promise.resolve(args.options.listId);
-        };
-        const removeToDoTask = () => {
-            getToDoListId()
-                .then(toDoListId => {
-                if (!toDoListId) {
-                    return Promise.reject(`The list ${args.options.listName} cannot be found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const getToDoListId = () => __awaiter(this, void 0, void 0, function* () {
+                if (args.options.listName) {
+                    // Search list by its name
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
+                        headers: {
+                            accept: "application/json;odata.metadata=none"
+                        },
+                        responseType: 'json'
+                    };
+                    const response = yield request_1.default.get(requestOptions);
+                    return response.value && response.value.length === 1 ? response.value[0].id : undefined;
                 }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists/${toDoListId}/tasks/${args.options.id}`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeToDoTask();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: "confirm",
-                name: "continue",
-                default: false,
-                message: `Are you sure you want to remove the task ${args.options.id} from list ${args.options.listId || args.options.listName}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                return Promise.resolve(args.options.listId);
+            });
+            const removeToDoTask = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const toDoListId = yield getToDoListId();
+                    if (!toDoListId) {
+                        throw `The list ${args.options.listName} cannot be found`;
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/me/todo/lists/${toDoListId}/tasks/${args.options.id}`,
+                        headers: {
+                            accept: "application/json;odata.metadata=none"
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeToDoTask();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeToDoTask();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the task ${args.options.id} from list ${args.options.listId || args.options.listName}?`
+                });
+                if (result.continue) {
+                    yield removeToDoTask();
+                }
+            }
+        });
     }
 }
 _TodoTaskRemoveCommand_instances = new WeakSet(), _TodoTaskRemoveCommand_initTelemetry = function _TodoTaskRemoveCommand_initTelemetry() {
@@ -105,16 +104,8 @@ _TodoTaskRemoveCommand_instances = new WeakSet(), _TodoTaskRemoveCommand_initTel
     }, {
         option: '--confirm'
     });
-}, _TodoTaskRemoveCommand_initValidators = function _TodoTaskRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.listName && !args.options.listId) {
-            return 'Specify name or id of the To Do list';
-        }
-        if (args.options.listName && args.options.listId) {
-            return 'Specify either the name or the id of the To Do list but not both';
-        }
-        return true;
-    }));
+}, _TodoTaskRemoveCommand_initOptionSets = function _TodoTaskRemoveCommand_initOptionSets() {
+    this.optionSets.push(['listName', 'listId']);
 };
 module.exports = new TodoTaskRemoveCommand();
 //# sourceMappingURL=task-remove.js.map

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

@@ -13,9 +13,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TodoTaskSetCommand_instances, _TodoTaskSetCommand_initTelemetry, _TodoTaskSetCommand_initOptions, _TodoTaskSetCommand_initValidators;
+var _TodoTaskSetCommand_instances, _TodoTaskSetCommand_initTelemetry, _TodoTaskSetCommand_initOptions, _TodoTaskSetCommand_initValidators, _TodoTaskSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TodoTaskSetCommand extends GraphCommand_1.default {
@@ -25,6 +26,7 @@ class TodoTaskSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TodoTaskSetCommand_instances, "m", _TodoTaskSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_SET;
@@ -32,27 +34,28 @@ class TodoTaskSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Update a task in a Microsoft To Do task list';
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        const data = this.mapRequestBody(args.options);
-        this
-            .getTodoListId(args)
-            .then((listId) => {
-            const requestOptions = {
-                url: `${endpoint}/me/todo/lists/${listId}/tasks/${encodeURIComponent(args.options.id)}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'Content-Type': 'application/json'
-                },
-                data: data,
-                responseType: 'json'
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0`;
+            const data = this.mapRequestBody(args.options);
+            try {
+                const listId = yield this.getTodoListId(args);
+                const requestOptions = {
+                    url: `${endpoint}/me/todo/lists/${listId}/tasks/${encodeURIComponent(args.options.id)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'Content-Type': 'application/json'
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.patch(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTodoListId(args) {
         if (args.options.listId) {
@@ -74,7 +77,14 @@ class TodoTaskSetCommand extends GraphCommand_1.default {
             return Promise.resolve(taskList.id);
         });
     }
+    getDateTimeTimeZone(dateTime) {
+        return {
+            dateTime: dateTime,
+            timeZone: 'Etc/GMT'
+        };
+    }
     mapRequestBody(options) {
+        var _a;
         const requestBody = {};
         if (options.status) {
             requestBody.status = options.status;
@@ -82,6 +92,21 @@ class TodoTaskSetCommand extends GraphCommand_1.default {
         if (options.title) {
             requestBody.title = options.title;
         }
+        if (options.importance) {
+            requestBody.importance = options.importance.toLowerCase();
+        }
+        if (options.bodyContentType || options.bodyContent) {
+            requestBody.body = {
+                content: options.bodyContent,
+                contentType: ((_a = options.bodyContentType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'text'
+            };
+        }
+        if (options.dueDateTime) {
+            requestBody.dueDateTime = this.getDateTimeTimeZone(options.dueDateTime);
+        }
+        if (options.reminderDateTime) {
+            requestBody.reminderDateTime = this.getDateTimeTimeZone(options.reminderDateTime);
+        }
         return requestBody;
     }
 }
@@ -91,7 +116,12 @@ _TodoTaskSetCommand_instances = new WeakSet(), _TodoTaskSetCommand_initTelemetry
             listId: typeof args.options.listId !== 'undefined',
             listName: typeof args.options.listName !== 'undefined',
             status: typeof args.options.status !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
+            title: typeof args.options.title !== 'undefined',
+            bodyContent: typeof args.options.bodyContent !== 'undefined',
+            bodyContentType: args.options.bodyContentType,
+            dueDateTime: typeof args.options.dueDateTime !== 'undefined',
+            importance: args.options.importance,
+            reminderDateTime: typeof args.options.reminderDateTime !== 'undefined'
         });
     });
 }, _TodoTaskSetCommand_initOptions = function _TodoTaskSetCommand_initOptions() {
@@ -106,15 +136,21 @@ _TodoTaskSetCommand_instances = new WeakSet(), _TodoTaskSetCommand_initTelemetry
         option: '--listName [listName]'
     }, {
         option: '--listId [listId]'
+    }, {
+        option: '--bodyContent [bodyContent]'
+    }, {
+        option: '--bodyContentType [bodyContentType]',
+        autocomplete: ['text', 'html']
+    }, {
+        option: '--dueDateTime [dueDateTime]'
+    }, {
+        option: '--importance [importance]',
+        autocomplete: ['low', 'normal', 'high']
+    }, {
+        option: '--reminderDateTime [reminderDateTime]'
     });
 }, _TodoTaskSetCommand_initValidators = function _TodoTaskSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.listId && args.options.listName) {
-            return 'Specify listId or listName but not both';
-        }
-        if (!args.options.listId && !args.options.listName) {
-            return 'Specify listId or listName';
-        }
         if (args.options.status &&
             args.options.status !== 'notStarted' &&
             args.options.status !== 'inProgress' &&
@@ -123,8 +159,22 @@ _TodoTaskSetCommand_instances = new WeakSet(), _TodoTaskSetCommand_initTelemetry
             args.options.status !== 'deferred') {
             return `${args.options.status} is not a valid value. Allowed values are notStarted|inProgress|completed|waitingOnOthers|deferred`;
         }
+        if (args.options.bodyContentType && ['text', 'html'].indexOf(args.options.bodyContentType.toLowerCase()) === -1) {
+            return `'${args.options.bodyContentType}' is not a valid value for the bodyContentType option. Allowed values are text|html`;
+        }
+        if (args.options.importance && ['low', 'normal', 'high'].indexOf(args.options.importance.toLowerCase()) === -1) {
+            return `'${args.options.importance}' is not a valid value for the importance option. Allowed values are low|normal|high`;
+        }
+        if (args.options.dueDateTime && !validation_1.validation.isValidISODateTime(args.options.dueDateTime)) {
+            return `'${args.options.dueDateTime}' is not a valid ISO date string`;
+        }
+        if (args.options.reminderDateTime && !validation_1.validation.isValidISODateTime(args.options.reminderDateTime)) {
+            return `'${args.options.reminderDateTime}' is not a valid ISO date string`;
+        }
         return true;
     }));
+}, _TodoTaskSetCommand_initOptionSets = function _TodoTaskSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listName']);
 };
 module.exports = new TodoTaskSetCommand();
 //# sourceMappingURL=task-set.js.map

package/dist/m365/todo/commands.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'todo';
 exports.default = {
     LIST_ADD: `${prefix} list add`,
+    LIST_GET: `${prefix} list get`,
     LIST_LIST: `${prefix} list list`,
     LIST_REMOVE: `${prefix} list remove`,
     LIST_SET: `${prefix} list set`,
     TASK_ADD: `${prefix} task add`,
+    TASK_GET: `${prefix} task get`,
     TASK_LIST: `${prefix} task list`,
     TASK_REMOVE: `${prefix} task remove`,
     TASK_SET: `${prefix} task set`

package/dist/m365/util/commands/accesstoken/accesstoken-get.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");
@@ -22,22 +31,25 @@ class UtilAccessTokenGetCommand extends Command_1.default {
     get description() {
         return 'Gets access token for the specified resource';
     }
-    commandAction(logger, args, cb) {
-        let resource = args.options.resource;
-        if (resource.toLowerCase() === 'sharepoint') {
-            if (Auth_1.default.service.spoUrl) {
-                resource = Auth_1.default.service.spoUrl;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let resource = args.options.resource;
+            if (resource.toLowerCase() === 'sharepoint') {
+                if (Auth_1.default.service.spoUrl) {
+                    resource = Auth_1.default.service.spoUrl;
+                }
+                else {
+                    throw `SharePoint URL undefined. Use the 'm365 spo set --url https://contoso.sharepoint.com' command to set the URL`;
+                }
             }
-            else {
-                return cb(`SharePoint URL undefined. Use the 'm365 spo set --url https://contoso.sharepoint.com' command to set the URL`);
+            try {
+                const accessToken = yield Auth_1.default.ensureAccessToken(resource, logger, this.debug, args.options.new);
+                logger.log(accessToken);
             }
-        }
-        Auth_1.default
-            .ensureAccessToken(resource, logger, this.debug, args.options.new)
-            .then((accessToken) => {
-            logger.log(accessToken);
-            cb();
-        }, (err) => cb(new Command_1.CommandError(err)));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _UtilAccessTokenGetCommand_instances = new WeakSet(), _UtilAccessTokenGetCommand_initTelemetry = function _UtilAccessTokenGetCommand_initTelemetry() {