@pnp/cli-microsoft365 7.10.0-beta.a743796 → 7.10.0

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

@@ -26,24 +26,24 @@ class TeamsUserAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const appId = await this.getAppId(args);
-        const userId = (args.options.userId ?? args.options.userName);
-        const endpoint = `${this.resource}/v1.0`;
-        if (this.verbose) {
-            await logger.logToStderr(`Removing app with ID ${appId} for user ${args.options.userId}`);
-        }
-        const requestOptions = {
-            url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
-            }
-        };
         try {
+            const appId = await this.getAppId(args);
+            const userId = (args.options.userId ?? args.options.userName);
+            const endpoint = `${this.resource}/v1.0`;
+            if (this.verbose) {
+                await logger.logToStderr(`Adding app with ID ${appId} for user ${args.options.userId}`);
+            }
+            const requestOptions = {
+                url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
+                }
+            };
             await request.post(requestOptions);
         }
         catch (err) {

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

@@ -0,0 +1,106 @@
+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 _TeamsUserAppUpgradeCommand_instances, _TeamsUserAppUpgradeCommand_initTelemetry, _TeamsUserAppUpgradeCommand_initOptions, _TeamsUserAppUpgradeCommand_initValidators, _TeamsUserAppUpgradeCommand_initOptionSets, _TeamsUserAppUpgradeCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class TeamsUserAppUpgradeCommand extends GraphCommand {
+    get name() {
+        return commands.USER_APP_UPGRADE;
+    }
+    get description() {
+        return 'Upgrade an app in the personal scope of the specified user';
+    }
+    constructor() {
+        super();
+        _TeamsUserAppUpgradeCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Upgrading app ${args.options.id || args.options.name} for user ${args.options.userId || args.options.userName}`);
+            }
+            const installedAppId = await this.getInstalledAppId(args.options, logger);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}/teamwork/installedApps/${installedAppId}/upgrade`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                }
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getInstalledAppId(options, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving app ID`);
+        }
+        if (options.id) {
+            return options.id;
+        }
+        const installedApps = await odata.getAllItems(`${this.resource}/v1.0/users/${formatting.encodeQueryParameter(options.userId || options.userName)}/teamwork/installedApps?$expand=teamsAppDefinition&$filter=teamsAppDefinition/displayName eq '${formatting.encodeQueryParameter(options.name)}'&$select=id`);
+        if (installedApps.length === 1) {
+            return installedApps[0].id;
+        }
+        if (installedApps.length === 0) {
+            throw `The specified Teams app ${options.name} does not exist or is not installed for the user`;
+        }
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', installedApps);
+        const result = (await cli.handleMultipleResultsFound(`Multiple installed Teams apps with name '${options.name}' found.`, resultAsKeyValuePair));
+        return result.id;
+    }
+}
+_TeamsUserAppUpgradeCommand_instances = new WeakSet(), _TeamsUserAppUpgradeCommand_initTelemetry = function _TeamsUserAppUpgradeCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsUserAppUpgradeCommand_initOptions = function _TeamsUserAppUpgradeCommand_initOptions() {
+    this.options.unshift({
+        option: '--id [id]'
+    }, {
+        option: '--name [name]'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _TeamsUserAppUpgradeCommand_initValidators = function _TeamsUserAppUpgradeCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        return true;
+    });
+}, _TeamsUserAppUpgradeCommand_initOptionSets = function _TeamsUserAppUpgradeCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'name']
+    }, {
+        options: ['userId', 'userName']
+    });
+}, _TeamsUserAppUpgradeCommand_initTypes = function _TeamsUserAppUpgradeCommand_initTypes() {
+    this.types.string.push('id', 'name', 'userId', 'userName');
+};
+export default new TeamsUserAppUpgradeCommand();
+//# sourceMappingURL=user-app-upgrade.js.map

package/dist/m365/teams/commands.js

@@ -67,6 +67,7 @@ export default {
     USER_SET: `${prefix} user set`,
     USER_APP_ADD: `${prefix} user app add`,
     USER_APP_LIST: `${prefix} user app list`,
-    USER_APP_REMOVE: `${prefix} user app remove`
+    USER_APP_REMOVE: `${prefix} user app remove`,
+    USER_APP_UPGRADE: `${prefix} user app upgrade`
 };
 //# sourceMappingURL=commands.js.map

package/dist/utils/md.js

@@ -22,7 +22,7 @@ function includeContent(md, rootFolder) {
         { tag: "<CLISettings />", location: "docs/_clisettings.mdx" }
     ];
     mdxImports.forEach(mdxImport => {
-        md = md.replace(mdxImport.tag, () => fs.readFileSync(path.join(rootFolder, mdxImport.location), 'utf8')).replace(/(```\r\n)\r\n(```md definition-list\r\n)/g, "$1$2");
+        md = md.replace(mdxImport.tag, () => fs.readFileSync(path.join(rootFolder, mdxImport.location), 'utf8')).replace(/(```\r?\n)\r?\n(```md definition-list\r?\n)/g, "$1$2");
     });
     return md;
 }
@@ -54,7 +54,7 @@ function convertContentTabs(md) {
         .trim();
 }
 function convertCodeFences(md) {
-    const regex = new RegExp('^```.*?(?:\r\n|\n)(.*?)```(?:\r\n|\n)', 'gms');
+    const regex = new RegExp('^```.*?(?:\r?\n)(.*?)```(?:\r?\n)', 'gms');
     return md.replace(regex, (match, code) => {
         return `${code.replace(/^(.+)$/gm, '  $1')}${EOL}`;
     });

package/docs/docs/cmd/entra/app/app-permission-remove.mdx

@@ -0,0 +1,60 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# entra app permission remove
+
+Removes the specified application and/or delegated permissions from a specified Entra app.
+
+## Usage
+
+```sh
+m365 entra app permission remove [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --appId [appId]`
+: Client ID of the Microsoft Entra app to remove the API permissions from. Specify either `appId`, `appName` or `appObjectId`.
+
+`--appObjectId [appObjectId]`
+: Object ID of the Microsoft Entra app to remove the API permissions from. Specify either `appId`, `appName` or `appObjectId`.
+
+`-n, --appName [appName]`
+: Display name of the Entra app to remove the API permissions from. Specify either `appId`, `appName` or `appObjectId`.
+
+`-a, --applicationPermissions [applicationPermissions]`
+: Space-separated list of application permissions to remove. Specify at least `applicationPermissions` or `delegatedPermissions`.
+
+`-d, --delegatedPermissions [delegatedPermissions]`
+: Space-separated list of delegated permissions to remove. Specify at least `applicationPermissions` or `delegatedPermissions`.
+
+`--revokeAdminConsent`
+: When specified, revokes the admin consent for the specified permissions as well.
+
+`-f, --force`
+: Don't prompt for confirmation to remove the permissions.
+```
+
+<Global />
+
+## Remarks
+
+Removing permissions on App Registrations does not immediately remove consent given by an administrator. Explicitly instruct the CLI to revoke consent by using the `--revokeAdminConsent` flag.
+
+## Examples
+
+Remove multiple delegated API permissions from an Entra app registration
+
+```sh
+m365 entra app permission remove --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --delegatedPermissions 'https://management.azure.com/user_impersonation https://service.flow.microsoft.com/Flows.Read.All https://graph.microsoft.com/Agreement.Read.All'
+```
+
+Remove multiple app-only permissions from an Entra app registration and revoke admin consent
+
+```sh
+m365 entra app permission remove --appId 'f1417aa3-bf0b-4cc5-a845-a0b2cf11f690' --applicationPermissions 'https://graph.microsoft.com/Sites.FullControl.All https://microsoft.sharepoint-df.com/Sites.FullControl.All' --revokeAdminConsent
+```
+
+## Response
+
+The command won't return a response on success.

package/docs/docs/cmd/spo/site/site-admin-list.mdx

@@ -0,0 +1,115 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# spo site admin list
+
+Lists all administrators of a specific SharePoint site
+
+## Usage
+
+```sh
+m365 spo site admin list [options]
+```
+
+## Options
+
+```md definition-list
+`-u, --siteUrl <siteUrl>`
+: The URL of the SharePoint site
+
+`--asAdmin`
+: List admins as admin for sites you don't have permission to
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command with the `--asAdmin` mode, you must have permission to access the tenant admin site.
+
+Without this parameter, you must have site collection admin permissions for the requested site.
+
+In `--asAdmin` mode, the Id, PrincipalType, and PrincipalTypeString properties are not exported.
+
+:::
+
+## Examples
+
+Lists all admins of a SharePoint site
+
+```sh
+m365 spo site admin list --siteUrl https://contoso.sharepoint.com
+```
+
+Lists all admins of a SharePoint site as admin
+
+```sh
+m365 spo site admin list --siteUrl https://contoso.sharepoint.com --asAdmin
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  [
+    {
+      "Id": 6,
+      "LoginName": "i:0#.f|membership|user@contoso.com",
+      "Title": "User Example",
+      "PrincipalType": 1,
+      "PrincipalTypeString": "User",
+      "Email": "user@contoso.com",
+      "IsPrimaryAdmin": true
+    }
+  ]
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  Email               : user@contoso.com
+  Id                  : 6
+  LoginName           : i:0#.f|membership|user@contoso.com
+  PrincipalType       : 1
+  PrincipalTypeString : User
+  Title               : User Example
+  IsPrimaryAdmin      : true
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  Id,LoginName,Title,PrincipalType,PrincipalTypeString,Email,IsPrimaryAdmin
+  6,i:0#.f|membership|user@contoso.com,User Example,1,User,user@contoso.com,1
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # spo site admin list --siteUrl "https://contoso.sharepoint.com/sites/Test"
+
+  Date: 20/03/2024
+
+  ## User
+
+  Property | Value
+  ---------|-------
+  Id | 6
+  LoginName | i:0#.f\|membership\|user@contoso.com
+  Title | User Example
+  PrincipalType | 1
+  PrincipalTypeString | User
+  Email | user@contoso.com
+  IsPrimaryAdmin | true
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/spo/tenant/tenant-site-archive.mdx

@@ -0,0 +1,63 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# spo tenant site archive
+
+Archives a site collection
+
+## Usage
+
+```sh
+m365 spo tenant site archive [options]
+```
+
+## Options
+
+```md definition-list
+`-u, --url <url>`
+: URL of the site collection.
+
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command, you must be a Global or SharePoint administrator.
+
+:::
+
+:::note
+
+After running this command, it may take a few minutes for the site to be fully archived.
+
+:::
+
+
+## Examples
+
+Archive a specific SharePoint site collection
+
+```sh
+m365 spo tenant site archive --url "https://contoso.sharepoint.com/sites/Marketing"
+```
+
+Archive a specific SharePoint site collection without confirmation prompt
+
+```sh
+m365 spo tenant site archive --url "https://contoso.sharepoint.com/sites/Marketing" --force
+```
+
+## Response
+
+The command won't return a response on success.
+
+## More information
+
+- Pricing model for Microsoft 365 Archive: [https://learn.microsoft.com/microsoft-365/archive/archive-pricing](https://learn.microsoft.com/microsoft-365/archive/archive-pricing)
+- Set up Microsoft 365 Archive: [https://learn.microsoft.com/microsoft-365/archive/archive-setup](https://learn.microsoft.com/microsoft-365/archive/archive-setup)

package/docs/docs/cmd/spo/tenant/tenant-site-unarchive.mdx

@@ -0,0 +1,67 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# spo tenant site unarchive
+
+Unarchives a site collection
+
+## Usage
+
+```sh
+m365 spo tenant site unarchive [options]
+```
+
+## Options
+
+```md definition-list
+`-u, --url <url>`
+: URL of the site collection.
+
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command, you must be a Global or SharePoint administrator.
+
+:::
+
+:::warning
+
+If a site remains archived for more than **seven days**, the reactivation fee will be calculated based on the entire storage capacity of the site.
+
+:::
+
+:::note
+
+After running this command, it may take a few minutes for the site to be fully restored.
+
+:::
+
+## Examples
+
+Unarchive a specific site collection.
+
+```sh
+m365 spo tenant site unarchive --url "https://contoso.sharepoint.com/sites/Marketing"
+```
+
+Unarchive a specific site collection without confirmation prompt.
+
+```sh
+m365 spo tenant site unarchive --url "https://contoso.sharepoint.com/sites/Marketing" --force
+```
+
+## Response
+
+The command won't return a response on success.
+
+## More information
+
+- Pricing model for Microsoft 365 Archive: [https://learn.microsoft.com/microsoft-365/archive/archive-pricing](https://learn.microsoft.com/microsoft-365/archive/archive-pricing)

package/docs/docs/cmd/status.mdx

@@ -35,6 +35,7 @@ m365 status
 
   ```json
   {
+    "connectionName": "dd8b99a7-77c6-4238-a609-396d27844921",
     "connectedAs": "john.doe@contoso.onmicrosoft.com",
     "authType": "DeviceCode",
     "appId": "31359c7f-bd7e-475c-86db-fdb8c937548e",
@@ -47,19 +48,20 @@ m365 status
   <TabItem value="Text">
 
   ```text
-  appId      : 31359c7f-bd7e-475c-86db-fdb8c937548e
-  appTenant  : common
-  authType   : DeviceCode
-  connectedAs: john.doe@contoso.onmicrosoft.com
-  cloudType  : Public
+  appId         : 31359c7f-bd7e-475c-86db-fdb8c937548e
+  appTenant     : common
+  authType      : DeviceCode
+  cloudType     : Public
+  connectedAs   : john.doe@contoso.onmicrosoft.com
+  connectionName: dd8b99a7-77c6-4238-a609-396d27844921
   ```
 
   </TabItem>
   <TabItem value="CSV">
 
   ```csv
-  connectedAs,authType,appId,appTenant,cloudType
-  john.doe@contoso.onmicrosoft.com,DeviceCode,31359c7f-bd7e-475c-86db-fdb8c937548e,common,Public
+  connectionName,connectedAs,authType,appId,appTenant,cloudType
+  dd8b99a7-77c6-4238-a609-396d27844921,john.doe@contoso.onmicrosoft.com,DeviceCode,31359c7f-bd7e-475c-86db-fdb8c937548e,common,Public
   ```
 
   </TabItem>
@@ -70,10 +72,9 @@ m365 status
 
   Date: 7/2/2023
 
-
-
   Property | Value
   ---------|-------
+  connectionName | dd8b99a7-77c6-4238-a609-396d27844921
   connectedAs | john.doe@contoso.onmicrosoft.com
   authType | DeviceCode
   appId | 31359c7f-bd7e-475c-86db-fdb8c937548e

package/docs/docs/cmd/teams/user/user-app-upgrade.mdx

@@ -0,0 +1,59 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# teams user app upgrade
+
+Upgrade an app in the personal scope of the specified user
+
+## Usage
+
+```sh
+m365 teams user app upgrade [options]
+```
+
+## Options
+
+```md definition-list
+`--id [id]`
+: The unique id of the app instance installed for the user. Specify either `id` or `name`.
+
+`--name [name]`
+: Name of the app instance installed for the user. Specify either `id` or `name`.
+
+`--userId [userId]`
+: The ID of the user to upgrade the app for. Specify either `userId` or `userName` but not both.
+
+`--userName [userName]`
+: The UPN of the user to upgrade the app for. Specify either `userId` or `userName` but not both.
+```
+
+<Global />
+
+## Examples
+
+Upgrade an app by name for the specified user using its UPN.
+
+```sh
+m365 teams user app upgrade --name HelloWorld --userName admin@contoso.com
+```
+
+Upgrade an app by name for the specified user using its id.
+
+```sh
+m365 teams user app upgrade --name HelloWorld --userId 2609af39-7775-4f94-a3dc-0dd67657e900
+```
+
+Upgrade an app by id for the specified user using its UPN.
+
+```sh
+m365 teams user app upgrade --id YzUyN2E0NzAtYTg4Mi00ODFjLTk4MWMtZWU2ZWZhYmE4NWM3IyM0ZDFlYTA0Ny1mMTk2LTQ1MGQtYjJlOS0wZDI4NTViYTA1YTY= --userName admin@contoso.com
+```
+
+Upgrade an app by id for the specified user using its id.
+
+```sh
+m365 teams user app upgrade --id YzUyN2E0NzAtYTg4Mi00ODFjLTk4MWMtZWU2ZWZhYmE4NWM3IyM0ZDFlYTA0Ny1mMTk2LTQ1MGQtYjJlOS0wZDI4NTViYTA1YTY= --userId 2609af39-7775-4f94-a3dc-0dd67657e900
+```
+
+## Response
+
+The command won't return a response on success.