@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3a40034

package/dist/m365/pa/commands/environment/environment-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");
@@ -24,28 +33,31 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'id', 'location', 'displayName', 'provisioningState', 'environmentSku', 'azureRegionHint', 'isDefault'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            res.displayName = res.properties.displayName;
-            res.provisioningState = res.properties.provisioningState;
-            res.environmentSku = res.properties.environmentSku;
-            res.azureRegionHint = res.properties.azureRegionHint;
-            res.isDefault = res.properties.isDefault;
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                res.displayName = res.properties.displayName;
+                res.provisioningState = res.properties.provisioningState;
+                res.environmentSku = res.properties.environmentSku;
+                res.azureRegionHint = res.properties.azureRegionHint;
+                res.isDefault = res.properties.isDefault;
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {

package/dist/m365/pa/commands/environment/environment-list.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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
@@ -13,28 +22,31 @@ class PaEnvironmentListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value.length > 0) {
-                res.value.forEach(e => {
-                    e.displayName = e.properties.displayName;
-                });
-                logger.log(res.value);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value.length > 0) {
+                    res.value.forEach(e => {
+                        e.displayName = e.properties.displayName;
+                    });
+                    logger.log(res.value);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new PaEnvironmentListCommand();

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");
@@ -43,42 +43,43 @@ class PaPcfInitCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Creates new PowerApps component framework project';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const pcfTemplatePath = path.join(__dirname, 'pcf-init', 'assets');
-            const pcfComponentTemplatePath = path.join(pcfTemplatePath, 'control', `${args.options.template.toLowerCase()}-template`);
-            const workingDirectory = process.cwd();
-            const workingDirectoryName = path.basename(workingDirectory);
-            const componentDirectory = path.join(workingDirectory, args.options.name);
-            const variables = {
-                "$namespaceplaceholder$": args.options.namespace,
-                "$controlnameplaceholder$": args.options.name,
-                "$pcfProjectName$": workingDirectoryName,
-                "pcfprojecttype": workingDirectoryName,
-                "$pcfProjectGuid$": (0, uuid_1.v4)()
-            };
-            if (this.verbose) {
-                logger.logToStderr(`name: ${args.options.name}`);
-                logger.logToStderr(`namespace: ${args.options.namespace}`);
-                logger.logToStderr(`template: ${args.options.template}`);
-                logger.logToStderr(`pcfTemplatePath: ${pcfTemplatePath}`);
-                logger.logToStderr(`pcfComponentTemplatePath: ${pcfComponentTemplatePath}`);
-                logger.logToStderr(`workingDirectory: ${workingDirectory}`);
-                logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
-                logger.logToStderr(`componentDirectory: ${componentDirectory}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const pcfTemplatePath = path.join(__dirname, 'pcf-init', 'assets');
+                const pcfComponentTemplatePath = path.join(pcfTemplatePath, 'control', `${args.options.template.toLowerCase()}-template`);
+                const workingDirectory = process.cwd();
+                const workingDirectoryName = path.basename(workingDirectory);
+                const componentDirectory = path.join(workingDirectory, args.options.name);
+                const variables = {
+                    "$namespaceplaceholder$": args.options.namespace,
+                    "$controlnameplaceholder$": args.options.name,
+                    "$pcfProjectName$": workingDirectoryName,
+                    "pcfprojecttype": workingDirectoryName,
+                    "$pcfProjectGuid$": (0, uuid_1.v4)()
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`name: ${args.options.name}`);
+                    logger.logToStderr(`namespace: ${args.options.namespace}`);
+                    logger.logToStderr(`template: ${args.options.template}`);
+                    logger.logToStderr(`pcfTemplatePath: ${pcfTemplatePath}`);
+                    logger.logToStderr(`pcfComponentTemplatePath: ${pcfComponentTemplatePath}`);
+                    logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                    logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                    logger.logToStderr(`componentDirectory: ${componentDirectory}`);
+                }
+                template_instantiator_1.default.instantiate(logger, pcfTemplatePath, workingDirectory, false, variables, this.verbose);
+                template_instantiator_1.default.instantiate(logger, pcfComponentTemplatePath, componentDirectory, true, variables, this.verbose);
+                if (this.verbose) {
+                    logger.logToStderr(` `);
+                }
+                logger.log(chalk.green(`The PowerApps component framework project was successfully created in '${workingDirectory}'.`));
+                logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
             }
-            template_instantiator_1.default.instantiate(logger, pcfTemplatePath, workingDirectory, false, variables, this.verbose);
-            template_instantiator_1.default.instantiate(logger, pcfComponentTemplatePath, componentDirectory, true, variables, this.verbose);
-            if (this.verbose) {
-                logger.logToStderr(` `);
+            catch (err) {
+                throw new Command_1.CommandError(err);
             }
-            logger.log(chalk.green(`The PowerApps component framework project was successfully created in '${workingDirectory}'.`));
-            logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
+        });
     }
 }
 _PaPcfInitCommand_instances = new WeakSet(), _PaPcfInitCommand_initTelemetry = function _PaPcfInitCommand_initTelemetry() {
@@ -102,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");
@@ -42,55 +42,56 @@ class PaSolutionInitCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Initializes a directory with a new CDS solution project';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const solutionInitTemplatePath = path.join(__dirname, 'solution-init', 'assets');
-            const cdsAssetsTemplatePath = path.join(solutionInitTemplatePath, 'Other');
-            const workingDirectory = process.cwd();
-            const workingDirectoryName = path.basename(workingDirectory);
-            const cdsAssetsDirectory = path.join(workingDirectory, 'Other');
-            const cdsAssetsDirectorySolutionsFile = path.join(workingDirectory, 'Other', 'Solution.xml');
-            const publisherName = args.options.publisherName;
-            const publisherPrefix = args.options.publisherPrefix.toLocaleLowerCase();
-            const customizationOptionValuePrefix = this.generateOptionValuePrefixForPublisher(publisherPrefix);
-            const variables = {
-                "$publisherName$": publisherName,
-                "$customizationPrefix$": publisherPrefix,
-                "$customizationOptionValuePrefix$": customizationOptionValuePrefix,
-                "$cdsProjectGuid$": (0, uuid_1.v4)(),
-                "solutionprojecttype": workingDirectoryName,
-                "$solutionName$": workingDirectoryName
-            };
-            if (this.verbose) {
-                logger.logToStderr(`publisherName: ${publisherName}`);
-                logger.logToStderr(`publisherPrefix: ${publisherPrefix}`);
-                logger.logToStderr(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
-                logger.logToStderr(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
-                logger.logToStderr(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
-                logger.logToStderr(`workingDirectory: ${workingDirectory}`);
-                logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
-                logger.logToStderr(`cdsAssetsDirectory: ${cdsAssetsDirectory}`);
-                logger.logToStderr(`cdsAssetsDirectorySolutionsFile: ${cdsAssetsDirectorySolutionsFile}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const solutionInitTemplatePath = path.join(__dirname, 'solution-init', 'assets');
+                const cdsAssetsTemplatePath = path.join(solutionInitTemplatePath, 'Other');
+                const workingDirectory = process.cwd();
+                const workingDirectoryName = path.basename(workingDirectory);
+                const cdsAssetsDirectory = path.join(workingDirectory, 'Other');
+                const cdsAssetsDirectorySolutionsFile = path.join(workingDirectory, 'Other', 'Solution.xml');
+                const publisherName = args.options.publisherName;
+                const publisherPrefix = args.options.publisherPrefix.toLocaleLowerCase();
+                const customizationOptionValuePrefix = this.generateOptionValuePrefixForPublisher(publisherPrefix);
+                const variables = {
+                    "$publisherName$": publisherName,
+                    "$customizationPrefix$": publisherPrefix,
+                    "$customizationOptionValuePrefix$": customizationOptionValuePrefix,
+                    "$cdsProjectGuid$": (0, uuid_1.v4)(),
+                    "solutionprojecttype": workingDirectoryName,
+                    "$solutionName$": workingDirectoryName
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`publisherName: ${publisherName}`);
+                    logger.logToStderr(`publisherPrefix: ${publisherPrefix}`);
+                    logger.logToStderr(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
+                    logger.logToStderr(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
+                    logger.logToStderr(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
+                    logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                    logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                    logger.logToStderr(`cdsAssetsDirectory: ${cdsAssetsDirectory}`);
+                    logger.logToStderr(`cdsAssetsDirectorySolutionsFile: ${cdsAssetsDirectorySolutionsFile}`);
+                }
+                template_instantiator_1.default.instantiate(logger, solutionInitTemplatePath, workingDirectory, false, variables, this.verbose);
+                if (this.verbose) {
+                    logger.logToStderr(` `);
+                }
+                logger.log(chalk.green(`CDS solution project with name '${workingDirectoryName}' created successfully in current directory.`));
+                const cdsAssetsExist = fs.existsSync(cdsAssetsDirectory) && fs.existsSync(cdsAssetsDirectorySolutionsFile);
+                if (cdsAssetsExist) {
+                    logger.log(chalk.yellow(`CDS solution files already exist in the current directory. Skipping CDS solution files creation.`));
+                }
+                else {
+                    template_instantiator_1.default.instantiate(logger, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
+                    logger.log(chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${publisherName}', and customization prefix '${publisherPrefix}'.`));
+                    logger.log(`Please verify the publisher information and solution name found in the '${chalk.grey('Solution.xml')}' file.`);
+                }
             }
-            template_instantiator_1.default.instantiate(logger, solutionInitTemplatePath, workingDirectory, false, variables, this.verbose);
-            if (this.verbose) {
-                logger.logToStderr(` `);
+            catch (err) {
+                throw new Command_1.CommandError(err);
             }
-            logger.log(chalk.green(`CDS solution project with name '${workingDirectoryName}' created successfully in current directory.`));
-            const cdsAssetsExist = fs.existsSync(cdsAssetsDirectory) && fs.existsSync(cdsAssetsDirectorySolutionsFile);
-            if (cdsAssetsExist) {
-                logger.log(chalk.yellow(`CDS solution files already exist in the current directory. Skipping CDS solution files creation.`));
-            }
-            else {
-                template_instantiator_1.default.instantiate(logger, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
-                logger.log(chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${publisherName}', and customization prefix '${publisherPrefix}'.`));
-                logger.log(`Please verify the publisher information and solution name found in the '${chalk.grey('Solution.xml')}' file.`);
-            }
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
+        });
     }
     generateOptionValuePrefixForPublisher(customizationPrefix) {
         if (customizationPrefix.toLocaleLowerCase() !== "new") {
@@ -121,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/pa/commands/solution/solution-reference-add.js

@@ -39,20 +39,21 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Adds a project reference to the solution in the current directory';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.projectPath)[0];
-            const relativeReferencedProjectFilePath = path.relative(process.cwd(), referencedProjectFilePath);
-            const cdsProjectFilePath = this.getCdsProjectFile(process.cwd())[0];
-            const cdsProjectFileContent = fs.readFileSync(cdsProjectFilePath, 'utf8');
-            const cdsProjectMutator = new cds_project_mutator_1.default(cdsProjectFileContent);
-            cdsProjectMutator.addProjectReference(relativeReferencedProjectFilePath);
-            fs.writeFileSync(cdsProjectFilePath, cdsProjectMutator.cdsProjectDocument);
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.projectPath)[0];
+                const relativeReferencedProjectFilePath = path.relative(process.cwd(), referencedProjectFilePath);
+                const cdsProjectFilePath = this.getCdsProjectFile(process.cwd())[0];
+                const cdsProjectFileContent = fs.readFileSync(cdsProjectFilePath, 'utf8');
+                const cdsProjectMutator = new cds_project_mutator_1.default(cdsProjectFileContent);
+                cdsProjectMutator.addProjectReference(relativeReferencedProjectFilePath);
+                fs.writeFileSync(cdsProjectFilePath, cdsProjectMutator.cdsProjectDocument);
+            }
+            catch (err) {
+                throw new Command_1.CommandError(err);
+            }
+        });
     }
     getCdsProjectFile(rootPath) {
         return fs.readdirSync(rootPath)

package/dist/m365/planner/commands/bucket/bucket-add.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 _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators;
+var _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_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 PlannerBucketAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.BUCKET_ADD;
@@ -39,32 +41,33 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'name', 'planId', 'orderHint'];
     }
-    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;
-        }
-        this
-            .getPlanId(args)
-            .then((planId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/buckets`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    name: args.options.name,
-                    planId: planId,
-                    orderHint: args.options.orderHint
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            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;
+            }
+            try {
+                const planId = yield this.getPlanId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/buckets`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        name: args.options.name,
+                        planId: planId,
+                        orderHint: args.options.orderHint
+                    }
+                };
+                const response = yield request_1.default.post(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getPlanId(args) {
         if (args.options.planId) {
@@ -110,23 +113,19 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
     });
 }, _PlannerBucketAddCommand_initValidators = function _PlannerBucketAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.planId && !args.options.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle but not both';
-        }
         if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
         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;
     }));
+}, _PlannerBucketAddCommand_initOptionSets = function _PlannerBucketAddCommand_initOptionSets() {
+    this.optionSets.push(['planId', 'planTitle']);
 };
 module.exports = new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map

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

@@ -17,7 +17,8 @@ var _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_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");
@@ -36,18 +37,21 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets the Microsoft Planner bucket in a plan';
     }
-    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;
-        }
-        this
-            .getBucketId(args)
-            .then((bucketId) => this.getBucketById(bucketId))
-            .then((bucket) => {
-            logger.log(bucket);
-            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;
+            }
+            try {
+                const bucketId = yield this.getBucketId(args);
+                const bucket = yield this.getBucketById(bucketId);
+                logger.log(bucket);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getBucketId(args) {
         const { id, name } = args.options;
@@ -92,7 +96,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'
             };
@@ -158,7 +162,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`;
                 }
             }