Merge branch 'issue-6181' of https://github.com/nanddeepn/cli-microso…

…ft365 into issue-6181
pnp · Dec 9, 2024 · 266d17d · 266d17d
2 parents c872016 + 3e249dc
commit 266d17d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/docs/docs/cmd/spo/user/user-ensure.mdx b/docs/docs/cmd/spo/user/user-ensure.mdx
@@ -21,9 +21,6 @@ m365 spo user ensure [options]
 `--entraId [--entraId]`
 : Id of the user in Entra. Specify either `aadId`, `entraId`, `userName`, `loginName`, `entraGroupId` or `entraGroupName`.
 
-`--aadId [--aadId]`
-: (deprecated. Use `entraId` instead) Id of the user in Microsoft Entra. Specify either `aadId`, `entraId`, `userName`, `loginName`, `entraGroupId` or `entraGroupName`.
-
 `--userName [userName]`
 : User's UPN (user principal name, e.g. [email protected]). Specify either `aadId`, `entraId`, `userName`, `loginName`, `entraGroupId` or `entraGroupName`.
 

diff --git a/src/m365/spo/commands/user/user-ensure.spec.ts b/src/m365/spo/commands/user/user-ensure.spec.ts
@@ -398,4 +398,4 @@ describe(commands.USER_ENSURE, () => {
     const actual = await command.validate({ options: { webUrl: validWebUrl, entraGroupId: validEntraGroupId } }, commandInfo);
     assert.strictEqual(actual, true);
   });
-}); 
+});
diff --git a/src/m365/spo/commands/user/user-ensure.ts b/src/m365/spo/commands/user/user-ensure.ts
@@ -106,7 +106,7 @@ class SpoUserEnsureCommand extends SpoCommand {
 
   #initOptionSets(): void {
     this.optionSets.push({
-      options: ['entraId', 'aadId', 'userName', 'loginName', 'entraGroupId', 'entraGroupName'],
+      options: ['entraId', 'userName', 'loginName', 'entraGroupId', 'entraGroupName'],
       runsWhen: (args) => args.options.entraId || args.options.aadId || args.options.userName || args.options.loginName || args.options.entraGroupId || args.options.entraGroupName
     });
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -398,4 +398,4 @@ describe(commands.USER_ENSURE, () => { @@
         const actual = await command.validate({ options: { webUrl: validWebUrl, entraGroupId: validEntraGroupId } }, commandInfo);
         assert.strictEqual(actual, true);
       });
-    });
+    });