@pnp/cli-microsoft365 7.7.0-beta.d874bca → 7.8.0-beta.3152fc7

package/dist/cli/cli.js

@@ -17,6 +17,7 @@ import { md } from '../utils/md.js';
 import { validation } from '../utils/validation.js';
 import { prompt } from '../utils/prompt.js';
 import { timings } from './timings.js';
+import chalk from 'chalk';
 const require = createRequire(import.meta.url);
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 let _config;
@@ -96,7 +97,7 @@ async function execute(rawArgs) {
         parsedArgs.h ||
         parsedArgs.help) {
         if (parsedArgs.output !== 'none') {
-            printHelp(await getHelpMode(parsedArgs));
+            await printHelp(await getHelpMode(parsedArgs));
         }
         return;
     }
@@ -546,13 +547,16 @@ function getFirstNonUndefinedArrayItem(arr) {
     }
     return undefined;
 }
-function printHelp(helpMode, exitCode = 0) {
+async function printHelp(helpMode, exitCode = 0) {
     const properties = {};
     if (cli.commandToExecute) {
         properties.command = cli.commandToExecute.name;
         printCommandHelp(helpMode);
     }
     else {
+        if (cli.currentCommandName && !cli.commands.some(command => command.name.startsWith(cli.currentCommandName))) {
+            await cli.error(chalk.red(`Command '${cli.currentCommandName}' was not found. Below you can find the commands and command groups you can use. For detailed information on a command group, use 'm365 [command group] --help'.`));
+        }
         cli.log();
         cli.log(`CLI for Microsoft 365 v${app.packageJson().version}`);
         cli.log(`${app.packageJson().description} `);
@@ -732,7 +736,7 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
     await cli.error(errorMessage);
     if (showHelpIfEnabled &&
         await cli.getSettingWithDefaultValue(settingsNames.showHelpOnFailure, showHelpIfEnabled)) {
-        printHelp(await getHelpMode(args.options), exitCode);
+        await printHelp(await getHelpMode(args.options), exitCode);
     }
     else {
         process.exit(exitCode);
@@ -875,7 +879,8 @@ export const cli = {
 const spinnerOptions = {
     text: 'Running command...',
     /* c8 ignore next 1 */
-    stream: cli.getSettingWithDefaultValue('errorOutput', 'stderr') === 'stderr' ? process.stderr : process.stdout
+    stream: cli.getSettingWithDefaultValue('errorOutput', 'stderr') === 'stderr' ? process.stderr : process.stdout,
+    discardStdin: false
 };
 cli.spinner = ora(spinnerOptions);
 //# sourceMappingURL=cli.js.map

package/dist/m365/commands/setup.js

@@ -73,13 +73,7 @@ class SetupCommand extends AnonymousCommand {
         };
         preferences.experience = await cli.promptForSelection(experienceConfig);
         const summaryConfig = {
-            // invoked by inquirer
-            /* c8 ignore next 6 */
-            message: async () => {
-                settings = this.getSettings(preferences);
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                return this.getSummaryMessage(settings);
-            }
+            message: this.getSummaryMessage(this.getSettings(preferences))
         };
         preferences.summary = await cli.promptForConfirmation(summaryConfig);
         if (preferences.summary) {

package/dist/m365/entra/commands/user/user-list.js

@@ -31,17 +31,22 @@ class EntraUserListCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.USER_LIST, commands.USER_LIST);
         try {
+            const selectProperties = args.options.properties ? args.options.properties : 'id,displayName,mail,userPrincipalName';
+            const allSelectProperties = selectProperties.split(',');
+            const propertiesWithSlash = allSelectProperties.filter(item => item.includes('/'));
+            const fieldExpand = propertiesWithSlash
+                .map(p => `${p.split('/')[0]}($select=${p.split('/')[1]})`)
+                .join(',');
+            const expandParam = fieldExpand.length > 0 ? `&$expand=${fieldExpand}` : '';
+            const selectParam = allSelectProperties.filter(item => !item.includes('/'));
             let filter = '';
-            const properties = args.options.properties ?
-                args.options.properties.split(',').map(p => p.trim()) :
-                ['userPrincipalName', 'displayName'];
             try {
                 filter = this.getFilter(args.options);
             }
             catch (ex) {
                 throw ex;
             }
-            const url = `${this.resource}/v1.0/users?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
+            const url = `${this.resource}/v1.0/users?$select=${selectParam}${expandParam}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
             const users = await odata.getAllItems(url);
             await logger.log(users);
         }
@@ -52,6 +57,7 @@ class EntraUserListCommand extends GraphCommand {
     getFilter(options) {
         const filters = {};
         const excludeOptions = [
+            'type',
             'properties',
             'p',
             'd',
@@ -72,7 +78,10 @@ class EntraUserListCommand extends GraphCommand {
         });
         let filter = Object.keys(filters).map(key => `startsWith(${key}, '${filters[key]}')`).join(' and ');
         if (filter.length > 0) {
-            filter = '$filter=' + filter;
+            filter = `$filter=${filter}`;
+        }
+        if (options.type) {
+            filter += filter.length > 0 ? ` and userType eq '${options.type}'` : `$filter=userType eq '${options.type}'`;
         }
         return filter;
     }
@@ -80,11 +89,15 @@ class EntraUserListCommand extends GraphCommand {
 _EntraUserListCommand_instances = new WeakSet(), _EntraUserListCommand_initTelemetry = function _EntraUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            properties: args.options.properties
+            type: typeof args.options.type !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
         });
     });
 }, _EntraUserListCommand_initOptions = function _EntraUserListCommand_initOptions() {
-    this.options.unshift({ option: '-p, --properties [properties]' });
+    this.options.unshift({
+        option: "--type [type]",
+        autocomplete: ["Member", "Guest"]
+    }, { option: '-p, --properties [properties]' });
 };
 export default new EntraUserListCommand();
 //# sourceMappingURL=user-list.js.map

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

@@ -0,0 +1,115 @@
+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 _SpeContainertypeAddCommand_instances, _SpeContainertypeAddCommand_initTelemetry, _SpeContainertypeAddCommand_initOptions, _SpeContainertypeAddCommand_initValidators;
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpeContainertypeAddCommand extends SpoCommand {
+    get name() {
+        return commands.CONTAINERTYPE_ADD;
+    }
+    get description() {
+        return 'Creates a new Container Type for your app';
+    }
+    constructor() {
+        super();
+        _SpeContainertypeAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpeContainertypeAddCommand_instances, "m", _SpeContainertypeAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpeContainertypeAddCommand_instances, "m", _SpeContainertypeAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpeContainertypeAddCommand_instances, "m", _SpeContainertypeAddCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Creating a new Container Type for your app with name ${args.options.name}`);
+            }
+            const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const requestBody = this.getRequestBody(args.options);
+            const formDigestInfo = await spo.ensureFormDigest(adminUrl, logger, undefined, this.debug);
+            const requestOptions = {
+                url: `${adminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigestInfo.FormDigestValue
+                },
+                data: requestBody
+            };
+            const res = await request.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            const result = json.pop();
+            delete result._ObjectType_;
+            result.SPContainerTypeBillingClassification = args.options.trial ? 'Trial' : 'Standard';
+            result.AzureSubscriptionId = this.replaceString(result.AzureSubscriptionId);
+            result.OwningAppId = this.replaceString(result.OwningAppId);
+            result.OwningTenantId = this.replaceString(result.OwningTenantId);
+            result.ContainerTypeId = this.replaceString(result.ContainerTypeId);
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+    replaceString(s) {
+        return s.replace('/Guid(', '').replace(')/', '');
+    }
+    getRequestBody(options) {
+        if (options.trial) {
+            return `<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="4" ObjectPathId="3" /><Method Name="NewSPOContainerType" Id="5" ObjectPathId="3"><Parameters><Parameter TypeId="{5466648e-c306-441b-9df4-c09deef25cb1}"><Property Name="AzureSubscriptionId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="ContainerTypeId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="CreationDate" Type="Null" /><Property Name="DisplayName" Type="String">${options.name}</Property><Property Name="ExpiryDate" Type="Null" /><Property Name="IsBillingProfileRequired" Type="Boolean">false</Property><Property Name="OwningAppId" Type="Guid">{${options.applicationId}}</Property><Property Name="OwningTenantId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="Region" Type="Null" /><Property Name="ResourceGroup" Type="Null" /><Property Name="SPContainerTypeBillingClassification" Type="Enum">1</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`;
+        }
+        return `<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><Method Name="NewSPOContainerType" Id="4" ObjectPathId="1"><Parameters><Parameter TypeId="{5466648e-c306-441b-9df4-c09deef25cb1}"><Property Name="AzureSubscriptionId" Type="Guid">{${options.azureSubscriptionId}}</Property><Property Name="ContainerTypeId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="CreationDate" Type="Null" /><Property Name="DisplayName" Type="String">${options.name}</Property><Property Name="ExpiryDate" Type="Null" /><Property Name="IsBillingProfileRequired" Type="Boolean">false</Property><Property Name="OwningAppId" Type="Guid">{${options.applicationId}}</Property><Property Name="OwningTenantId" Type="Guid">{00000000-0000-0000-0000-000000000000}</Property><Property Name="Region" Type="String">${options.region}</Property><Property Name="ResourceGroup" Type="String">${options.resourceGroup}</Property><Property Name="SPContainerTypeBillingClassification" Type="Enum">0</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`;
+    }
+}
+_SpeContainertypeAddCommand_instances = new WeakSet(), _SpeContainertypeAddCommand_initTelemetry = function _SpeContainertypeAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            trial: !!args.options.trial,
+            azureSubscriptionId: typeof args.options.azureSubscriptionId !== 'undefined',
+            resourceGroup: typeof args.options.resourceGroup !== 'undefined',
+            region: typeof args.options.region !== 'undefined'
+        });
+    });
+}, _SpeContainertypeAddCommand_initOptions = function _SpeContainertypeAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '--applicationId <applicationId>'
+    }, {
+        option: '--trial'
+    }, {
+        option: '--azureSubscriptionId [azureSubscriptionId]'
+    }, {
+        option: '--resourceGroup [resourceGroup]'
+    }, {
+        option: '--region [region]'
+    });
+}, _SpeContainertypeAddCommand_initValidators = function _SpeContainertypeAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (!validation.isValidGuid(args.options.applicationId)) {
+            return `${args.options.applicationId} is not a valid GUID for option applicationId.`;
+        }
+        if (args.options.trial === undefined && !args.options.azureSubscriptionId) {
+            return 'You must specify the azureSubscriptionId when creating a non-trial environment.';
+        }
+        if (args.options.trial === undefined && !args.options.resourceGroup) {
+            return 'You must specify the resourceGroup when creating a non-trial environment.';
+        }
+        if (args.options.trial === undefined && !args.options.region) {
+            return 'You must specify the region when creating a non-trial environment.';
+        }
+        if (args.options.azureSubscriptionId && !validation.isValidGuid(args.options.azureSubscriptionId)) {
+            return `${args.options.azureSubscriptionId} is not a valid GUID for option azureSubscriptionId.`;
+        }
+        return true;
+    });
+};
+export default new SpeContainertypeAddCommand();
+//# sourceMappingURL=containertype-add.js.map

package/dist/m365/spe/commands.js

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