@pnp/cli-microsoft365 9.0.0-beta.2f8dd1e → 9.0.0-beta.d6b190a

package/dist/m365/commands/setup.js

@@ -42,8 +42,6 @@ class SetupCommand extends AnonymousCommand {
             await this.configureSettings(settings, true, logger);
             return;
         }
-        // stop the spinner. Fixes #5598
-        cli.spinner.stop();
         await logger.logToStderr(`Welcome to the CLI for Microsoft 365 setup!`);
         await logger.logToStderr(`This command will guide you through the process of configuring the CLI for your needs.`);
         await logger.logToStderr(`Please, answer the following questions and we'll define a set of settings to best match how you intend to use the CLI.`);
@@ -85,8 +83,6 @@ class SetupCommand extends AnonymousCommand {
             await logger.logToStderr('');
             await logger.logToStderr('Configuring settings...');
             await logger.logToStderr('');
-            // start the spinner. Fixes #5598
-            cli.spinner.start();
             await this.configureSettings(settings, false, logger);
             if (!this.verbose) {
                 await logger.logToStderr('');

package/dist/m365/entra/commands/m365group/m365group-set.js

@@ -13,6 +13,8 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
 class EntraM365GroupSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_SET;
@@ -35,22 +37,22 @@ class EntraM365GroupSetCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_SET, commands.M365GROUP_SET);
         try {
+            if ((args.options.allowExternalSenders !== undefined || args.options.autoSubscribeNewMembers !== undefined) && accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken)) {
+                throw `Option 'allowExternalSenders' and 'autoSubscribeNewMembers' can only be used when using delegated permissions.`;
+            }
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }
-            if (args.options.displayName || args.options.description || typeof args.options.isPrivate !== 'undefined') {
-                if (this.verbose) {
-                    await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
-                }
-                const update = {};
-                if (args.options.displayName) {
-                    update.displayName = args.options.displayName;
-                }
-                if (args.options.description) {
-                    update.description = args.options.description;
-                }
-                if (typeof args.options.isPrivate !== 'undefined') {
+            if (this.verbose) {
+                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
+            }
+            if (args.options.displayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
+                const update = {
+                    displayName: args.options.displayName,
+                    description: args.options.description !== '' ? args.options.description : null
+                };
+                if (args.options.isPrivate !== undefined) {
                     update.visibility = args.options.isPrivate ? 'Private' : 'Public';
                 }
                 const requestOptions = {
@@ -63,6 +65,24 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 };
                 await request.patch(requestOptions);
             }
+            // This has to be a separate request due to some Graph API limitations. Otherwise it will throw an error.
+            if (args.options.allowExternalSenders !== undefined || args.options.autoSubscribeNewMembers !== undefined || args.options.hideFromAddressLists !== undefined || args.options.hideFromOutlookClients !== undefined) {
+                const requestBody = {
+                    allowExternalSenders: args.options.allowExternalSenders,
+                    autoSubscribeNewMembers: args.options.autoSubscribeNewMembers,
+                    hideFromAddressLists: args.options.hideFromAddressLists,
+                    hideFromOutlookClients: args.options.hideFromOutlookClients
+                };
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: requestBody
+                };
+                await request.patch(requestOptions);
+            }
             if (args.options.logoPath) {
                 const fullPath = path.resolve(args.options.logoPath);
                 if (this.verbose) {
@@ -172,8 +192,12 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
             description: typeof args.options.description !== 'undefined',
             owners: typeof args.options.owners !== 'undefined',
             members: typeof args.options.members !== 'undefined',
-            isPrivate: args.options.isPrivate,
-            logoPath: typeof args.options.logoPath !== 'undefined'
+            isPrivate: !!args.options.isPrivate,
+            logoPath: typeof args.options.logoPath !== 'undefined',
+            allowExternalSenders: !!args.options.allowExternalSenders,
+            autoSubscribeNewMembers: !!args.options.autoSubscribeNewMembers,
+            hideFromAddressLists: !!args.options.hideFromAddressLists,
+            hideFromOutlookClients: !!args.options.hideFromOutlookClients
         });
     });
 }, _EntraM365GroupSetCommand_initOptions = function _EntraM365GroupSetCommand_initOptions() {
@@ -192,36 +216,49 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
         autocomplete: ['true', 'false']
     }, {
         option: '-l, --logoPath [logoPath]'
+    }, {
+        option: '--allowExternalSenders [allowExternalSenders]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--autoSubscribeNewMembers [autoSubscribeNewMembers]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--hideFromAddressLists [hideFromAddressLists]',
+        autocomplete: ['true', 'false']
+    }, {
+        option: '--hideFromOutlookClients [hideFromOutlookClients]',
+        autocomplete: ['true', 'false']
     });
 }, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
-    this.types.boolean.push('isPrivate');
+    this.types.boolean.push('isPrivate', 'allowEternalSenders', 'autoSubscribeNewMembers', 'hideFromAddressLists', 'hideFromOutlookClients');
+    this.types.string.push('id', 'displayName', 'description', 'owners', 'members', 'logoPath');
 }, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!args.options.displayName &&
-            !args.options.description &&
+            args.options.description === undefined &&
             !args.options.members &&
             !args.options.owners &&
-            typeof args.options.isPrivate === 'undefined' &&
-            !args.options.logoPath) {
-            return 'Specify at least one property to update';
+            args.options.isPrivate === undefined &&
+            !args.options.logoPath &&
+            args.options.allowExternalSenders === undefined &&
+            args.options.autoSubscribeNewMembers === undefined &&
+            args.options.hideFromAddressLists === undefined &&
+            args.options.hideFromOutlookClients === undefined) {
+            return 'Specify at least one option to update.';
         }
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.owners) {
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            for (let i = 0; i < owners.length; i++) {
-                if (owners[i].indexOf('@') < 0) {
-                    return `${owners[i]} is not a valid userPrincipalName`;
-                }
+            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.owners);
+            if (isValidArray !== true) {
+                return `Option 'owners' contains one or more invalid UPNs: ${isValidArray}.`;
             }
         }
         if (args.options.members) {
-            const members = args.options.members.split(',').map(m => m.trim());
-            for (let i = 0; i < members.length; i++) {
-                if (members[i].indexOf('@') < 0) {
-                    return `${members[i]} is not a valid userPrincipalName`;
-                }
+            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.members);
+            if (isValidArray !== true) {
+                return `Option 'members' contains one or more invalid UPNs: ${isValidArray}.`;
             }
         }
         if (args.options.logoPath) {

package/dist/m365/entra/commands/multitenant/MultitenantOrganization.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=MultitenantOrganization.js.map

package/dist/m365/entra/commands/multitenant/multitenant-get.js

@@ -0,0 +1,32 @@
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraMultitenantGetCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_GET;
+    }
+    get description() {
+        return 'Gets properties of the multitenant organization';
+    }
+    async commandAction(logger) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        try {
+            if (this.verbose) {
+                await logger.logToStderr('Retrieving multitenant organization...');
+            }
+            const multitenantOrg = await request.get(requestOptions);
+            await logger.log(multitenantOrg);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new EntraMultitenantGetCommand();
+//# sourceMappingURL=multitenant-get.js.map

package/dist/m365/entra/commands.js

@@ -72,6 +72,7 @@ export default {
     M365GROUP_USER_LIST: `${prefix} m365group user list`,
     M365GROUP_USER_REMOVE: `${prefix} m365group user remove`,
     M365GROUP_USER_SET: `${prefix} m365group user set`,
+    MULTITENANT_GET: `${prefix} multitenant get`,
     OAUTH2GRANT_ADD: `${prefix} oauth2grant add`,
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,

package/dist/m365/external/commands/connection/connection-doctor.js

@@ -5,11 +5,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _ExternalConnectionDoctorCommand_instances, _a, _ExternalConnectionDoctorCommand_initOptions, _ExternalConnectionDoctorCommand_initValidators;
 import os from 'os';
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { settingsNames } from '../../../../settingsNames.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { CheckStatus, formatting } from '../../../../utils/formatting.js';
 class ExternalConnectionDoctorCommand extends GraphCommand {
     get name() {
         return commands.CONNECTION_DOCTOR;
@@ -28,9 +27,7 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
         const ux = args.options.ux ?? 'all';
         const output = args.options.output;
         this.checksStatus = [];
-        const showSpinner = cli.getSettingWithDefaultValue(settingsNames.showSpinner, true) &&
-            output === 'text' &&
-            typeof global.it === 'undefined';
+        const show = output === 'text';
         let checks = [
             {
                 id: 'loadExternalConnection',
@@ -114,17 +111,10 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
             if (this.debug) {
                 await logger.logToStderr(`Running check ${check.id}...`);
             }
-            // don't show spinner if running tests
-            /* c8 ignore next 3 */
-            if (showSpinner) {
-                cli.spinner.start(check.text);
-            }
             // only automated checks have functions
             if (!check.fn) {
-                // don't show spinner if running tests
-                /* c8 ignore next 3 */
-                if (showSpinner) {
-                    cli.spinner.info(`${check.text} (manual)`);
+                if (show) {
+                    await logger.log(formatting.getStatus(CheckStatus.Information, `${check.text} (manual)`));
                 }
                 this.checksStatus.push({
                     ...check,
@@ -135,23 +125,19 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
             const result = await check.fn.bind(this)(check.id, args);
             this.checksStatus.push({ ...check, ...result });
             if (result.status === 'passed') {
-                // don't show spinner if running tests
-                /* c8 ignore next 3 */
-                if (showSpinner) {
-                    cli.spinner.succeed();
+                if (show) {
+                    await logger.log(formatting.getStatus(CheckStatus.Success, check.text));
                 }
                 continue;
             }
             if (result.status === 'failed') {
-                // don't show spinner if running tests
-                /* c8 ignore next 9 */
-                if (showSpinner) {
+                if (show) {
                     const message = `${check.text}: ${result.errorMessage}`;
                     if (check.type === 'required') {
-                        cli.spinner.fail(message);
+                        await logger.log(formatting.getStatus(CheckStatus.Failure, message));
                     }
                     else {
-                        cli.spinner.warn(message);
+                        await logger.log(formatting.getStatus(CheckStatus.Warning, check.text));
                     }
                 }
                 if (result.shouldStop) {
@@ -159,7 +145,7 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
                 }
             }
         }
-        if (output === 'text' || output === 'none') {
+        if (show || output === 'none') {
             return;
         }
         this.checksStatus.forEach(s => {

package/dist/m365/flow/commands/flow-list.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
+var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators, _FlowListCommand_initTypes;
 import { formatting } from '../../../utils/formatting.js';
 import { odata } from '../../../utils/odata.js';
 import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
@@ -13,7 +13,7 @@ class FlowListCommand extends PowerAutomateCommand {
         return commands.LIST;
     }
     get description() {
-        return 'Lists Microsoft Flows in the given environment';
+        return 'Lists Power Automate flows in the given environment';
     }
     defaultProperties() {
         return ['name', 'displayName'];
@@ -25,8 +25,12 @@ class FlowListCommand extends PowerAutomateCommand {
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin && ' as admin'} in environment '${args.options.environmentName}'...`);
+        }
         try {
             const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
             let items = [];
@@ -42,7 +46,8 @@ class FlowListCommand extends PowerAutomateCommand {
                 let url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
                 items = await odata.getAllItems(url);
                 url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
-                items = await odata.getAllItems(url);
+                const teamFlows = await odata.getAllItems(url);
+                items = items.concat(teamFlows);
             }
             else {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions);
@@ -50,34 +55,25 @@ class FlowListCommand extends PowerAutomateCommand {
             }
             // Remove duplicates
             items = items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
-            if (items.length > 0) {
-                items.forEach(i => {
-                    i.displayName = i.properties.displayName;
+            if (args.options.output && args.options.output !== 'json') {
+                items.forEach(flow => {
+                    flow.displayName = flow.properties.displayName;
                 });
-                await logger.log(items);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No Flows found');
-                }
             }
+            await logger.log(items);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
     getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
-        let url = `${this.resource}/providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
-        if (filter === 'personal') {
-            url += `&$filter=search('personal')`;
-        }
-        else if (filter === 'team') {
-            url += `&$filter=search('team')`;
-        }
-        if (includeSolutionFlows) {
-            url += '&include=includeSolutionCloudFlows';
-        }
-        return url;
+        const baseEndpoint = `${this.resource}/providers/Microsoft.ProcessSimple`;
+        const environmentSegment = `/environments/${formatting.encodeQueryParameter(environmentName)}`;
+        const adminSegment = `/scopes/admin${environmentSegment}/v2`;
+        const flowsEndpoint = '/flows?api-version=2016-11-01';
+        const filterQuery = filter === 'personal' || filter === 'team' ? `&$filter=search('${filter}')` : '';
+        const includeQuery = includeSolutionFlows ? '&include=includeSolutionCloudFlows' : '';
+        return `${baseEndpoint}${asAdmin ? adminSegment : environmentSegment}${flowsEndpoint}${filterQuery}${includeQuery}`;
     }
 }
 _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
@@ -105,10 +101,13 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
             return `The options asAdmin and sharingStatus cannot be specified together.`;
         }
         if (args.options.sharingStatus && !this.allowedSharingStatuses.some(status => status === args.options.sharingStatus)) {
-            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(',')}`;
+            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(', ')}`;
         }
         return true;
     });
+}, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
+    this.types.string.push('environmentName', 'sharingStatus');
+    this.types.boolean.push('includeSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -141,8 +141,10 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
     });
 }, _GraphSubscriptionAddCommand_initValidators = function _GraphSubscriptionAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.notificationUrl.indexOf('https://') !== 0) {
-            return `The specified notification URL '${args.options.notificationUrl}' does not start with 'https://'`;
+        if (!args.options.notificationUrl.toLowerCase().startsWith('https://')
+            && !args.options.notificationUrl.toLowerCase().startsWith('eventhub:https://')
+            && !args.options.notificationUrl.toLowerCase().startsWith('eventgrid:?azuresubscriptionid=')) {
+            return `The specified notification URL '${args.options.notificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`;
         }
         if (!this.isValidChangeTypes(args.options.changeTypes)) {
             return `The specified changeTypes are invalid. Valid options are 'created', 'updated' and 'deleted'`;

package/dist/m365/spe/ContainerTypeProperties.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ContainerTypeProperties.js.map

package/dist/m365/spe/commands/containertype/containertype-list.js

@@ -0,0 +1,49 @@
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpeContainertypeListCommand extends SpoCommand {
+    get name() {
+        return commands.CONTAINERTYPE_LIST;
+    }
+    get description() {
+        return 'Lists all Container Types';
+    }
+    defaultProperties() {
+        return ['ContainerTypeId', 'DisplayName', 'OwningAppId'];
+    }
+    async commandAction(logger) {
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving list of Container types...`);
+            }
+            const allContainerTypes = await this.getAllContainerTypes(spoAdminUrl, logger);
+            await logger.log(allContainerTypes);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+    async getAllContainerTypes(spoAdminUrl, logger) {
+        const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': formDigestInfo.FormDigestValue
+            },
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="46" ObjectPathId="45" /><Method Name="GetSPOContainerTypes" Id="47" ObjectPathId="45"><Parameters><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="45" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+        const containerTypes = json[json.length - 1];
+        return containerTypes;
+    }
+}
+export default new SpeContainertypeListCommand();
+//# sourceMappingURL=containertype-list.js.map

package/dist/m365/spe/commands.js

@@ -1,5 +1,6 @@
 const prefix = 'spe';
 export default {
-    CONTAINERTYPE_ADD: `${prefix} containertype add`
+    CONTAINERTYPE_ADD: `${prefix} containertype add`,
+    CONTAINERTYPE_LIST: `${prefix} containertype list`
 };
 //# sourceMappingURL=commands.js.map