@pnp/cli-microsoft365 6.3.0-beta.c3dc921 → 6.3.0-beta.e46ffee

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/navigation/navigation-node-add.js

@@ -38,6 +38,7 @@ class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
         return ['url'];
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Adding navigation node...`);
@@ -51,12 +52,13 @@ class SpoNavigationNodeAddCommand extends SpoCommand_1.default {
                     accept: 'application/json;odata=nometadata',
                     'content-type': 'application/json;odata=nometadata'
                 },
+                responseType: 'json',
                 data: {
+                    AudienceIds: (_a = args.options.audienceIds) === null || _a === void 0 ? void 0 : _a.split(','),
                     Title: args.options.title,
                     Url: args.options.url,
                     IsExternal: args.options.isExternal === true
-                },
-                responseType: 'json'
+                }
             };
             try {
                 const res = yield request_1.default.post(requestOptions);
@@ -73,7 +75,8 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
         Object.assign(this.telemetryProperties, {
             isExternal: args.options.isExternal,
             location: typeof args.options.location !== 'undefined',
-            parentNodeId: typeof args.options.parentNodeId !== 'undefined'
+            parentNodeId: typeof args.options.parentNodeId !== 'undefined',
+            audienceIds: typeof args.options.audienceIds !== 'undefined'
         });
     });
 }, _SpoNavigationNodeAddCommand_initOptions = function _SpoNavigationNodeAddCommand_initOptions() {
@@ -90,6 +93,8 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
         option: '--parentNodeId [parentNodeId]'
     }, {
         option: '--isExternal'
+    }, {
+        option: '--audienceIds [audienceIds]'
     });
 }, _SpoNavigationNodeAddCommand_initValidators = function _SpoNavigationNodeAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -108,6 +113,15 @@ _SpoNavigationNodeAddCommand_instances = new WeakSet(), _SpoNavigationNodeAddCom
                 return `${args.options.location} is not a valid value for the location option. Allowed values are QuickLaunch|TopNavigationBar`;
             }
         }
+        if (args.options.audienceIds) {
+            const audienceIdsSplitted = args.options.audienceIds.split(',');
+            if (audienceIdsSplitted.length > 10) {
+                return 'The maximum amount of audienceIds per navigation node exceeded. The maximum amount of auciendeIds is 10.';
+            }
+            if (!validation_1.validation.isValidGuidArray(audienceIdsSplitted)) {
+                return 'The option audienceIds contains one or more invalid GUIDs';
+            }
+        }
         return true;
     }));
 }, _SpoNavigationNodeAddCommand_initOptionSets = function _SpoNavigationNodeAddCommand_initOptionSets() {

package/dist/m365/spo/commands/navigation/navigation-node-list.js

@@ -26,6 +26,9 @@ class SpoNavigationNodeListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists nodes from the specified site navigation';
     }
+    defaultProperties() {
+        return ['Id', 'Title', 'Url'];
+    }
     constructor() {
         super();
         _SpoNavigationNodeListCommand_instances.add(this);
@@ -40,13 +43,7 @@ class SpoNavigationNodeListCommand extends SpoCommand_1.default {
             }
             try {
                 const res = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}`);
-                logger.log(res.map(n => {
-                    return {
-                        Id: n.Id,
-                        Title: n.Title,
-                        Url: n.Url
-                    };
-                }));
+                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/navigation/navigation-node-set.js

@@ -0,0 +1,118 @@
+"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 _SpoNavigationNodeSetCommand_instances, _SpoNavigationNodeSetCommand_initTelemetry, _SpoNavigationNodeSetCommand_initTypes, _SpoNavigationNodeSetCommand_initOptions, _SpoNavigationNodeSetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoNavigationNodeSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.NAVIGATION_NODE_SET;
+    }
+    get description() {
+        return 'Adds a navigation node to the specified site navigation';
+    }
+    constructor() {
+        super();
+        _SpoNavigationNodeSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoNavigationNodeSetCommand_instances, "m", _SpoNavigationNodeSetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Setting navigation node...`);
+                }
+                const requestBody = {
+                    Title: args.options.title,
+                    IsExternal: args.options.isExternal,
+                    Url: args.options.url
+                };
+                if (args.options.audienceIds !== undefined) {
+                    requestBody.AudienceIds = args.options.audienceIds === '' ? [] : args.options.audienceIds.split(',');
+                }
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/navigation/GetNodeById(${args.options.id})`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                const response = yield request_1.default.patch(requestOptions);
+                if (response['odata.null'] === true) {
+                    throw `Navigation node does not exist.`;
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoNavigationNodeSetCommand_instances = new WeakSet(), _SpoNavigationNodeSetCommand_initTelemetry = function _SpoNavigationNodeSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            isExternal: typeof args.options.isExternal !== 'undefined',
+            audienceIds: typeof args.options.audienceIds !== 'undefined'
+        });
+    });
+}, _SpoNavigationNodeSetCommand_initTypes = function _SpoNavigationNodeSetCommand_initTypes() {
+    this.types.boolean.push('isExternal');
+}, _SpoNavigationNodeSetCommand_initOptions = function _SpoNavigationNodeSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--id <id>'
+    }, {
+        option: '--title [title]'
+    }, {
+        option: '--url [url]'
+    }, {
+        option: '--audienceIds [audienceIds]'
+    }, {
+        option: '--isExternal [isExternal]'
+    });
+}, _SpoNavigationNodeSetCommand_initValidators = function _SpoNavigationNodeSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.audienceIds === undefined && !args.options.url && args.options.isExternal === undefined && !args.options.title) {
+            return `Please specify atleast one property to update.`;
+        }
+        if (args.options.audienceIds) {
+            const audienceIdsSplitted = args.options.audienceIds.split(',');
+            if (audienceIdsSplitted.length > 10) {
+                return 'The maximum amount of audienceIds per navigation node exceeded. The maximum amount of audienceIds is 10.';
+            }
+            if (!validation_1.validation.isValidGuidArray(audienceIdsSplitted)) {
+                return `The option audienceIds contains one or more invalid GUIDs`;
+            }
+        }
+        return true;
+    }));
+};
+module.exports = new SpoNavigationNodeSetCommand();
+//# sourceMappingURL=navigation-node-set.js.map

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -17,6 +17,7 @@ var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_i
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -37,19 +38,6 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getAppInfo(args) {
         if (args.options.appId && args.options.appDisplayName) {
             return Promise.resolve({
@@ -136,7 +124,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const appInfo = yield this.getAppInfo(args);
                 let permission = yield this.addPermissions(args, appInfo);
                 if (this.roleNeedsElevation(args.options.permission)) {

package/dist/m365/spo/commands/site/site-apppermission-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionGetCommand_instances, _SpoSiteAppPermissionGetCommand_initOptions, _SpoSiteAppPermissionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -32,19 +33,6 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionGetCommand_instances, "m", _SpoSiteAppPermissionGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionGetCommand_instances, "m", _SpoSiteAppPermissionGetCommand_initValidators).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getApplicationPermission(args, siteId) {
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${siteId}/permissions/${args.options.id}`,
@@ -58,7 +46,7 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const siteId = yield this.getSpoSiteId(args);
+                const siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const permissionObject = yield this.getApplicationPermission(args, siteId);
                 const transposed = [];
                 permissionObject.grantedToIdentities.forEach((permissionEntity) => {

package/dist/m365/spo/commands/site/site-apppermission-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionListCommand_instances, _SpoSiteAppPermissionListCommand_initTelemetry, _SpoSiteAppPermissionListCommand_initOptions, _SpoSiteAppPermissionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -34,19 +35,6 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initValidators).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getFilteredPermissions(args, permissions) {
         let filterProperty = 'displayName';
         let filterValue = args.options.appDisplayName;
@@ -95,7 +83,7 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const permRes = yield this.getPermissions();
                 let permissions = permRes.value;
                 if (args.options.appId || args.options.appDisplayName) {

package/dist/m365/spo/commands/site/site-apppermission-remove.js

@@ -17,6 +17,7 @@ var _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCom
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -36,19 +37,6 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getPermissions() {
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
@@ -98,7 +86,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSiteAppPermission = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    this.siteId = yield this.getSpoSiteId(args);
+                    this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                     const permissionIdsToRemove = yield this.getPermissionIds(args);
                     const tasks = [];
                     for (const permissionId of permissionIdsToRemove) {

package/dist/m365/spo/commands/site/site-apppermission-set.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionSetCommand_instances, _SpoSiteAppPermissionSetCommand_initTelemetry, _SpoSiteAppPermissionSetCommand_initOptions, _SpoSiteAppPermissionSetCommand_initValidators, _SpoSiteAppPermissionSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -36,19 +37,6 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const siteRequestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(siteRequestOptions)
-            .then((site) => site.id);
-    }
     getFilteredPermissions(args, permissions) {
         let filterProperty = 'displayName';
         let filterValue = args.options.appDisplayName;
@@ -85,7 +73,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const sitePermissionId = yield this.getPermission(args);
                 const requestOptions = {
                     url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${sitePermissionId}`,

package/dist/m365/spo/commands/web/web-set.js

@@ -62,6 +62,9 @@ class SpoWebSetCommand extends SpoCommand_1.default {
             if (typeof args.options.footerEnabled !== 'undefined') {
                 payload.FooterEnabled = args.options.footerEnabled;
             }
+            if (typeof args.options.navAudienceTargetingEnabled !== 'undefined') {
+                payload.NavAudienceTargetingEnabled = args.options.navAudienceTargetingEnabled;
+            }
             if (typeof args.options.searchScope !== 'undefined') {
                 const searchScope = args.options.searchScope.toLowerCase();
                 payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
@@ -96,11 +99,12 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
             description: typeof args.options.description !== 'undefined',
             headerEmphasis: typeof args.options.headerEmphasis !== 'undefined',
             headerLayout: typeof args.options.headerLayout !== 'undefined',
-            megaMenuEnabled: args.options.megaMenuEnabled,
+            megaMenuEnabled: typeof args.options.megaMenuEnabled !== 'undefined',
             siteLogoUrl: typeof args.options.siteLogoUrl !== 'undefined',
             title: typeof args.options.title !== 'undefined',
-            quickLaunchEnabled: args.options.quickLaunchEnabled,
-            footerEnabled: args.options.footerEnabled,
+            quickLaunchEnabled: typeof args.options.quickLaunchEnabled !== 'undefined',
+            footerEnabled: typeof args.options.footerEnabled !== 'undefined',
+            navAudienceTargetingEnabled: typeof args.options.navAudienceTargetingEnabled !== 'undefined',
             searchScope: args.options.searchScope !== 'undefined'
         });
         this.trackUnknownOptions(this.telemetryProperties, args.options);
@@ -129,12 +133,15 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     }, {
         option: '--footerEnabled [footerEnabled]',
         autocomplete: ['true', 'false']
+    }, {
+        option: '--navAudienceTargetingEnabled [navAudienceTargetingEnabled]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--searchScope [searchScope]',
         autocomplete: SpoWebSetCommand.searchScopeOptions
     });
 }, _SpoWebSetCommand_initTypes = function _SpoWebSetCommand_initTypes() {
-    this.types.boolean.push('megaMenuEnabled', 'footerEnabled', 'quickLaunchEnabled');
+    this.types.boolean.push('megaMenuEnabled', 'footerEnabled', 'quickLaunchEnabled', 'navAudienceTargetingEnabled');
 }, _SpoWebSetCommand_initValidators = function _SpoWebSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);

package/dist/m365/spo/commands.js

@@ -167,6 +167,7 @@ exports.default = {
     NAVIGATION_NODE_ADD: `${prefix} navigation node add`,
     NAVIGATION_NODE_LIST: `${prefix} navigation node list`,
     NAVIGATION_NODE_REMOVE: `${prefix} navigation node remove`,
+    NAVIGATION_NODE_SET: `${prefix} navigation node set`,
     ORGASSETSLIBRARY_ADD: `${prefix} orgassetslibrary add`,
     ORGASSETSLIBRARY_LIST: `${prefix} orgassetslibrary list`,
     ORGASSETSLIBRARY_REMOVE: `${prefix} orgassetslibrary remove`,

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

@@ -41,14 +41,14 @@ class TeamsChatListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isAppOnlyAuth = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-            if (isAppOnlyAuth && !args.options.userId && !args.options.userName) {
+            const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+            if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
                 throw `The option 'userId' or 'userName' is required when obtaining chats using app only permissions`;
             }
-            else if (!isAppOnlyAuth && (args.options.userId || args.options.userName)) {
+            else if (!isAppOnlyAccessToken && (args.options.userId || args.options.userName)) {
                 throw `The options 'userId' or 'userName' cannot be used when obtaining chats using delegated permissions`;
             }
-            let requestUrl = `${this.resource}/v1.0/${!isAppOnlyAuth ? 'me' : `users/${args.options.userId || args.options.userName}`}/chats`;
+            let requestUrl = `${this.resource}/v1.0/${!isAppOnlyAccessToken ? 'me' : `users/${args.options.userId || args.options.userName}`}/chats`;
             if (args.options.type) {
                 requestUrl += `?$filter=chatType eq '${args.options.type}'`;
             }

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

@@ -42,19 +42,19 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isAppOnlyAuth = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-            if (isAppOnlyAuth && !args.options.userId && !args.options.userName && !args.options.email) {
+            const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+            if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName && !args.options.email) {
                 this.handleError(`The option 'userId', 'userName' or 'email' is required when retrieving meeting attendance report using app only permissions`);
             }
-            else if (!isAppOnlyAuth && (args.options.userId || args.options.userName || args.options.email)) {
+            else if (!isAppOnlyAccessToken && (args.options.userId || args.options.userName || args.options.email)) {
                 this.handleError(`The options 'userId', 'userName' and 'email' cannot be used when retrieving meeting attendance reports using delegated permissions`);
             }
             try {
                 if (this.verbose) {
-                    logger.logToStderr(`Retrieving attendance report for ${isAppOnlyAuth ? 'specific user' : 'currently logged in user'}`);
+                    logger.logToStderr(`Retrieving attendance report for ${isAppOnlyAccessToken ? 'specific user' : 'currently logged in user'}`);
                 }
                 let requestUrl = `${this.resource}/v1.0/`;
-                if (isAppOnlyAuth) {
+                if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
                     if (args.options.userId) {
                         requestUrl += args.options.userId;

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

@@ -53,23 +53,23 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isAppOnlyAuth = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-            if (isAppOnlyAuth) {
+            const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+            if (isAppOnlyAccessToken) {
                 if (!args.options.userId && !args.options.userName && !args.options.email) {
                     this.handleError(`The option 'userId', 'userName' or 'email' is required when retrieving meetings using app only permissions`);
                 }
             }
             else {
-                if (!isAppOnlyAuth && (args.options.userId || args.options.userName || args.options.email)) {
+                if (!isAppOnlyAccessToken && (args.options.userId || args.options.userName || args.options.email)) {
                     this.handleError(`The options 'userId', 'userName' and 'email' cannot be used when retrieving meetings using delegated permissions`);
                 }
             }
             if (this.verbose) {
-                logger.logToStderr(`Retrieving meeting for ${isAppOnlyAuth ? 'specific user' : 'currently logged in user'}`);
+                logger.logToStderr(`Retrieving meeting for ${isAppOnlyAccessToken ? 'specific user' : 'currently logged in user'}`);
             }
             try {
                 let requestUrl = `${this.resource}/v1.0/`;
-                if (isAppOnlyAuth) {
+                if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
                     if (args.options.userId) {
                         requestUrl += args.options.userId;

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

@@ -22,6 +22,7 @@ const commands_1 = require("../../commands");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const accessToken_1 = require("../../../../utils/accessToken");
 class TeamsMeetingListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_LIST;
@@ -42,12 +43,12 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
                 if (this.verbose) {
-                    logger.logToStderr(`Retrieving meetings for ${isAppOnlyAuth ? 'specific user' : 'currently logged in user'}`);
+                    logger.logToStderr(`Retrieving meetings for ${isAppOnlyAccessToken ? 'specific user' : 'currently logged in user'}`);
                 }
                 let requestUrl = `${this.resource}/v1.0/`;
-                if (isAppOnlyAuth) {
+                if (isAppOnlyAccessToken) {
                     if (!args.options.userId && !args.options.userName && !args.options.email) {
                         throw `The option 'userId', 'userName' or 'email' is required when retrieving meetings using app only permissions`;
                     }