@pnp/cli-microsoft365 5.3.0-beta.d2ec1f4 → 5.3.0-beta.ebb13d0

package/dist/m365/app/commands/app-open.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../cli");
+const validation_1 = require("../../../utils/validation");
+const settingsNames_1 = require("../../../settingsNames");
+const AppCommand_1 = require("../../base/AppCommand");
+const commands_1 = require("../commands");
+class AppOpenCommand extends AppCommand_1.default {
+    get name() {
+        return commands_1.default.OPEN;
+    }
+    get description() {
+        return 'Opens Azure AD app in the Azure AD portal';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.appId = typeof args.options.appId !== 'undefined';
+        telemetryProps.preview = typeof args.options.preview !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this.logOrOpenUrl(args, logger)
+            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    }
+    logOrOpenUrl(args, logger) {
+        return new Promise((resolve, reject) => {
+            const previewPrefix = args.options.preview === true ? "preview." : "";
+            const url = `https://${previewPrefix}portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/${this.appId}/isMSAApp/`;
+            if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
+                logger.log(`Use a web browser to open the page ${url}`);
+                return resolve();
+            }
+            logger.log(`Opening the following page in your browser: ${url}`);
+            // 'open' is required here so we can lazy load the dependency.
+            // _open is never set before hitting this line, but this check
+            // is implemented so that we can stub it when testing.
+            /* c8 ignore next 3 */
+            if (!this._open) {
+                this._open = require('open');
+            }
+            this._open(url).then(() => {
+                resolve();
+            }, (error) => {
+                reject(error);
+            });
+        });
+    }
+    options() {
+        const options = [
+            { option: '--appId [appId]' },
+            { option: '--preview' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AppOpenCommand();
+//# sourceMappingURL=app-open.js.map

package/dist/m365/app/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'app';
 exports.default = {
     GET: `${prefix} get`,
+    OPEN: `${prefix} open`,
     PERMISSION_LIST: `${prefix} permission list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/base/PowerBICommand.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../Command");
+class PowerBICommand extends Command_1.default {
+    get resource() {
+        return 'https://api.powerbi.com';
+    }
+}
+exports.default = PowerBICommand;
+//# sourceMappingURL=PowerBICommand.js.map

package/dist/m365/file/commands/file-list.js

@@ -156,7 +156,7 @@ class FileListCommand extends GraphCommand_1.default {
             .all(folderIds.map((folderId) => 
         // get items from folder. Because we can't filter out folders here
         // we need to get all items from the folder and filter them out later
-        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`, logger)))
+        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
             .then(res => {
             // flatten data from all promises
             files = files.concat(...res);

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

@@ -27,7 +27,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
             .getFolderId(args)
             .then((folderId) => {
             const url = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';
-            return utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`, logger);
+            return utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
         })
             .then((messages) => {
             logger.log(messages);

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

@@ -24,7 +24,7 @@ class OutlookRoomListCommand extends GraphCommand_1.default {
             endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
         }
         utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then((rooms) => {
             logger.log(rooms);
             cb();

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

@@ -15,7 +15,7 @@ class OutlookRoomListListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`, logger)
+            .getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`)
             .then((roomLists) => {
             logger.log(roomLists);
             cb();

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerBucketAddCommand extends GraphCommand_1.default {
@@ -24,6 +26,10 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         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) => {
@@ -52,22 +58,8 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         }
         return this
             .getGroupId(args)
-            .then((groupId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        }).then((response) => {
-            const plan = response.value.find(val => val.title === args.options.planName);
-            if (!plan) {
-                return Promise.reject(`The specified plan does not exist`);
-            }
-            return Promise.resolve(plan.id);
-        });
+            .then(groupId => planner_1.planner.getPlanByName(args.options.planName, groupId))
+            .then(plan => plan.id);
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {

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

@@ -0,0 +1,186 @@
+"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 utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const Auth_1 = require("../../../../Auth");
+const planner_1 = require("../../../../utils/planner");
+class PlannerBucketGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.BUCKET_GET;
+    }
+    get description() {
+        return 'Gets the Microsoft Planner bucket in a plan';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        telemetryProps.planId = typeof args.options.planId !== 'undefined';
+        telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
+        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
+        return telemetryProps;
+    }
+    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));
+    }
+    getBucketId(args) {
+        const { id, name } = args.options;
+        if (id) {
+            return Promise.resolve(id);
+        }
+        return this
+            .getPlanId(args)
+            .then((planId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then(buckets => {
+            const filteredBuckets = buckets.value.filter(b => name.toLowerCase() === b.name.toLowerCase());
+            if (!filteredBuckets.length) {
+                return Promise.reject(`The specified bucket ${name} does not exist`);
+            }
+            if (filteredBuckets.length > 1) {
+                return Promise.reject(`Multiple buckets with name ${name} found: ${filteredBuckets.map(x => x.id)}`);
+            }
+            return Promise.resolve(filteredBuckets[0].id.toString());
+        });
+    }
+    getPlanId(args) {
+        const { planId, planName } = args.options;
+        if (planId) {
+            return Promise.resolve(planId);
+        }
+        return this
+            .getGroupId(args)
+            .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
+            .then(plan => plan.id);
+    }
+    getBucketById(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/buckets/${id}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+    }
+    getGroupId(args) {
+        const { ownerGroupId, ownerGroupName } = args.options;
+        if (ownerGroupId) {
+            return Promise.resolve(ownerGroupId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(ownerGroupName)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            if (!response.value.length) {
+                return Promise.reject(`The specified owner group ${ownerGroupName} does not exist`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple owner groups with name ${ownerGroupName} found: ${response.value.map(x => x.id)}`);
+            }
+            return Promise.resolve(response.value[0].id);
+        });
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id [id]'
+            },
+            {
+                option: '--name [name]'
+            },
+            {
+                option: '--planId [planId]'
+            },
+            {
+                option: '--planName [planName]'
+            },
+            {
+                option: '--ownerGroupId [ownerGroupId]'
+            },
+            {
+                option: '--ownerGroupName [ownerGroupName]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.id) {
+            if (args.options.planId || args.options.planName || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planName, 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.planName) {
+                return 'Specify either planId or planName when using name';
+            }
+            if (args.options.planId && args.options.planName) {
+                return 'Specify either planId or planName when using name but not both';
+            }
+            if (args.options.planName) {
+                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
+                    return 'Specify either ownerGroupId or ownerGroupName when using planName';
+                }
+                if (args.options.ownerGroupId && args.options.ownerGroupName) {
+                    return 'Specify either ownerGroupId or ownerGroupName when using planName 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.planId) {
+                if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                    return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
+                }
+            }
+        }
+        if (!args.options.id && !args.options.name) {
+            return 'Please specify id or name';
+        }
+        return true;
+    }
+}
+module.exports = new PlannerBucketGetCommand();
+//# sourceMappingURL=bucket-get.js.map

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const request_1 = require("../../../../request");
+const planner_1 = require("../../../../utils/planner");
+const Auth_1 = require("../../../../Auth");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerBucketListCommand extends GraphCommand_1.default {
@@ -23,9 +25,13 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         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) => utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`, logger))
+            .then((planId) => utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`))
             .then((buckets) => {
             logger.log(buckets);
             cb();
@@ -37,23 +43,8 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         }
         return this
             .getGroupId(args)
-            .then((groupId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then(response => {
-            const plan = response.value.find(val => val.title === args.options.planName);
-            if (!plan) {
-                return Promise.reject(`The specified plan does not exist`);
-            }
-            return Promise.resolve(plan.id);
-        });
+            .then(groupId => planner_1.planner.getPlanByName(args.options.planName, groupId))
+            .then(plan => plan.id);
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {

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

@@ -5,6 +5,8 @@ const utils_1 = require("../../../../utils");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const planner_1 = require("../../../../utils/planner");
+const Auth_1 = require("../../../../Auth");
 class PlannerBucketRemoveCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.BUCKET_REMOVE;
@@ -24,6 +26,10 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+            this.handleError('This command does not support application permissions.', logger, cb);
+            return;
+        }
         const removeBucket = () => {
             this
                 .getBucket(args)
@@ -100,26 +106,8 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
         }
         return this
             .getGroupId(args)
-            .then(groupId => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/plans?$filter=owner eq '${groupId}'`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then(plans => {
-            const filteredPlans = plans.value.filter(p => p.title.toLowerCase() === planName.toLowerCase());
-            if (!filteredPlans.length) {
-                return Promise.reject(`The specified plan ${planName} does not exist`);
-            }
-            if (filteredPlans.length > 1) {
-                return Promise.reject(`Multiple plans with name ${planName} found: ${filteredPlans.map(x => x.id)}`);
-            }
-            return Promise.resolve(filteredPlans[0].id);
-        });
+            .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
+            .then(plan => plan.id);
     }
     getGroupId(args) {
         const { ownerGroupId, ownerGroupName } = args.options;

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const planner_1 = require("../../../../utils/planner");
 const commands_1 = require("../../commands");
 class PlannerBucketSetCommand extends GraphCommand_1.default {
     get name() {
@@ -24,6 +26,10 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     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
             .getBucket(args)
             .then(bucket => {
@@ -88,26 +94,8 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         }
         return this
             .getGroupId(args)
-            .then(groupId => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/plans?$filter=owner eq '${groupId}'`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then(plans => {
-            const filteredPlans = plans.value.filter(p => p.title.toLowerCase() === planName.toLowerCase());
-            if (filteredPlans.length === 0) {
-                return Promise.reject(`The specified plan ${planName} does not exist`);
-            }
-            if (filteredPlans.length > 1) {
-                return Promise.reject(`Multiple plans with name ${planName} found: ${filteredPlans.map(x => x.id)}`);
-            }
-            return Promise.resolve(filteredPlans[0].id);
-        });
+            .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
+            .then(plan => plan.id);
     }
     getGroupId(args) {
         const { ownerGroupId, ownerGroupName } = args.options;

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

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerPlanAddCommand extends GraphCommand_1.default {
@@ -21,6 +22,10 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         return ['id', 'title', 'createdDateTime', 'owner'];
     }
     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
             .getGroupId(args)
             .then((groupId) => {

package/dist/m365/planner/commands/plan/plan-details-get.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerPlanDetailsGetCommand extends GraphCommand_1.default {
@@ -24,11 +26,15 @@ class PlannerPlanDetailsGetCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     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
             .getGroupId(args)
             .then((groupId) => {
             this.groupId = groupId;
-            return this.getPlanId(args, logger);
+            return this.getPlanId(args);
         })
             .then((planId) => {
             args.options.planId = planId;
@@ -66,22 +72,13 @@ class PlannerPlanDetailsGetCommand extends GraphCommand_1.default {
             return Promise.resolve(groupItem.id);
         });
     }
-    getPlanId(args, logger) {
+    getPlanId(args) {
         if (args.options.planId) {
             return Promise.resolve(args.options.planId);
         }
-        return utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groups/${this.groupId}/planner/plans`, logger)
-            .then((plans) => {
-            const plansMatchingName = plans.filter((plan) => plan.title === args.options.planTitle);
-            if (plansMatchingName && plansMatchingName.length > 0) {
-                if (plansMatchingName.length > 1) {
-                    return Promise.reject(`Multiple plans with name ${args.options.planTitle} found: ${plansMatchingName.map(x => x.id)}`);
-                }
-                return Promise.resolve(plansMatchingName[0].id);
-            }
-            return Promise.reject(`The specified plan title does not exist`);
-        });
+        return planner_1.planner
+            .getPlanByName(args.options.planTitle, this.groupId)
+            .then(plan => plan.id);
     }
     getPlanDetails(args) {
         const requestOptions = {

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const request_1 = require("../../../../request");
+const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const Auth_1 = require("../../../../Auth");
 class PlannerPlanGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_GET;
@@ -23,9 +25,13 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         return ['id', 'title', 'createdDateTime', 'owner', '@odata.etag'];
     }
     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;
+        }
         if (args.options.id) {
-            this
-                .getPlan(args)
+            planner_1.planner
+                .getPlanById(args.options.id)
                 .then((res) => {
                 logger.log(res);
                 cb();
@@ -34,11 +40,10 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         else {
             this
                 .getGroupId(args)
-                .then((groupId) => utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${groupId}/planner/plans`, logger, 'minimal'))
-                .then((plans) => {
-                const filteredPlan = plans.filter((plan) => plan.title === args.options.title);
-                if (filteredPlan && filteredPlan.length > 0) {
-                    logger.log(filteredPlan);
+                .then(groupId => planner_1.planner.getPlanByName(args.options.title, groupId))
+                .then((plan) => {
+                if (plan) {
+                    logger.log(plan);
                 }
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
@@ -65,16 +70,6 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
             return Promise.resolve(group.id);
         });
     }
-    getPlan(args) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/plans/${args.options.id}`,
-            headers: {
-                'accept': 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
-    }
     options() {
         const options = [
             {