@pnp/cli-microsoft365 6.10.0-beta.f43fa4d → 6.10.0

package/dist/m365/planner/commands/roster/roster-member-add.js

@@ -19,8 +19,7 @@ const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
-const Cli_1 = require("../../../../cli/Cli");
+const aadUser_1 = require("../../../../utils/aadUser");
 class PlannerRosterMemberAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.ROSTER_MEMBER_ADD;
@@ -69,18 +68,8 @@ class PlannerRosterMemberAddCommand extends GraphCommand_1.default {
             if (args.options.userId) {
                 return args.options.userId;
             }
-            const aadUserGetCommandoptions = {
-                userName: args.options.userName,
-                output: 'json',
-                debug: args.options.debug,
-                verbose: args.options.verbose
-            };
-            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
-            if (this.verbose) {
-                logger.logToStderr(aadUserGetOutput.stderr);
-            }
-            const aadUserGetJsonOutput = JSON.parse(aadUserGetOutput.stdout);
-            return aadUserGetJsonOutput.id;
+            const userId = yield aadUser_1.aadUser.getUserIdByUpn(args.options.userName);
+            return userId;
         });
     }
 }

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

@@ -16,13 +16,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMeetingGetCommand_instances, _TeamsMeetingGetCommand_initTelemetry, _TeamsMeetingGetCommand_initOptions, _TeamsMeetingGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const validation_1 = require("../../../../utils/validation");
 const accessToken_1 = require("../../../../utils/accessToken");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsMeetingGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_GET;
@@ -37,20 +37,6 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initValidators).call(this);
     }
-    getUserId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const commandOptions = {
-                email: options.email,
-                userName: options.userName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -71,18 +57,13 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
                 let requestUrl = `${this.resource}/v1.0/`;
                 if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
-                    if (args.options.userId) {
-                        requestUrl += args.options.userId;
-                    }
-                    else {
-                        const userId = yield this.getUserId(args.options);
-                        requestUrl += userId;
-                    }
+                    const userId = yield this.getUserId(args.options);
+                    requestUrl += userId;
                 }
                 else {
                     requestUrl += `me`;
                 }
-                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${encodeURIComponent(args.options.joinUrl)}'`;
+                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${formatting_1.formatting.encodeQueryParameter(args.options.joinUrl)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -103,6 +84,17 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
             }
         });
     }
+    getUserId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.userName) {
+                return aadUser_1.aadUser.getUserIdByUpn(options.userName);
+            }
+            return aadUser_1.aadUser.getUserIdByEmail(options.email);
+        });
+    }
 }
 _TeamsMeetingGetCommand_instances = new WeakSet(), _TeamsMeetingGetCommand_initTelemetry = function _TeamsMeetingGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -21,8 +21,8 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 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");
+const aadUser_1 = require("../../../../utils/aadUser");
 class TeamsMeetingListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_LIST;
@@ -60,7 +60,7 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
                         requestUrl += args.options.userName;
                     }
                     else if (args.options.email) {
-                        const userId = yield this.getUserId(args.options.email);
+                        const userId = yield aadUser_1.aadUser.getUserIdByEmail(args.options.email);
                         requestUrl += userId;
                     }
                 }
@@ -98,19 +98,6 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
             }
         });
     }
-    getUserId(email) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const options = {
-                email: email,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
 }
 _TeamsMeetingListCommand_instances = new WeakSet(), _TeamsMeetingListCommand_initTelemetry = function _TeamsMeetingListCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/docs/docs/cmd/spo/file/file-retentionlabel-ensure.mdx

@@ -19,7 +19,7 @@ m365 spo file retentionlabel ensure [options]
 `--fileUrl [fileUrl]`
 : The site- or server-relative URL of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
-`i, --fileId [fileId]`
+`-i, --fileId [fileId]`
 : The UniqueId (GUID) of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
 `--name <name>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.10.0-beta.f43fa4d",
+  "version": "6.10.0",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -282,4 +282,4 @@
     "sinon": "^15.2.0",
     "source-map-support": "^0.5.21"
   }
-}
+}