@pnp/cli-microsoft365 10.10.0 → 10.11.0-beta.5e075e5

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

@@ -0,0 +1,95 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import config from '../../../../config.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { cli } from '../../../../cli/cli.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string().optional().default('CLI for M365')),
+    scopes: zod.alias('s', z.string().optional().default('minimal')),
+    saveToConfig: z.boolean().optional()
+})
+    .strict();
+class CliAppAddCommand extends GraphCommand {
+    get name() {
+        return commands.APP_ADD;
+    }
+    get description() {
+        return 'Creates a Microsoft Entra application registration for CLI for Microsoft 365';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => {
+            const scopes = options.scopes;
+            if (!scopes.includes(',')) {
+                return scopes === 'minimal' || scopes === 'all';
+            }
+            const scopeList = scopes.split(',').map(s => s.trim());
+            return scopeList.every(scope => scope.startsWith('https'));
+        }, {
+            message: "Scopes must be 'minimal', 'all', or comma-separated list of URLs starting with 'https'. 'minimal' and 'all' cannot be combined with other scopes.",
+            path: ['scopes']
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const options = {
+                allowPublicClientFlows: true,
+                apisDelegated: this.getScopes(args.options),
+                implicitFlow: false,
+                multitenant: false,
+                name: args.options.name,
+                platform: 'publicClient',
+                redirectUris: 'http://localhost,https://localhost,https://login.microsoftonline.com/common/oauth2/nativeclient'
+            };
+            const apis = await entraApp.resolveApis({
+                options,
+                logger,
+                verbose: this.verbose,
+                debug: this.debug
+            });
+            const appInfo = await entraApp.createAppRegistration({
+                options,
+                unknownOptions: {},
+                apis,
+                logger,
+                verbose: this.verbose,
+                debug: this.debug
+            });
+            appInfo.tenantId = accessToken.getTenantIdFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
+            await entraApp.grantAdminConsent({
+                appInfo,
+                appPermissions: entraApp.appPermissions,
+                adminConsent: true,
+                logger,
+                debug: this.debug
+            });
+            if (args.options.saveToConfig) {
+                cli.getConfig().set('clientId', appInfo.appId);
+                cli.getConfig().set('tenantId', appInfo.tenantId);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getScopes(options) {
+        if (options.scopes === 'all') {
+            return config.allScopes.join(',');
+        }
+        else if (options.scopes === 'minimal') {
+            return config.minimalScopes.join(',');
+        }
+        return options.scopes;
+    }
+}
+export default new CliAppAddCommand();
+//# sourceMappingURL=app-add.js.map

package/dist/m365/cli/commands.js

@@ -1,5 +1,6 @@
 const prefix = 'cli';
 export default {
+    APP_ADD: `${prefix} app add`,
     APP_RECONSENT: `${prefix} app reconsent`,
     COMPLETION_CLINK_UPDATE: `${prefix} completion clink update`,
     COMPLETION_PWSH_SETUP: `${prefix} completion pwsh setup`,

package/dist/m365/spo/commands/page/Page.js

@@ -72,10 +72,14 @@ export class Page {
         return output;
     }
     static getSectionInformation(section, isJSONOutput) {
-        return {
-            order: section.order,
-            columns: section.columns.map(column => this.getColumnsInformation(column, isJSONOutput))
+        const sectionOutput = {
+            order: section.order
         };
+        if (this.isVerticalSection(section)) {
+            sectionOutput.isVertical = true;
+        }
+        sectionOutput.columns = section.columns.map(column => this.getColumnsInformation(column, isJSONOutput));
+        return sectionOutput;
     }
     /**
      * Publish a modern page in SharePoint Online
@@ -99,5 +103,8 @@ export class Page {
         }
         return pageName;
     }
+    static isVerticalSection(section) {
+        return section.layoutIndex === 2 && section?.controlData?.position?.sectionFactor === 12;
+    }
 }
 //# sourceMappingURL=Page.js.map

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

@@ -34,10 +34,14 @@ class SpoPageSectionListCommand extends SpoCommand {
                 }
                 else {
                     await logger.log(output.map(s => {
-                        return {
+                        const sectionOutput = {
                             order: s.order,
                             columns: s.columns.length
                         };
+                        if (s.isVertical) {
+                            sectionOutput.isVertical = s.isVertical;
+                        }
+                        return sectionOutput;
                     }));
                 }
             }

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -45,9 +45,6 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand {
                         }
                     }
                 }
-                if (spoWebAppServicePrincipalPermissionRequestResult.length === 0) {
-                    spoWebAppServicePrincipalPermissionRequestResult = result;
-                }
                 await logger.log(spoWebAppServicePrincipalPermissionRequestResult.map(r => {
                     return {
                         Id: r.Id.replace('/Guid(', '').replace(')/', ''),
@@ -71,14 +68,23 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand {
             responseType: 'json'
         };
         const response = await request.get(requestOptions);
-        if (response.value && response.value.length > 0) {
-            return response.value[0].scope.split(' ');
+        if (!response.value || response.value.length === 0) {
+            return null;
         }
-        return null;
+        const scopes = [];
+        response.value.forEach(grant => {
+            if (grant.scope) {
+                grant.scope.split(' ')
+                    .map(permission => permission.trim())
+                    .filter(Boolean)
+                    .forEach(permission => scopes.push(permission));
+            }
+        });
+        return scopes;
     }
     async getSPOClientExtensibilityWebApplicationPrincipalId() {
         const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Client Extensibility Web Application Principal'`,
+            url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Web Client Extensibility'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -1,7 +1,15 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const options = globalOptionsZod
+    .extend({
+    excludeDeletedSites: zod.alias('excludeDeletedSites', z.boolean().optional())
+})
+    .strict();
 class SpoSiteAppCatalogListCommand extends SpoCommand {
     get name() {
         return commands.SITE_APPCATALOG_LIST;
@@ -9,16 +17,44 @@ class SpoSiteAppCatalogListCommand extends SpoCommand {
     get description() {
         return 'List all site collection app catalogs within the tenant';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['AbsoluteUrl', 'SiteID'];
     }
-    async commandAction(logger) {
+    async commandAction(logger, args) {
         try {
             if (this.verbose) {
                 await logger.logToStderr('Retrieving site collection app catalogs...');
             }
             const spoUrl = await spo.getSpoUrl(logger, this.debug);
-            const appCatalogs = await odata.getAllItems(`${spoUrl}/_api/Web/TenantAppCatalog/SiteCollectionAppCatalogsSites`);
+            let appCatalogs = await odata.getAllItems(`${spoUrl}/_api/Web/TenantAppCatalog/SiteCollectionAppCatalogsSites`);
+            if (args.options.excludeDeletedSites) {
+                if (this.verbose) {
+                    await logger.logToStderr('Excluding inaccessible sites from the results...');
+                }
+                const activeAppCatalogs = [];
+                for (const appCatalog of appCatalogs) {
+                    try {
+                        await spo.getWeb(appCatalog.AbsoluteUrl, logger, this.verbose);
+                        activeAppCatalogs.push(appCatalog);
+                    }
+                    catch (error) {
+                        if (this.debug) {
+                            await logger.logToStderr(error);
+                        }
+                        if (error.status === 404 || error.status === 403) {
+                            if (this.verbose) {
+                                await logger.logToStderr(`Site at '${appCatalog.AbsoluteUrl}' is inaccessible. Excluding from results...`);
+                            }
+                            continue;
+                        }
+                        throw error;
+                    }
+                }
+                appCatalogs = activeAppCatalogs;
+            }
             await logger.log(appCatalogs);
         }
         catch (err) {

package/docs/docs/cmd/cli/app/app-add.mdx

@@ -0,0 +1,50 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# cli app add
+
+Create a new app registration to use for the CLI for Microsoft 365
+
+## Usage
+
+```sh
+m365 cli app add [options]
+```
+
+## Options
+
+```md definition-list
+`-n, --name [name]`
+: Name of the app registration. Defaults to CLI for M365
+
+`-s, --scopes [scopes]`
+: Which scopes should be added? Valid values are: `minimal`, `all`, or a list of scopes. Defaults to `minimal`.
+
+`--saveToConfig`
+: Save the app registration info to the CLI config. This way the new app registration will be used as the default app registration to sign in.
+```
+
+<Global />
+
+## Examples
+
+Create a new app registration to use for CLI for Microsoft 365
+
+```sh
+m365 cli app add
+```
+
+Create a new app registration with all permission scopes and a custom name
+
+```sh
+m365 cli app add --name "Contoso CLI app" --scopes all
+```
+
+Create a new app registration with self-defined scopes
+
+```sh
+m365 cli app add --scopes "https://graph.microsoft.com/User.Read,https://graph.microsoft.com/Group.Read.All"
+```
+
+## Response
+
+The command won't return a response on success

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

@@ -14,6 +14,11 @@ m365 spo site appcatalog list [options]
 
 ## Options
 
+```md definition-list
+`--excludeDeletedSites [excludeDeletedSites]`
+: Exclude site collections that are no longer active
+```
+
 <Global />
 
 ## Remarks
@@ -32,6 +37,12 @@ List all site collection app catalogs within the tenant
 m365 spo site appcatalog list
 ```
 
+List all site collection app catalogs within the tenant and exclude deleted sites.
+
+```sh
+m365 spo site appcatalog list --excludeDeletedSites
+```
+
 ## Response
 
 <Tabs>

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.10.0",
+  "version": "10.11.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pnp/cli-microsoft365",
-      "version": "10.10.0",
+      "version": "10.11.0",
       "license": "MIT",
       "dependencies": {
         "@azure/msal-common": "^15.8.0",

package/package.json

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