@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5bdba89

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -15,10 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const validation_1 = require("../../../../utils/validation");
 class OutlookMailSendCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -34,7 +37,6 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return 'Sends an email';
     }
     commandAction(logger, args) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -48,28 +50,8 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
                         'content-type': 'application/json'
                     },
                     responseType: 'json',
-                    data: {
-                        message: {
-                            subject: args.options.subject,
-                            body: {
-                                contentType: args.options.bodyContentType || 'Text',
-                                content: args.options.bodyContents
-                            },
-                            toRecipients: this.mapEmailAddressesToRecipients(args.options.to.split(',')),
-                            ccRecipients: this.mapEmailAddressesToRecipients((_a = args.options.cc) === null || _a === void 0 ? void 0 : _a.split(',')),
-                            bccRecipients: this.mapEmailAddressesToRecipients((_b = args.options.bcc) === null || _b === void 0 ? void 0 : _b.split(',')),
-                            importance: args.options.importance
-                        },
-                        saveToSentItems: args.options.saveToSentItems
-                    }
+                    data: this.getRequestBody(args.options)
                 };
-                if (args.options.mailbox) {
-                    requestOptions.data.message.from = {
-                        emailAddress: {
-                            address: args.options.mailbox
-                        }
-                    };
-                }
                 yield request_1.default.post(requestOptions);
             }
             catch (err) {
@@ -77,15 +59,40 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
             }
         });
     }
-    mapEmailAddressesToRecipients(emailAddresses) {
-        if (!emailAddresses) {
-            return emailAddresses;
+    mapEmailAddressToRecipient(email) {
+        if (!email) {
+            return undefined;
         }
-        return emailAddresses.map(email => ({
+        return {
             emailAddress: {
                 address: email.trim()
             }
+        };
+    }
+    getRequestBody(options) {
+        var _a, _b;
+        const attachments = typeof options.attachment === 'string' ? [options.attachment] : options.attachment;
+        const attachmentContents = attachments === null || attachments === void 0 ? void 0 : attachments.map(a => ({
+            '@odata.type': '#microsoft.graph.fileAttachment',
+            name: path.basename(a),
+            contentBytes: fs.readFileSync(a, { encoding: 'base64' })
         }));
+        return ({
+            message: {
+                subject: options.subject,
+                body: {
+                    contentType: options.bodyContentType || 'Text',
+                    content: options.bodyContents
+                },
+                from: this.mapEmailAddressToRecipient(options.mailbox),
+                toRecipients: options.to.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                ccRecipients: (_a = options.cc) === null || _a === void 0 ? void 0 : _a.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                bccRecipients: (_b = options.bcc) === null || _b === void 0 ? void 0 : _b.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                importance: options.importance,
+                attachments: attachmentContents
+            },
+            saveToSentItems: options.saveToSentItems
+        });
     }
 }
 _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
@@ -97,7 +104,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             saveToSentItems: args.options.saveToSentItems,
             importance: args.options.importance,
             mailbox: typeof args.options.mailbox !== 'undefined',
-            sender: typeof args.options.sender !== 'undefined'
+            sender: typeof args.options.sender !== 'undefined',
+            attachment: typeof args.options.attachment !== 'undefined'
         });
     });
 }, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
@@ -121,6 +129,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
     }, {
         option: '--importance [importance]',
         autocomplete: ['low', 'normal', 'high']
+    }, {
+        option: '--attachment [attachment]'
     }, {
         option: '--saveToSentItems [saveToSentItems]'
     });
@@ -129,16 +139,30 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         if (args.options.bodyContentType &&
             args.options.bodyContentType !== 'Text' &&
             args.options.bodyContentType !== 'HTML') {
-            return `${args.options.bodyContents} is not a valid value for the bodyContents option. Allowed values are Text|HTML`;
+            return `${args.options.bodyContentType} is not a valid value for the bodyContentType option. Allowed values are Text|HTML`;
         }
-        if (args.options.saveToSentItems &&
-            args.options.saveToSentItems !== 'true' &&
-            args.options.saveToSentItems !== 'false') {
+        if (args.options.saveToSentItems && !validation_1.validation.isValidBoolean(args.options.saveToSentItems)) {
             return `${args.options.saveToSentItems} is not a valid value for the saveToSentItems option. Allowed values are true|false`;
         }
         if (args.options.importance && ['low', 'normal', 'high'].indexOf(args.options.importance) === -1) {
             return `'${args.options.importance}' is not a valid value for the importance option. Allowed values are low|normal|high`;
         }
+        if (args.options.attachment) {
+            const attachments = typeof args.options.attachment === 'string' ? [args.options.attachment] : args.options.attachment;
+            for (const attachment of attachments) {
+                if (!fs.existsSync(attachment)) {
+                    return `File with path '${attachment}' was not found.`;
+                }
+                if (!fs.lstatSync(attachment).isFile()) {
+                    return `'${attachment}' is not a file.`;
+                }
+            }
+            const requestBody = this.getRequestBody(args.options);
+            // The max body size of the request is 4 194 304 chars before getting a 413 response
+            if (JSON.stringify(requestBody).length > 4194304) {
+                return 'Exceeded the max total size of attachments which is 3MB.';
+            }
+        }
         return true;
     }));
 };

package/dist/m365/outlook/commands/message/message-get.js

@@ -0,0 +1,97 @@
+"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 _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry, _OutlookMessageGetCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OutlookMessageGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.MESSAGE_GET;
+    }
+    get description() {
+        return 'Retrieves specified message';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAuth ? 'app only permissions' : 'delegated permissions'}`);
+                }
+                let requestUrl = '';
+                if (isAppOnlyAuth) {
+                    if (!args.options.userId && !args.options.userPrincipalName) {
+                        throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                    }
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                    }
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                }
+                else {
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                    }
+                    if (args.options.userId || args.options.userPrincipalName) {
+                        requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                    }
+                    else {
+                        requestUrl += 'me';
+                    }
+                }
+                requestUrl += `/messages/${args.options.id}`;
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${requestUrl}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_initTelemetry = function _OutlookMessageGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+        });
+    });
+}, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userPrincipalName [userPrincipalName]'
+    });
+};
+module.exports = new OutlookMessageGetCommand();
+//# sourceMappingURL=message-get.js.map

package/dist/m365/outlook/commands/message/message-list.js

@@ -17,7 +17,7 @@ var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemet
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 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");
 const Outlook_1 = require("../../Outlook");
@@ -43,7 +43,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
             try {
                 const folderId = yield this.getFolderId(args);
                 const url = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';
-                const messages = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
+                const messages = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
                 logger.log(messages);
             }
             catch (err) {

package/dist/m365/outlook/commands/room/room-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookRoomListCommand_instances, _OutlookRoomListCommand_initTelemetry, _OutlookRoomListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListCommand extends GraphCommand_1.default {
@@ -41,7 +41,7 @@ class OutlookRoomListCommand extends GraphCommand_1.default {
                 endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
             }
             try {
-                const rooms = yield utils_1.odata.getAllItems(endpoint);
+                const rooms = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(rooms);
             }
             catch (err) {

package/dist/m365/outlook/commands/roomlist/roomlist-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class OutlookRoomListListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const roomLists = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`);
+                const roomLists = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`);
                 logger.log(roomLists);
             }
             catch (err) {

package/dist/m365/outlook/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'outlook';
 exports.default = {
     MAIL_SEND: `${prefix} mail send`,
+    MESSAGE_GET: `${prefix} message get`,
     MESSAGE_LIST: `${prefix} message list`,
     MESSAGE_MOVE: `${prefix} message move`,
     REPORT_MAILACTIVITYCOUNTS: `${prefix} report mailactivitycounts`,

package/dist/m365/pa/commands/app/app-get.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 const paAppListCommand = require("../app/app-list");
@@ -96,7 +96,7 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     setProperties(app) {
         app.displayName = app.properties.displayName;
@@ -121,7 +121,7 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.name && !utils_1.validation.isValidGuid(args.options.name)) {
+        if (args.options.name && !validation_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

package/dist/m365/pa/commands/app/app-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppListCommand_instances, _PaAppListCommand_initTelemetry, _PaAppListCommand_initOptions, _PaAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaAppListCommand extends PowerAppsCommand_1.default {
@@ -39,7 +39,7 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
             try {
-                const apps = yield utils_1.odata.getAllItems(url);
+                const apps = yield odata_1.odata.getAllItems(url);
                 if (apps.length > 0) {
                     apps.forEach(a => {
                         a.displayName = a.properties.displayName;

package/dist/m365/pa/commands/app/app-remove.js

@@ -15,10 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppRemoveCommand_instances, _PaAppRemoveCommand_initTelemetry, _PaAppRemoveCommand_initOptions, _PaAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaAppRemoveCommand extends PowerAppsCommand_1.default {
@@ -65,7 +65,7 @@ class PaAppRemoveCommand extends PowerAppsCommand_1.default {
                 yield removePaApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -92,7 +92,7 @@ _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry
     });
 }, _PaAppRemoveCommand_initValidators = function _PaAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.name)) {
+        if (!validation_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

package/dist/m365/pa/commands/connector/connector-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaConnectorListCommand_instances, _PaConnectorListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
 const commands_2 = require("../../commands");
@@ -41,7 +41,7 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
             try {
-                const connectors = yield utils_1.odata.getAllItems(url);
+                const connectors = yield odata_1.odata.getAllItems(url);
                 if (connectors.length > 0) {
                     connectors.forEach(c => {
                         c.displayName = c.properties.displayName;

package/dist/m365/pa/commands/pcf/pcf-init.js

@@ -20,7 +20,7 @@ const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const template_instantiator_1 = require("../../template-instantiator");
@@ -103,19 +103,19 @@ _PaPcfInitCommand_instances = new WeakSet(), _PaPcfInitCommand_initTelemetry = f
             return 'PowerApps component framework project creation failed. The current directory already contains a project. Please create a new directory and retry the operation.';
         }
         const workingDirectoryName = path.basename(process.cwd());
-        if (!utils_1.validation.isValidFileName(workingDirectoryName)) {
+        if (!validation_1.validation.isValidFileName(workingDirectoryName)) {
             return `Empty or invalid project name '${workingDirectoryName}'`;
         }
         if (!/^(?!\d)[a-zA-Z0-9]+$/i.test(args.options.name)) {
             return `Value of 'name' is invalid. Only characters within the ranges [A - Z], [a - z] or [0 - 9] are allowed. The first character may not be a number.`;
         }
-        if (utils_1.validation.isJavaScriptReservedWord(args.options.name)) {
+        if (validation_1.validation.isJavaScriptReservedWord(args.options.name)) {
             return `The value '${args.options.name}' passed for 'name' is a reserved word.`;
         }
         if (!/^(?!\.|\d)(?!.*\.$)(?!.*?\.\d)(?!.*?\.\.)[a-zA-Z0-9.]+$/i.test(args.options.namespace)) {
             return `Value of 'namespace' is invalid. Only characters within the ranges [A - Z], [a - z], [0 - 9], or '.' are allowed. The first and last character may not be the '.' character. Consecutive '.' characters are not allowed. Numbers are not allowed as the first character or immediately after a period.`;
         }
-        if (utils_1.validation.isJavaScriptReservedWord(args.options.namespace)) {
+        if (validation_1.validation.isJavaScriptReservedWord(args.options.namespace)) {
             return `The value '${args.options.namespace}' passed for 'namespace' is or includes a reserved word.`;
         }
         if (args.options.namespace && args.options.name && (args.options.namespace + args.options.name).length > 75) {

package/dist/m365/pa/commands/solution/solution-init.js

@@ -20,7 +20,7 @@ const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const template_instantiator_1 = require("../../template-instantiator");
@@ -122,7 +122,7 @@ _PaSolutionInitCommand_instances = new WeakSet(), _PaSolutionInitCommand_initOpt
             return 'CDS project creation failed. The current directory already contains a project. Please create a new directory and retry the operation.';
         }
         const workingDirectoryName = path.basename(process.cwd());
-        if (!utils_1.validation.isValidFileName(workingDirectoryName)) {
+        if (!validation_1.validation.isValidFileName(workingDirectoryName)) {
             return `Empty or invalid project name '${workingDirectoryName}'`;
         }
         if (args.options.publisherPrefix.length < 2 || args.options.publisherPrefix.length > 8 || !/^(?!mscrm)^([a-zA-Z])\w*$/i.test(args.options.publisherPrefix)) {

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

@@ -17,7 +17,8 @@ var _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry,
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -42,7 +43,7 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }
@@ -118,7 +119,7 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         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;

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

@@ -13,11 +13,12 @@ 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 _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators;
+var _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators, _PlannerBucketGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -29,6 +30,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.BUCKET_GET;
@@ -38,7 +40,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }
@@ -95,7 +97,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/buckets/${id}`,
                 headers: {
-                    accept: 'application/json'
+                    accept: 'application/json;odata.metadata=none'
                 },
                 responseType: 'json'
             };
@@ -143,9 +145,6 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
             if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
                 return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
             }
-            if (args.options.name) {
-                return 'Specify either id or name';
-            }
         }
         if (args.options.name) {
             if (!args.options.planId && !args.options.planTitle) {
@@ -161,7 +160,7 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
                 if (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`;
                 }
             }
@@ -171,11 +170,10 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
                 }
             }
         }
-        if (!args.options.id && !args.options.name) {
-            return 'Please specify id or name';
-        }
         return true;
     }));
+}, _PlannerBucketGetCommand_initOptionSets = function _PlannerBucketGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new PlannerBucketGetCommand();
 //# sourceMappingURL=bucket-get.js.map

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators, _PlannerBucketListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const utils_1 = require("../../../../utils");
+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");
@@ -41,13 +43,13 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
                 this.handleError('This command does not support application permissions.');
                 return;
             }
             try {
                 const planId = yield this.getPlanId(args);
-                const buckets = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`);
+                const buckets = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`);
                 logger.log(buckets);
             }
             catch (err) {
@@ -100,7 +102,7 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         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;