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

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;

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

@@ -16,9 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerBucketRemoveCommand_instances, _PlannerBucketRemoveCommand_initTelemetry, _PlannerBucketRemoveCommand_initOptions, _PlannerBucketRemoveCommand_initValidators, _PlannerBucketRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 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");
@@ -40,7 +41,7 @@ class PlannerBucketRemoveCommand 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;
             }
@@ -65,7 +66,7 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
                 yield removeBucket();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -180,7 +181,7 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
                 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`;
                 }
             }

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

@@ -17,7 +17,8 @@ var _PlannerBucketSetCommand_instances, _PlannerBucketSetCommand_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");
@@ -39,7 +40,7 @@ class PlannerBucketSetCommand 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;
             }
@@ -174,7 +175,7 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_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`;
                 }
             }

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

@@ -17,7 +17,10 @@ var _PlannerPlanAddCommand_instances, _PlannerPlanAddCommand_initTelemetry, _Pla
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerPlanAddCommand extends GraphCommand_1.default {
@@ -40,7 +43,7 @@ class PlannerPlanAddCommand 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;
             }
@@ -124,7 +127,7 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         const userArr = userNames.split(',').map(o => o.trim());
         const promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },
@@ -149,7 +152,7 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        return utils_1.aadGroup
+        return aadGroup_1.aadGroup
             .getGroupByDisplayName(args.options.ownerGroupName)
             .then(group => group.id);
     }
@@ -177,13 +180,13 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
     });
 }, _PlannerPlanAddCommand_initValidators = function _PlannerPlanAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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`;
         }
         if (args.options.shareWithUserIds && args.options.shareWithUserNames) {
             return 'Specify either shareWithUserIds or shareWithUserNames but not both';
         }
-        if (args.options.shareWithUserIds && !utils_1.validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
+        if (args.options.shareWithUserIds && !validation_1.validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
             return 'shareWithUserIds contains invalid GUID';
         }
         return true;

package/dist/m365/planner/commands/plan/plan-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 _PlannerPlanGetCommand_instances, _PlannerPlanGetCommand_initTelemetry, _PlannerPlanGetCommand_initOptions, _PlannerPlanGetCommand_initValidators;
+var _PlannerPlanGetCommand_instances, _PlannerPlanGetCommand_initTelemetry, _PlannerPlanGetCommand_initOptions, _PlannerPlanGetCommand_initValidators, _PlannerPlanGetCommand_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 PlannerPlanGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PLAN_GET;
@@ -41,16 +43,10 @@ class PlannerPlanGetCommand 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;
             }
-            if (args.options.planId) {
-                args.options.id = args.options.planId;
-            }
-            if (args.options.planTitle) {
-                args.options.title = args.options.planTitle;
-            }
             try {
                 if (args.options.id) {
                     const plan = yield planner_1.planner.getPlanById(args.options.id);
@@ -98,8 +94,6 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
 _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTelemetry = function _PlannerPlanGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            planId: typeof args.options.planId !== 'undefined',
-            planTitle: typeof args.options.planTitle !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
@@ -108,10 +102,6 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     });
 }, _PlannerPlanGetCommand_initOptions = function _PlannerPlanGetCommand_initOptions() {
     this.options.unshift({
-        option: '--planId [planId]'
-    }, {
-        option: '--planTitle [planTitle]'
-    }, {
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
@@ -122,28 +112,19 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     });
 }, _PlannerPlanGetCommand_initValidators = function _PlannerPlanGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.planId && args.options.planTitle ||
-            args.options.id && args.options.title ||
-            args.options.planId && args.options.title ||
-            args.options.id && args.options.planTitle) {
-            return 'Specify either id or title but not both';
+        if (args.options.title && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName';
         }
-        if (!args.options.planId && !args.options.id) {
-            if (!args.options.planTitle && !args.options.title) {
-                return 'Specify either id or title';
-            }
-            if ((args.options.title || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName';
-            }
-            if ((args.options.title || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName but not both';
-            }
-            if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
-                return `${args.options.ownerGroupId} is not a valid GUID`;
-            }
+        if (args.options.title && args.options.ownerGroupId && args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName but not both';
+        }
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
+}, _PlannerPlanGetCommand_initOptionSets = function _PlannerPlanGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new PlannerPlanGetCommand();
 //# sourceMappingURL=plan-get.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators, _PlannerPlanListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-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");
@@ -41,7 +42,7 @@ class PlannerPlanListCommand 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;
             }
@@ -81,7 +82,7 @@ _PlannerPlanListCommand_instances = new WeakSet(), _PlannerPlanListCommand_initT
     });
 }, _PlannerPlanListCommand_initValidators = function _PlannerPlanListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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/plan/plan-remove.js

@@ -16,9 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerPlanRemoveCommand_instances, _PlannerPlanRemoveCommand_initTelemetry, _PlannerPlanRemoveCommand_initOptions, _PlannerPlanRemoveCommand_initValidators, _PlannerPlanRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 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");
@@ -40,7 +41,7 @@ class PlannerPlanRemoveCommand 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;
             }
@@ -65,7 +66,7 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
                 yield removePlan();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -129,7 +130,7 @@ _PlannerPlanRemoveCommand_instances = new WeakSet(), _PlannerPlanRemoveCommand_i
             if (args.options.ownerGroupId && args.options.ownerGroupName) {
                 return 'Specify either ownerGroupId or ownerGroupName 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`;
             }
         }

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

@@ -17,7 +17,9 @@ var _PlannerTaskAddCommand_instances, _PlannerTaskAddCommand_initTelemetry, _Pla
 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 formatting_1 = require("../../../../utils/formatting");
+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 +44,7 @@ class PlannerTaskAddCommand 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;
             }
@@ -82,7 +84,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
     }
     getTaskDetailsEtag(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
             headers: {
                 accept: 'application/json'
             },
@@ -190,7 +192,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         let userIds = [];
         const promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },
@@ -251,13 +253,13 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         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`;
         }
-        if (args.options.startDateTime && !utils_1.validation.isValidISODateTime(args.options.startDateTime)) {
+        if (args.options.startDateTime && !validation_1.validation.isValidISODateTime(args.options.startDateTime)) {
             return 'The startDateTime is not a valid ISO date string';
         }
-        if (args.options.dueDateTime && !utils_1.validation.isValidISODateTime(args.options.dueDateTime)) {
+        if (args.options.dueDateTime && !validation_1.validation.isValidISODateTime(args.options.dueDateTime)) {
             return 'The dueDateTime is not a valid ISO date string';
         }
         if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
@@ -266,7 +268,7 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
             return `percentComplete should be between 0 and 100`;
         }
-        if (args.options.assignedToUserIds && !utils_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+        if (args.options.assignedToUserIds && !validation_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
             return 'assignedToUserIds contains invalid GUID';
         }
         if (args.options.assignedToUserIds && args.options.assignedToUserNames) {

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

@@ -19,6 +19,7 @@ const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
@@ -56,7 +57,7 @@ class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
                     }
                 };
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.taskId)}/details`,
+                    url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(args.options.taskId)}/details`,
                     headers: {
                         accept: 'application/json;odata.metadata=none',
                         prefer: 'return=representation',
@@ -82,7 +83,7 @@ class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
     }
     getTaskDetailsEtag(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
             headers: {
                 accept: 'application/json;odata.metadata=minimal'
             },

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

@@ -17,7 +17,8 @@ var _PlannerTaskChecklistItemListCommand_instances, _PlannerTaskChecklistItemLis
 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 formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskChecklistItemListCommand extends GraphCommand_1.default {
@@ -37,12 +38,12 @@ class PlannerTaskChecklistItemListCommand 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;
             }
             const requestOptions = {
-                url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.taskId)}/details?$select=checklist`,
+                url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(args.options.taskId)}/details?$select=checklist`,
                 headers: {
                     accept: "application/json;odata.metadata=none"
                 },

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

@@ -15,8 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskChecklistItemRemoveCommand_instances, _PlannerTaskChecklistItemRemoveCommand_initTelemetry, _PlannerTaskChecklistItemRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
@@ -38,7 +39,7 @@ class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
                 yield this.removeChecklistitem(args);
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -80,7 +81,7 @@ class PlannerTaskChecklistItemRemoveCommand extends GraphCommand_1.default {
     }
     getTaskDetails(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details?$select=checklist`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details?$select=checklist`,
             headers: {
                 accept: 'application/json;odata.metadata=minimal'
             },

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

@@ -17,11 +17,13 @@ var _PlannerTaskGetCommand_instances, _PlannerTaskGetCommand_initTelemetry, _Pla
 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");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class PlannerTaskGetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -39,7 +41,7 @@ class PlannerTaskGetCommand 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;
             }
@@ -56,7 +58,7 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
     }
     getTask(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -194,7 +196,7 @@ _PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTel
         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;