@pnp/cli-microsoft365 6.3.0-beta.3f7129c → 6.3.0-beta.a991329

package/dist/Command.js

@@ -481,7 +481,18 @@ class Command {
                 if (!l) {
                     return;
                 }
-                output.push(`## ${this.getLogItemTitle(l)} (${this.getLogItemId(l)})`, os.EOL, os.EOL, `Property | Value`, os.EOL, `---------|-------`, os.EOL);
+                const title = this.getLogItemTitle(l);
+                const id = this.getLogItemId(l);
+                if (title && id) {
+                    output.push(`## ${title} (${id})`);
+                }
+                else if (title) {
+                    output.push(`## ${title}`);
+                }
+                else if (id) {
+                    output.push(`## ${id}`);
+                }
+                output.push(os.EOL, os.EOL, `Property | Value`, os.EOL, `---------|-------`, os.EOL);
                 output.push(Object.keys(l).map(k => {
                     const value = l[k];
                     let stringValue = value;

package/dist/cli/Cli.js

@@ -458,7 +458,7 @@ class Cli {
         // data so that returned objects contain only default properties specified
         // on the current command. If there is no current command or the
         // command doesn't specify default properties, return original data
-        if (options.output === 'text' || options.output === 'csv') {
+        if (this.shouldTrimOutput(options.output)) {
             const cli = Cli.getInstance();
             const currentCommand = cli.commandToExecute;
             if (arrayType === 'object' &&
@@ -753,6 +753,9 @@ class Cli {
             }
         });
     }
+    static shouldTrimOutput(output) {
+        return output === 'text' || output === 'csv';
+    }
 }
 exports.Cli = Cli;
 Cli.defaultHelpMode = 'full';

package/dist/m365/aad/commands/group/group-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupListCommand_instances, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class AadGroupListCommand extends GraphCommand_1.default {
             const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
             try {
                 const groups = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
-                if (args.options.output === 'text') {
+                if (Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     groups.forEach((group) => {
                         if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
                             group.groupType = 'Microsoft 365';

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -21,6 +21,7 @@ const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
 const xmldom_1 = require("@xmldom/xmldom");
+const Cli_1 = require("../../../../cli/Cli");
 class GraphChangelogListCommand extends AnonymousCommand_1.default {
     get name() {
         return commands_1.default.CHANGELOG_LIST;
@@ -106,14 +107,14 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
             items: []
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
-            const description = args.options.output === 'text' ?
+            const description = Cli_1.Cli.shouldTrimOutput(args.options.output) ?
                 md_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
                 category: item.getElementsByTagName('category').item(1).textContent,
                 title: item.getElementsByTagName('title').item(0).textContent,
-                description: args.options.output === 'text' ?
+                description: Cli_1.Cli.shouldTrimOutput(args.options.output) ?
                     description.length > 50 ? `${description.substring(0, 47)}...` : description :
                     description,
                 pubDate: new Date(item.getElementsByTagName('pubDate').item(0).textContent)

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -13,14 +13,14 @@ 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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
+var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators, _OneNoteNotebookListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const spo_1 = require("../../../../utils/spo");
 class OneNoteNotebookListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.NOTEBOOK_LIST;
@@ -28,61 +28,63 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
     get description() {
         return 'Retrieve a list of notebooks';
     }
+    defaultProperties() {
+        return ['createdDateTime', 'displayName', 'id'];
+    }
     constructor() {
         super();
         _OneNoteNotebookListCommand_instances.add(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptionSets).call(this);
     }
     getEndpointUrl(args) {
-        return new Promise((resolve, reject) => {
-            let endpoint = `${this.resource}/v1.0/me/onenote/notebooks`;
+        return __awaiter(this, void 0, void 0, function* () {
+            let endpoint = `${this.resource}/v1.0/`;
             if (args.options.userId) {
-                endpoint = `${this.resource}/v1.0/users/${args.options.userId}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `users/${args.options.userId}`;
             }
             else if (args.options.userName) {
-                endpoint = `${this.resource}/v1.0/users/${args.options.userName}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `users/${args.options.userName}`;
             }
             else if (args.options.groupId) {
-                endpoint = `${this.resource}/v1.0/groups/${args.options.groupId}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `groups/${args.options.groupId}`;
             }
             else if (args.options.groupName) {
-                this
-                    .getGroupId(args)
-                    .then((retrievedgroupId) => {
-                    endpoint = `${this.resource}/v1.0/groups/${retrievedgroupId}/onenote/notebooks`;
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                const groupId = yield this.getGroupId(args.options.groupName);
+                endpoint += `groups/${groupId}`;
             }
             else if (args.options.webUrl) {
-                spo_1.spo.getSpoGraphSiteId(args.options.webUrl)
-                    .then((siteId) => {
-                    endpoint = `${this.resource}/v1.0/sites/${siteId}/onenote/notebooks`;
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                const siteId = yield this.getSpoSiteId(args.options.webUrl);
+                endpoint += `sites/${siteId}`;
             }
             else {
-                return resolve(endpoint);
+                endpoint += 'me';
             }
+            endpoint += '/onenote/notebooks';
+            return endpoint;
         });
     }
-    defaultProperties() {
-        return ['createdDateTime', 'displayName', 'id'];
+    getGroupId(groupName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(groupName);
+            return group.id;
+        });
     }
-    getGroupId(args) {
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.groupName)
-            .then(group => group.id);
+    getSpoSiteId(webUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = new URL(webUrl);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const site = yield request_1.default.get(requestOptions);
+            return site.id;
+        });
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -100,7 +102,11 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
 _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            joined: args.options.joined
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined'
         });
     });
 }, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
@@ -113,14 +119,19 @@ _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListComma
         if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
-        if (args.options.userId && args.options.userName) {
-            return 'Specify either userId or userName, but not both';
-        }
-        if (args.options.groupId && args.options.groupName) {
-            return 'Specify either groupId or groupName, but not both';
+        if (args.options.webUrl) {
+            return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         }
         return true;
     }));
+}, _OneNoteNotebookListCommand_initOptionSets = function _OneNoteNotebookListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl'],
+        runsWhen: (args) => {
+            const options = [args.options.userId, args.options.userName, args.options.groupId, args.options.groupName, args.options.webUrl];
+            return options.some(item => item !== undefined);
+        }
+    });
 };
 module.exports = new OneNoteNotebookListCommand();
 //# sourceMappingURL=notebook-list.js.map

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerPlanAddCommand_instances, _PlannerPlanAddCommand_initTelemetry, _PlannerPlanAddCommand_initOptions, _PlannerPlanAddCommand_initValidators, _PlannerPlanAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const formatting_1 = require("../../../../utils/formatting");
@@ -42,23 +43,34 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const groupId = yield this.getGroupId(args);
+                const data = {
+                    title: args.options.title
+                };
+                if (args.options.rosterId) {
+                    data.container = {
+                        "url": `https://graph.microsoft.com/v1.0/planner/rosters/${args.options.rosterId}`
+                    };
+                }
+                else {
+                    const groupId = yield this.getGroupId(args);
+                    data.owner = groupId;
+                }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/planner/plans`,
                     headers: {
                         'accept': 'application/json;odata.metadata=none'
                     },
                     responseType: 'json',
-                    data: {
-                        owner: groupId,
-                        title: args.options.title
-                    }
+                    data: data
                 };
                 const newPlan = yield request_1.default.post(requestOptions);
                 const result = yield this.updatePlanDetails(args.options, newPlan);
                 logger.log(result);
             }
             catch (err) {
+                if (err.error && err.error.error.message === "You do not have the required permissions to access this item, or the item may not exist.") {
+                    throw new Command_1.CommandError("You can only add 1 plan to a Roster");
+                }
                 this.handleRejectedODataJsonPromise(err);
             }
         });
@@ -167,6 +179,8 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
         option: "--ownerGroupId [ownerGroupId]"
     }, {
         option: "--ownerGroupName [ownerGroupName]"
+    }, {
+        option: "--rosterId [rosterId]"
     }, {
         option: '--shareWithUserIds [shareWithUserIds]'
     }, {
@@ -186,7 +200,7 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
         return true;
     }));
 }, _PlannerPlanAddCommand_initOptionSets = function _PlannerPlanAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName'] });
+    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName', 'rosterId'] });
 };
 module.exports = new PlannerPlanAddCommand();
 //# sourceMappingURL=plan-add.js.map

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

@@ -79,7 +79,7 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
                 return planner_1.planner.getPlanById(id, 'minimal');
             }
             const groupId = yield this.getGroupId(args);
-            return yield planner_1.planner.getPlanByTitle(title, groupId);
+            return yield planner_1.planner.getPlanByTitle(title, groupId, 'minimal');
         });
     }
     getGroupId(args) {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTaskChecklistItemAddCommand_instances, _PlannerTaskChecklistItemAddCommand_initTelemetry, _PlannerTaskChecklistItemAddCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -61,7 +62,7 @@ class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
                     data: body
                 };
                 const result = yield request_1.default.patch(requestOptions);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(result.checklist);
                 }
                 else {

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerTaskChecklistItemListCommand_instances, _PlannerTaskChecklistItemListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -45,7 +46,7 @@ class PlannerTaskChecklistItemListCommand extends GraphCommand_1.default {
             };
             try {
                 const res = yield request_1.default.get(requestOptions);
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res.checklist);
                 }
                 else {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpSolutionGetCommand_instances, _PpSolutionGetCommand_initTelemetry, _PpSolutionGetCommand_initOptions, _PpSolutionGetCommand_initOptionSets, _PpSolutionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const powerPlatform_1 = require("../../../../utils/powerPlatform");
 const validation_1 = require("../../../../utils/validation");
@@ -46,7 +47,7 @@ class PpSolutionGetCommand extends PowerPlatformCommand_1.default {
             try {
                 const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
                 const res = yield this.getSolution(dynamicsApiUrl, args.options);
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {

package/dist/m365/pp/commands/solution/solution-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpSolutionListCommand_instances, _PpSolutionListCommand_initTelemetry, _PpSolutionListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const odata_1 = require("../../../../utils/odata");
 const powerPlatform_1 = require("../../../../utils/powerPlatform");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
@@ -44,7 +45,7 @@ class PpSolutionListCommand extends PowerPlatformCommand_1.default {
                 const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
                 const requestUrl = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
                 const res = yield odata_1.odata.getAllItems(requestUrl);
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-get.js

@@ -0,0 +1,70 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PurviewRetentionEventtypeGetCommand_instances, _PurviewRetentionEventtypeGetCommand_initOptions, _PurviewRetentionEventtypeGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+class PurviewRetentionEventtypeGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONEVENTTYPE_GET;
+    }
+    get description() {
+        return 'Retrieve the specified retention event type';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionEventtypeGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventtypeGetCommand_instances, "m", _PurviewRetentionEventtypeGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventtypeGetCommand_instances, "m", _PurviewRetentionEventtypeGetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving retention event type with id ${args.options.id}`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggerTypes/retentionEventTypes/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PurviewRetentionEventtypeGetCommand_instances = new WeakSet(), _PurviewRetentionEventtypeGetCommand_initOptions = function _PurviewRetentionEventtypeGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    });
+}, _PurviewRetentionEventtypeGetCommand_initValidators = function _PurviewRetentionEventtypeGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `'${args.options.id}' is not a valid GUID.`;
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewRetentionEventtypeGetCommand();
+//# sourceMappingURL=retentioneventtype-get.js.map

package/dist/m365/purview/commands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
+    RETENTIONEVENTTYPE_GET: `${prefix} retentioneventtype get`,
     RETENTIONLABEL_ADD: `${prefix} retentionlabel add`,
     RETENTIONLABEL_GET: `${prefix} retentionlabel get`,
     RETENTIONLABEL_LIST: `${prefix} retentionlabel list`,

package/dist/m365/spfx/commands/project/WebApiPermissionRequests.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=WebApiPermissionRequests.js.map

package/dist/m365/spfx/commands/project/project-permissions-grant.js

@@ -0,0 +1,81 @@
+"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 path = require("path");
+const fs = require("fs");
+const Command_1 = require("../../../../Command");
+const commands_1 = require("../../commands");
+const base_project_command_1 = require("./base-project-command");
+const SpoServicePrincipalGrantAddCommand = require("../../../spo/commands/serviceprincipal/serviceprincipal-grant-add");
+const Cli_1 = require("../../../../cli/Cli");
+class SpfxProjectPermissionSGrantCommand extends base_project_command_1.BaseProjectCommand {
+    get name() {
+        return commands_1.default.PROJECT_PERMISSIONS_GRANT;
+    }
+    get description() {
+        return 'Grant API permissions defined in the current SPFx project';
+    }
+    constructor() {
+        super();
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.projectRootPath = this.getProjectRoot(process.cwd());
+            if (this.projectRootPath === null) {
+                throw new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectPermissionSGrantCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            }
+            if (this.debug) {
+                logger.logToStderr(`Granting API permissions defined in the current SPFx project`);
+            }
+            try {
+                const webApiPermissionsRequest = this.getWebApiPermissionRequest(path.join(this.projectRootPath, 'config', 'package-solution.json'));
+                for (const permission of webApiPermissionsRequest) {
+                    const options = {
+                        resource: permission.resource,
+                        scope: permission.scope,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    let output = null;
+                    try {
+                        output = yield Cli_1.Cli.executeCommandWithOutput(SpoServicePrincipalGrantAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    }
+                    catch (err) {
+                        if (err.error && err.error.message.indexOf('already exists') > -1) {
+                            this.warn(logger, err.error.message);
+                            continue;
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
+                    const getGrantOutput = JSON.parse(output.stdout);
+                    logger.log(getGrantOutput);
+                }
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
+        });
+    }
+    getWebApiPermissionRequest(filePath) {
+        if (!fs.existsSync(filePath)) {
+            throw (`The package-solution.json file could not be found`);
+        }
+        const existingContent = fs.readFileSync(filePath, 'utf-8');
+        const solutionContent = JSON.parse(existingContent);
+        return solutionContent.solution.webApiPermissionRequests;
+    }
+}
+SpfxProjectPermissionSGrantCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
+module.exports = new SpfxProjectPermissionSGrantCommand();
+//# sourceMappingURL=project-permissions-grant.js.map

package/dist/m365/spfx/commands.js

@@ -5,8 +5,9 @@ exports.default = {
     DOCTOR: `${prefix} doctor`,
     PACKAGE_GENERATE: `${prefix} package generate`,
     PROJECT_DOCTOR: `${prefix} project doctor`,
-    PROJECT_UPGRADE: `${prefix} project upgrade`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
-    PROJECT_RENAME: `${prefix} project rename`
+    PROJECT_PERMISSIONS_GRANT: `${prefix} project permissions grant`,
+    PROJECT_RENAME: `${prefix} project rename`,
+    PROJECT_UPGRADE: `${prefix} project upgrade`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spo/commands/app/app-add.js

@@ -17,6 +17,7 @@ var _SpoAppAddCommand_instances, _SpoAppAddCommand_initTelemetry, _SpoAppAddComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
@@ -58,7 +59,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(json);
                 }
                 else {

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileSharingInfoGetCommand_instances, _SpoFileSharingInfoGetCommand_initTelemetry, _SpoFileSharingInfoGetCommand_initOptions, _SpoFileSharingInfoGetCommand_initValidators, _SpoFileSharingInfoGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
@@ -60,7 +61,7 @@ class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
                 // typically, we don't do this, but in this case, we need to due to
                 // the complexity of the retrieved object and the fact that we can't
                 // use the generic way of simplifying the output
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileSharingLinkListCommand_instances, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
@@ -51,7 +52,7 @@ class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
                     url += ` and Link/Scope eq '${args.options.scope}'`;
                 }
                 const sharingLinks = yield odata_1.odata.getAllItems(url);
-                if (!args.options.output || args.options.output === 'json' || args.options.output === 'md') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(sharingLinks);
                 }
                 else {

package/dist/m365/spo/commands/group/group-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupListCommand_instances, _SpoGroupListCommand_initTelemetry, _SpoGroupListCommand_initOptions, _SpoGroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
@@ -73,7 +74,7 @@ class SpoGroupListCommand extends SpoCommand_1.default {
             };
             const groupProperties = yield request_1.default.get(requestOptions);
             logger.log(groupProperties);
-            if (!options.output || options.output === 'json') {
+            if (!options.output || !Cli_1.Cli.shouldTrimOutput(options.output)) {
                 logger.log(groupProperties);
             }
             else {

package/dist/m365/spo/commands/hubsite/hubsite-get.js

@@ -45,7 +45,7 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
                 if (args.options.includeAssociatedSites && (args.options.output && args.options.output !== 'json')) {
                     throw 'includeAssociatedSites option is only allowed with json output mode';
                 }
-                if (args.options.includeAssociatedSites === true && args.options.output && args.options.output === 'json') {
+                if (args.options.includeAssociatedSites === true && args.options.output && !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                     const associatedSitesCommandOutput = yield this.getAssociatedSites(spoAdminUrl, hubSite.SiteId, logger, args);
                     const associatedSites = JSON.parse(associatedSitesCommandOutput.stdout);

package/dist/m365/spo/commands/listitem/listitem-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemListCommand_instances, _SpoListItemListCommand_initTelemetry, _SpoListItemListCommand_initOptions, _SpoListItemListCommand_initValidators, _SpoListItemListCommand_initOptionSets, _SpoListItemListCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
@@ -53,7 +54,7 @@ class SpoListItemListCommand extends SpoCommand_1.default {
             }
             let formDigestValue = '';
             const fieldsArray = args.options.fields ? args.options.fields.split(",")
-                : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
+                : (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) ? ["Title", "Id"] : [];
             const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
             const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
             const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);

package/dist/m365/spo/commands/page/page-column-get.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class SpoPageColumnGetCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = args.options.output === 'json';
+                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                     const columns = sections[0].columns.filter(col => col.order === args.options.column);
                     if (columns.length) {
                         const column = Page_1.Page.getColumnsInformation(columns[0], isJSONOutput);

package/dist/m365/spo/commands/page/page-column-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageColumnListCommand_instances, _SpoPageColumnListCommand_initOptions, _SpoPageColumnListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class SpoPageColumnListCommand extends SpoCommand_1.default {
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
                 if (sections.length) {
-                    const isJSONOutput = args.options.output === 'json';
+                    const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                     logger.log(sections[0].columns.map(c => {
                         const column = Page_1.Page.getColumnsInformation(c, isJSONOutput);
                         column.controls = c.controls.length;

package/dist/m365/spo/commands/page/page-section-get.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionGetCommand_instances, _SpoPageSectionGetCommand_initOptions, _SpoPageSectionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,7 +39,7 @@ class SpoPageSectionGetCommand extends SpoCommand_1.default {
                 const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections
                     .filter(section => section.order === args.options.section);
-                const isJSONOutput = args.options.output === 'json';
+                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                 if (sections.length) {
                     logger.log(Page_1.Page.getSectionInformation(sections[0], isJSONOutput));
                 }

package/dist/m365/spo/commands/page/page-section-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSectionListCommand_instances, _SpoPageSectionListCommand_initOptions, _SpoPageSectionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -37,7 +38,7 @@ class SpoPageSectionListCommand extends SpoCommand_1.default {
             try {
                 const clientSidePage = yield Page_1.Page.getPage(args.options.pageName, args.options.webUrl, logger, this.debug, this.verbose);
                 const sections = clientSidePage.sections;
-                const isJSONOutput = args.options.output === 'json';
+                const isJSONOutput = !Cli_1.Cli.shouldTrimOutput(args.options.output);
                 if (sections.length) {
                     const output = sections.map(section => Page_1.Page.getSectionInformation(section, isJSONOutput));
                     if (isJSONOutput) {

package/dist/m365/spo/commands/spo-search.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchCommand_initOptions, _SpoSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
+const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
 const formatting_1 = require("../../../utils/formatting");
 const spo_1 = require("../../../utils/spo");
@@ -137,7 +138,7 @@ class SpoSearchCommand extends SpoCommand_1.default {
         else {
             logger.log(this.getParsedOutput(args, results));
         }
-        if (!args.options.output || args.options.output === 'text') {
+        if (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) {
             logger.log("# Rows: " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
             logger.log("# Rows (Including duplicates): " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
             logger.log("Elapsed Time: " + this.getElapsedTime(results));

package/dist/m365/spo/commands/term/term-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoTermListCommand_instances, _SpoTermListCommand_initTelemetry, _SpoTermListCommand_initOptions, _SpoTermListCommand_initValidators, _SpoTermListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -62,7 +63,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
                         }
                     }
                 }
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(terms);
                 }
                 else if (!args.options.includeChildTerms) {

package/dist/m365/spo/commands/userprofile/userprofile-get.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
@@ -47,8 +48,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
                     responseType: 'json'
                 };
                 const res = yield request_1.default.get(requestOptions);
-                if (!args.options.output ||
-                    args.options.output === 'text') {
+                if (!args.options.output || Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     res.UserProfileProperties = JSON.stringify(res.UserProfileProperties);
                 }
                 logger.log(res);

package/dist/m365/teams/commands/meeting/meeting-list.js

@@ -79,7 +79,7 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
                 }
                 const res = yield odata_1.odata.getAllItems(requestUrl);
                 const resFiltered = res.filter(y => y.isOnlineMeeting);
-                if (!args.options.output || args.options.output === 'json') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(resFiltered);
                 }
                 else {

package/dist/m365/teams/commands/team/team-app-list.js

@@ -47,7 +47,7 @@ class TeamsTeamAppListCommand extends GraphCommand_1.default {
                 }
                 const teamId = yield this.getTeamId(args);
                 const res = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/teams/${teamId}/installedApps?$expand=teamsApp,teamsAppDefinition`);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {

package/dist/m365/teams/commands/user/user-app-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
@@ -47,7 +48,7 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
                     const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
                     i.appId = appId;
                 });
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(items);
                 }
                 else {

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoTaskGetCommand_instances, _TodoTaskGetCommand_initTelemetry, _TodoTaskGetCommand_initOptions, _TodoTaskGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -67,7 +68,7 @@ class TodoTaskGetCommand extends GraphCommand_1.default {
                     responseType: 'json'
                 };
                 const item = yield request_1.default.get(requestOptions);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(item);
                 }
                 else {

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -62,7 +63,7 @@ class TodoTaskListCommand extends GraphCommand_1.default {
                 const listId = yield this.getTodoListId(args);
                 const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
                 const items = yield odata_1.odata.getAllItems(endpoint);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(items);
                 }
                 else {

package/dist/m365/yammer/commands/yammer-search.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _YammerSearchCommand_instances, _YammerSearchCommand_initTelemetry, _YammerSearchCommand_initOptions, _YammerSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
 const formatting_1 = require("../../../utils/formatting");
 const YammerCommand_1 = require("../../base/YammerCommand");
@@ -129,7 +130,7 @@ class YammerSearchCommand extends YammerCommand_1.default {
             this.users = [];
             try {
                 yield this.getAllItems(logger, args, 1);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log({
                         summary: this.summary,
                         messages: this.messages,

package/dist/utils/planner.js

@@ -41,17 +41,17 @@ exports.planner = {
      * Get all Planner plans for a specific group.
      * @param groupId Group ID.
      */
-    getPlansByGroupId(groupId) {
-        return odata_1.odata.getAllItems(`${graphResource}/v1.0/groups/${groupId}/planner/plans`, 'none');
+    getPlansByGroupId(groupId, metadata = 'none') {
+        return odata_1.odata.getAllItems(`${graphResource}/v1.0/groups/${groupId}/planner/plans`, metadata);
     },
     /**
      * Get Planner plan by title in a specific group.
      * @param title Title of the Planner plan. Case insensitive.
      * @param groupId Owner group ID .
      */
-    getPlanByTitle(title, groupId) {
+    getPlanByTitle(title, groupId, metadata = 'none') {
         return __awaiter(this, void 0, void 0, function* () {
-            const plans = yield this.getPlansByGroupId(groupId);
+            const plans = yield this.getPlansByGroupId(groupId, metadata);
             const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === title.toLowerCase());
             if (!filteredPlans.length) {
                 throw Error(`The specified plan '${title}' does not exist.`);

package/docs/docs/cmd/planner/plan/plan-add.md

@@ -14,10 +14,13 @@ m365 planner plan add [options]
 : Title of the plan to add.
 
 `--ownerGroupId [ownerGroupId]`
-: ID of the Group that owns the plan. A valid group must exist before this option can be set. Specify either `ownerGroupId` or `ownerGroupName` but not both.
+: ID of the Group that owns the plan. A valid group must exist before this option can be set. Specify either `ownerGroupId`, `ownerGroupName` or `rosterId`.
 
 `--ownerGroupName [ownerGroupName]`
-: Name of the Group that owns the plan. A valid group must exist before this option can be set. Specify either `ownerGroupId` or `ownerGroupName` but not both.
+: Name of the Group that owns the plan. A valid group must exist before this option can be set. Specify either `ownerGroupId`, `ownerGroupName` or `rosterId`.
+
+`--rosterId [rosterId]`
+: ID of the Planner Roster. Specify either `ownerGroupId`, `ownerGroupName` or `rosterId`.
 
 `--shareWithUserIds [shareWithUserIds]`
 : The comma-separated IDs of the users with whom you want to share the plan. Specify either `shareWithUserIds` or `shareWithUserNames` but not both.
@@ -29,23 +32,31 @@ m365 planner plan add [options]
 
 ## Remarks
 
-Related to the options `--shareWithUserIds` and `--shareWithUserNames`. If you are leveraging Microsoft 365 groups, use the `aad o365group user` commands to manage group membership to share the [group's](https://pnp.github.io/cli-microsoft365/cmd/aad/o365group/o365group-user-add/) plan. You can also add existing members of the group to this collection though it is not required for them to access the plan owned by the group.
+- Related to the options `--shareWithUserIds` and `--shareWithUserNames`. If you are leveraging Microsoft 365 groups, use the `aad o365group user` commands to manage group membership to share the [group's](https://pnp.github.io/cli-microsoft365/cmd/aad/o365group/o365group-user-add/) plan. You can also add existing members of the group to this collection though it is not required for them to access the plan owned by the group.
+
+- Hint: Unlike for groups, a Planner Roster can contain only 1 plan.
 
 ## Examples
 
-Adds a Microsoft Planner plan with the name _My Planner Plan_ for Group _233e43d0-dc6a-482e-9b4e-0de7a7bce9b4_
+Adds a Microsoft Planner plan with a Group by id
 
 ```sh
 m365 planner plan add --title 'My Planner Plan' --ownerGroupId '233e43d0-dc6a-482e-9b4e-0de7a7bce9b4'
 ```
 
-Adds a Microsoft Planner plan with the name _My Planner Plan_ for Group _My Planner Group_
+Adds a Microsoft Planner plan with with a Group by name
 
 ```sh
 m365 planner plan add --title 'My Planner Plan' --ownerGroupName 'My Planner Group'
 ```
 
-Adds a Microsoft Planner plan with the name _My Planner Plan_ for Group _My Planner Group_ and share it with the users _Allan.Carroll@contoso.com_ and _Ida.Stevens@contoso.com_
+Adds a Microsoft Planner plan with a Roster by id
+
+```sh
+m365 planner plan add --title 'My Planner Plan' --rosterId 'tYqYlNd6eECmsNhN_fcq85cAGAnd'
+```
+
+Adds a Microsoft Planner plan with with a Group by name and share it with the given users
 
 ```sh
 m365 planner plan add --title 'My Planner Plan' --ownerGroupName 'My Planner Group' --shareWithUserNames 'Allan.Carroll@contoso.com,Ida.Stevens@contoso.com'

package/docs/docs/cmd/purview/retentioneventtype/retentioneventtype-get.md

@@ -0,0 +1,100 @@
+# purview retentioneventtype get
+
+Get a retention event type
+
+## Usage
+
+```sh
+m365 purview retentioneventtype get [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: The Id of the retention event type.
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Get a retention event type by id
+
+```sh
+m365 purview retentioneventtype get --id c37d695e-d581-4ae9-82a0-9364eba4291e
+```
+
+## Remarks
+
+!!! attention
+    This command is based on an API that is currently in preview and is subject to change once the API reached general availability.
+
+## More information
+
+This command is part of a series of commands that have to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
+
+[Read more on event-based retention here](https://learn.microsoft.com/en-us/microsoft-365/compliance/event-driven-retention?view=o365-worldwide)
+
+## Response
+
+=== "JSON"
+
+    ```json
+    {
+      "displayName": "Test retention event type",
+      "description": "Description for the retention event type",
+      "createdDateTime": "2023-01-29T09:30:42Z",
+      "lastModifiedDateTime": "2023-01-29T09:30:42Z",
+      "id": "c37d695e-d581-4ae9-82a0-9364eba4291e",
+      "createdBy": {
+        "user": {
+          "id": null,
+          "displayName": "John Doe"
+        }
+      },
+      "lastModifiedBy": {
+        "user": {
+          "id": null,
+          "displayName": "John Doe"
+        }
+      }
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    createdBy           : {"user":{"id":null,"displayName":"John Doe"}}
+    createdDateTime     : 2023-01-29T09:30:42Z
+    description         : Description for the retention event type
+    displayName         : Test retention event type
+    id                  : c37d695e-d581-4ae9-82a0-9364eba4291e
+    lastModifiedBy      : {"user":{"id":null,"displayName":"John Doe"}}
+    lastModifiedDateTime: 2023-01-29T09:30:42Z
+    ```
+
+=== "CSV"
+
+    ```csv
+    displayName,description,createdDateTime,lastModifiedDateTime,id,createdBy,lastModifiedBy
+    Test retention event type,Description for the retention event type,2023-01-29T09:30:42Z,2023-01-29T09:30:42Z,c37d695e-d581-4ae9-82a0-9364eba4291e,"{""user"":{""id"":null,""displayName"":""John Doe""}}","{""user"":{""id"":null,""displayName"":""John Doe""}}"
+    ```
+
+=== "Markdown"
+
+    ```md
+    # purview retentioneventtype get --id "c37d695e-d581-4ae9-82a0-9364eba4291e"
+
+    Date: 1/29/2023
+
+    ## Test retention event type (c37d695e-d581-4ae9-82a0-9364eba4291e)
+
+    Property | Value
+    ---------|-------
+    displayName | Test retention event type
+    description | Description for the retention event type
+    createdDateTime | 2023-01-29T09:30:42Z
+    lastModifiedDateTime | 2023-01-29T09:30:42Z
+    id | c37d695e-d581-4ae9-82a0-9364eba4291e
+    createdBy | {"user":{"id":null,"displayName":"John Doe"}}
+    lastModifiedBy | {"user":{"id":null,"displayName":"John Doe"}}
+    ```

package/docs/docs/cmd/spfx/project/project-permissions-grant.md

@@ -0,0 +1,65 @@
+# spfx project permissions grant
+
+Grant API permissions defined in the current SPFx project
+
+## Usage
+
+```sh
+m365 spfx project permissions grant [options]
+```
+
+## Options
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+!!! important
+    Run this command in the folder where the project is located from where you want to grant the permissions.
+
+This command grant the permissions defined in: _package-solution.json_.
+
+## Examples
+
+Grant API permissions requested in the current SPFx project
+
+```sh
+m365 spfx project permissions grant
+```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    {
+      "ClientId": "6004a642-185c-479a-992a-15d1c23e2229",
+      "ConsentType": "AllPrincipals",
+      "IsDomainIsolated": false,
+      "ObjectId": "QqYEYFwYmkeZKhXRwj4iKRcAa6TiIbFNvGnKY1dqONY",
+      "PackageName": null,
+      "Resource": "Microsoft Graph",
+      "ResourceId": "a46b0017-21e2-4db1-bc69-ca63576a38d6",
+      "Scope": "Mail.Read"
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    ClientId        : 6004a642-185c-479a-992a-15d1c23e2229
+    ConsentType     : AllPrincipals
+    IsDomainIsolated: false
+    ObjectId        : QqYEYFwYmkeZKhXRwj4iKRcAa6TiIbFNvGnKY1dqONY
+    PackageName     : null
+    Resource        : Microsoft Graph
+    ResourceId      : a46b0017-21e2-4db1-bc69-ca63576a38d6
+    Scope           : Mail.Read
+    ```
+
+=== "CSV"
+
+    ```csv
+    ClientId,ConsentType,IsDomainIsolated,ObjectId,PackageName,Resource,ResourceId,Scope
+    6004a642-185c-479a-992a-15d1c23e2229,AllPrincipals,,QqYEYFwYmkeZKhXRwj4iKRcAa6TiIbFNvGnKY1dqONY,,Microsoft Graph,a46b0017-21e2-4db1-bc69-ca63576a38d6,Mail.Read
+    ```

package/docs/docs/cmd/spo/navigation/navigation-node-add.md

@@ -35,7 +35,7 @@ m365 spo navigation node add [options]
 
 ## Remarks
 
-In order to use option `audienceIds`, make sure that audience targeted navigation is enabled using command [spo web set](../web/web-set.md).
+To enable/disable audience targeting for the navigation bar, use the [`spo web set`](../web/web-set.md) command.
 
 ## Examples
 

package/docs/docs/cmd/spo/navigation/navigation-node-set.md

@@ -32,7 +32,7 @@ m365 spo navigation node set [options]
 
 ## Remarks
 
-To enable/disable audience targeting for the nsavigation bar, use command [`spo web set`](../web/web-set.md).
+To enable/disable audience targeting for the navigation bar, use the [`spo web set`](../web/web-set.md) command.
 
 ## Examples
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.3.0-beta.3f7129c",
+  "version": "6.3.0-beta.a991329",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",