@pnp/cli-microsoft365 10.8.0-beta.a51d886 → 10.8.0-beta.cdb5c81

package/dist/m365/spe/commands/container/container-remove.js

@@ -0,0 +1,99 @@
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { spe } from '../../../../utils/spe.js';
+import { spo } from '../../../../utils/spo.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import request from '../../../../request.js';
+import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string()).optional(),
+    name: zod.alias('n', z.string()).optional(),
+    containerTypeId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    containerTypeName: z.string().optional(),
+    recycle: z.boolean().optional(),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
+class SpeContainerRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_REMOVE;
+    }
+    get description() {
+        return 'Removes a container';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: id or name.'
+        })
+            .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+        })
+            .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
+            message: 'Options containerTypeId and containerTypeName are only required when deleting a container by name.'
+        });
+    }
+    async commandAction(logger, args) {
+        if (!args.options.force) {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove container '${args.options.id || args.options.name}'${!args.options.recycle ? ' permanently' : ''}?` });
+            if (!result) {
+                return;
+            }
+        }
+        try {
+            const containerId = await this.getContainerId(args.options, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Removing container with ID '${containerId}'...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/storage/fileStorage/containers/${containerId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            if (args.options.recycle) {
+                await request.delete(requestOptions);
+                return;
+            }
+            // Container should be permanently deleted
+            requestOptions.url += '/permanentDelete';
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getContainerId(options, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        const containerTypeId = await this.getContainerTypeId(options, logger);
+        if (this.verbose) {
+            await logger.logToStderr(`Getting container ID for container with name '${options.name}'...`);
+        }
+        return spe.getContainerIdByName(containerTypeId, options.name);
+    }
+    async getContainerTypeId(options, logger) {
+        if (options.containerTypeId) {
+            return options.containerTypeId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
+        }
+        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+    }
+}
+export default new SpeContainerRemoveCommand();
+//# sourceMappingURL=container-remove.js.map

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

@@ -3,14 +3,14 @@ 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 _SpeContainertypeAddCommand_instances, _SpeContainertypeAddCommand_initTelemetry, _SpeContainertypeAddCommand_initOptions, _SpeContainertypeAddCommand_initValidators;
+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 {
+class SpeContainerTypeAddCommand extends SpoCommand {
     get name() {
         return commands.CONTAINERTYPE_ADD;
     }
@@ -19,10 +19,10 @@ class SpeContainertypeAddCommand extends SpoCommand {
     }
     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);
+        _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 {
@@ -55,7 +55,7 @@ class SpeContainertypeAddCommand extends SpoCommand {
             await logger.log(result);
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
     replaceString(s) {
@@ -68,7 +68,7 @@ class SpeContainertypeAddCommand extends SpoCommand {
         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() {
+_SpeContainerTypeAddCommand_instances = new WeakSet(), _SpeContainerTypeAddCommand_initTelemetry = function _SpeContainerTypeAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             trial: !!args.options.trial,
@@ -77,7 +77,7 @@ _SpeContainertypeAddCommand_instances = new WeakSet(), _SpeContainertypeAddComma
             region: typeof args.options.region !== 'undefined'
         });
     });
-}, _SpeContainertypeAddCommand_initOptions = function _SpeContainertypeAddCommand_initOptions() {
+}, _SpeContainerTypeAddCommand_initOptions = function _SpeContainerTypeAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
@@ -91,7 +91,7 @@ _SpeContainertypeAddCommand_instances = new WeakSet(), _SpeContainertypeAddComma
     }, {
         option: '--region [region]'
     });
-}, _SpeContainertypeAddCommand_initValidators = function _SpeContainertypeAddCommand_initValidators() {
+}, _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.`;
@@ -111,5 +111,5 @@ _SpeContainertypeAddCommand_instances = new WeakSet(), _SpeContainertypeAddComma
         return true;
     });
 };
-export default new SpeContainertypeAddCommand();
+export default new SpeContainerTypeAddCommand();
 //# sourceMappingURL=containertype-add.js.map

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

@@ -3,14 +3,15 @@ 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 _SpeContainertypeGetCommand_instances, _SpeContainertypeGetCommand_initTelemetry, _SpeContainertypeGetCommand_initOptions, _SpeContainertypeGetCommand_initOptionSets, _SpeContainertypeGetCommand_initValidators, _SpeContainertypeGetCommand_initTypes;
+var _SpeContainerTypeGetCommand_instances, _SpeContainerTypeGetCommand_initTelemetry, _SpeContainerTypeGetCommand_initOptions, _SpeContainerTypeGetCommand_initOptionSets, _SpeContainerTypeGetCommand_initValidators, _SpeContainerTypeGetCommand_initTypes;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
+import { spe } from '../../../../utils/spe.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 SpeContainertypeGetCommand extends SpoCommand {
+class SpeContainerTypeGetCommand extends SpoCommand {
     get name() {
         return commands.CONTAINERTYPE_GET;
     }
@@ -19,85 +20,80 @@ class SpeContainertypeGetCommand extends SpoCommand {
     }
     constructor() {
         super();
-        _SpeContainertypeGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpeContainertypeGetCommand_instances, "m", _SpeContainertypeGetCommand_initTypes).call(this);
+        _SpeContainerTypeGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpeContainerTypeGetCommand_instances, "m", _SpeContainerTypeGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            if (this.verbose) {
-                await logger.logToStderr(`Getting the Container type...`);
-            }
             const containerTypeId = await this.getContainerTypeId(args.options, spoAdminUrl, logger);
-            const allContainerTypes = await this.getContainerTypeById(containerTypeId, spoAdminUrl, logger);
-            await logger.log(allContainerTypes);
+            const containerType = await this.getContainerTypeById(containerTypeId, spoAdminUrl, logger);
+            await logger.log(containerType);
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
     async getContainerTypeById(containerTypeId, spoAdminUrl, logger) {
-        const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
+        if (this.verbose) {
+            await logger.logToStderr(`Getting the Container type...`);
+        }
         const requestOptions = {
             url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {
-                'X-RequestDigest': formDigestInfo.FormDigestValue
+                accept: 'application/json;odata=nometadata'
             },
+            responseType: 'json',
             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="49" ObjectPathId="48" /><Method Name="GetSPOContainerTypeById" Id="50" ObjectPathId="48"><Parameters><Parameter Type="Guid">{${containerTypeId}}</Parameter><Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="48" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
         };
         const res = await request.post(requestOptions);
-        const json = JSON.parse(res);
-        const response = json[0];
+        const response = res[0];
         if (response.ErrorInfo) {
             throw response.ErrorInfo.ErrorMessage;
         }
-        const containerTypes = json[json.length - 1];
+        const containerTypes = res[res.length - 1];
         return containerTypes;
     }
     async getContainerTypeId(options, spoAdminUrl, logger) {
         if (options.id) {
             return options.id;
         }
-        const containerTypes = await spo.getAllContainerTypes(spoAdminUrl, logger, this.debug);
-        // Get id of the container type by name
-        const containerType = containerTypes.find(c => c.DisplayName === options.name);
-        if (!containerType) {
-            throw new Error(`Container type with name ${options.name} not found`);
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving container type id for container type '${options.containerTypeName}'...`);
         }
-        const match = containerType.ContainerTypeId.match(/\/Guid\(([^)]+)\)\//);
-        return match[1];
+        return spe.getContainerTypeIdByName(spoAdminUrl, options.name);
     }
 }
-_SpeContainertypeGetCommand_instances = new WeakSet(), _SpeContainertypeGetCommand_initTelemetry = function _SpeContainertypeGetCommand_initTelemetry() {
+_SpeContainerTypeGetCommand_instances = new WeakSet(), _SpeContainerTypeGetCommand_initTelemetry = function _SpeContainerTypeGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined'
         });
     });
-}, _SpeContainertypeGetCommand_initOptions = function _SpeContainertypeGetCommand_initOptions() {
+}, _SpeContainerTypeGetCommand_initOptions = function _SpeContainerTypeGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
     });
-}, _SpeContainertypeGetCommand_initOptionSets = function _SpeContainertypeGetCommand_initOptionSets() {
+}, _SpeContainerTypeGetCommand_initOptionSets = function _SpeContainerTypeGetCommand_initOptionSets() {
     this.optionSets.push({
         options: ['id', 'name']
     });
-}, _SpeContainertypeGetCommand_initValidators = function _SpeContainertypeGetCommand_initValidators() {
+}, _SpeContainerTypeGetCommand_initValidators = function _SpeContainerTypeGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
-}, _SpeContainertypeGetCommand_initTypes = function _SpeContainertypeGetCommand_initTypes() {
+}, _SpeContainerTypeGetCommand_initTypes = function _SpeContainerTypeGetCommand_initTypes() {
     this.types.string.push('id', 'name');
 };
-export default new SpeContainertypeGetCommand();
+export default new SpeContainerTypeGetCommand();
 //# sourceMappingURL=containertype-get.js.map

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

@@ -1,7 +1,8 @@
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { spe } from '../../../../utils/spe.js';
 import { spo } from '../../../../utils/spo.js';
-class SpeContainertypeListCommand extends SpoCommand {
+class SpeContainerTypeListCommand extends SpoCommand {
     get name() {
         return commands.CONTAINERTYPE_LIST;
     }
@@ -17,13 +18,22 @@ class SpeContainertypeListCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving list of Container types...`);
             }
-            const allContainerTypes = await spo.getAllContainerTypes(spoAdminUrl, logger, this.debug);
-            await logger.log(allContainerTypes);
+            const allContainerTypes = await spe.getAllContainerTypes(spoAdminUrl);
+            // The following conversion is done in order not to make breaking changes
+            const result = allContainerTypes.map(ct => ({
+                _ObjectType_: 'Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties',
+                ...ct,
+                AzureSubscriptionId: `/Guid(${ct.AzureSubscriptionId})/`,
+                ContainerTypeId: `/Guid(${ct.ContainerTypeId})/`,
+                OwningAppId: `/Guid(${ct.OwningAppId})/`,
+                OwningTenantId: `/Guid(${ct.OwningTenantId})/`
+            }));
+            await logger.log(result);
         }
         catch (err) {
             this.handleRejectedPromise(err);
         }
     }
 }
-export default new SpeContainertypeListCommand();
+export default new SpeContainerTypeListCommand();
 //# sourceMappingURL=containertype-list.js.map

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

@@ -0,0 +1,81 @@
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+import { spo } from '../../../../utils/spo.js';
+import { spe } from '../../../../utils/spe.js';
+import { cli } from '../../../../cli/cli.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import config from '../../../../config.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    }))
+        .optional()),
+    name: zod.alias('n', z.string().optional()),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
+class SpeContainerTypeRemoveCommand extends SpoCommand {
+    get name() {
+        return commands.CONTAINERTYPE_REMOVE;
+    }
+    get description() {
+        return 'Remove a specific container type';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.id, options.name].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: id, name.'
+        });
+    }
+    async commandAction(logger, args) {
+        if (!args.options.force) {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove container type ${args.options.id || args.options.name}?` });
+            if (!result) {
+                return;
+            }
+        }
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+            const containerTypeId = await this.getContainerTypeId(args.options, spoAdminUrl, logger);
+            const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Removing container type ${args.options.id || args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigestInfo.FormDigestValue
+                },
+                responseType: 'json',
+                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="7" ObjectPathId="6" /><Method Name="RemoveSPOContainerType" Id="8" ObjectPathId="6"><Parameters><Parameter TypeId="{b66ab1ca-fd51-44f9-8cfc-01f5c2a21f99}"><Property Name="ContainerTypeId" Type="Guid">{${containerTypeId}}</Property></Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="6" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const result = await request.post(requestOptions);
+            if (result[0].ErrorInfo) {
+                throw result[0].ErrorInfo.ErrorMessage;
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getContainerTypeId(options, spoAdminUrl, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving container type id for container type '${options.name}'...`);
+        }
+        return spe.getContainerTypeIdByName(spoAdminUrl, options.name);
+    }
+}
+export default new SpeContainerTypeRemoveCommand();
+//# sourceMappingURL=containertype-remove.js.map

package/dist/m365/spe/commands.js

@@ -1,11 +1,15 @@
 const prefix = 'spe';
 export default {
     CONTAINER_ACTIVATE: `${prefix} container activate`,
+    CONTAINER_ADD: `${prefix} container add`,
     CONTAINER_GET: `${prefix} container get`,
     CONTAINER_LIST: `${prefix} container list`,
+    CONTAINER_REMOVE: `${prefix} container remove`,
     CONTAINER_PERMISSION_LIST: `${prefix} container permission list`,
+    CONTAINER_RECYCLEBINITEM_LIST: `${prefix} container recyclebinitem list`,
     CONTAINERTYPE_ADD: `${prefix} containertype add`,
     CONTAINERTYPE_GET: `${prefix} containertype get`,
-    CONTAINERTYPE_LIST: `${prefix} containertype list`
+    CONTAINERTYPE_LIST: `${prefix} containertype list`,
+    CONTAINERTYPE_REMOVE: `${prefix} containertype remove`
 };
 //# sourceMappingURL=commands.js.map

package/dist/utils/entraServicePrincipal.js

@@ -41,6 +41,17 @@ export const entraServicePrincipal = {
             return await cli.handleMultipleResultsFound(`Multiple service principals with name '${appName}' found in Microsoft Entra ID.`, resultAsKeyValuePair);
         }
         return apps[0];
+    },
+    /**
+     * Get all available service principals.
+     * @param properties Comma-separated list of properties to include in the response.
+     */
+    async getServicePrincipals(properties) {
+        let url = `https://graph.microsoft.com/v1.0/servicePrincipals`;
+        if (properties) {
+            url += `?$select=${properties}`;
+        }
+        return odata.getAllItems(url);
     }
 };
 //# sourceMappingURL=entraServicePrincipal.js.map

package/dist/utils/formatting.js

@@ -177,6 +177,18 @@ export const formatting = {
             resultAsKeyValuePair[obj[key]] = obj;
         });
         return resultAsKeyValuePair;
+    },
+    /**
+     * Extracts the GUID from a string in CSOM format.
+     * @param str The string to extract the GUID from
+     * @description The string should be in the format /Guid(XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX)/
+     * @returns The extracted GUID or the original string if no match is found
+     * @example /Guid(eae15efb-ac09-49b9-8906-e579efd622e4)/ => eae15efb-ac09-49b9-8906-e579efd622e4
+     */
+    extractCsomGuid(str) {
+        const guidPattern = /\/Guid\(([0-9a-f-]+)\)\//i;
+        const match = str.match(guidPattern);
+        return match ? match[1] : str;
     }
 };
 //# sourceMappingURL=formatting.js.map

package/dist/utils/spe.js

@@ -0,0 +1,77 @@
+import request from '../request.js';
+import { formatting } from './formatting.js';
+import { cli } from '../cli/cli.js';
+import config from '../config.js';
+import { odata } from './odata.js';
+const graphResource = 'https://graph.microsoft.com';
+export const spe = {
+    /**
+     * Get all container types.
+     * @param spoAdminUrl The URL of the SharePoint Online admin center site (e.g. https://contoso-admin.sharepoint.com)
+     * @returns Array of container types
+     */
+    async getAllContainerTypes(spoAdminUrl) {
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            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 json = await request.post(requestOptions);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw new Error(response.ErrorInfo.ErrorMessage);
+        }
+        const containerTypes = json[json.length - 1];
+        // Format the response to remove CSOM GUIDs and convert them to real GUIDs
+        containerTypes.forEach(ct => {
+            delete ct._ObjectType_;
+            ct.AzureSubscriptionId = formatting.extractCsomGuid(ct.AzureSubscriptionId);
+            ct.ContainerTypeId = formatting.extractCsomGuid(ct.ContainerTypeId);
+            ct.OwningAppId = formatting.extractCsomGuid(ct.OwningAppId);
+            ct.OwningTenantId = formatting.extractCsomGuid(ct.OwningTenantId);
+        });
+        return containerTypes;
+    },
+    /**
+     * Get the ID of a container type by its name.
+     * @param spoAdminUrl SharePoint Online admin center URL (e.g. https://contoso-admin.sharepoint.com)
+     * @param name Name of the container type to search for
+     * @returns ID of the container type
+     */
+    async getContainerTypeIdByName(spoAdminUrl, name) {
+        const allContainerTypes = await this.getAllContainerTypes(spoAdminUrl);
+        const containerTypes = allContainerTypes.filter(ct => ct.DisplayName.toLowerCase() === name.toLowerCase());
+        if (containerTypes.length === 0) {
+            throw new Error(`The specified container type '${name}' does not exist.`);
+        }
+        if (containerTypes.length > 1) {
+            const containerTypeKeyValuePair = formatting.convertArrayToHashTable('ContainerTypeId', containerTypes);
+            const containerType = await cli.handleMultipleResultsFound(`Multiple container types with name '${name}' found.`, containerTypeKeyValuePair);
+            return containerType.ContainerTypeId;
+        }
+        return containerTypes[0].ContainerTypeId;
+    },
+    /**
+     * Get the ID of a container by its name.
+     * @param containerTypeId ID of the container type.
+     * @param name Name of the container to search for.
+     * @returns ID of the container.
+     */
+    async getContainerIdByName(containerTypeId, name) {
+        const containers = await odata.getAllItems(`${graphResource}/v1.0/storage/fileStorage/containers?$filter=containerTypeId eq ${containerTypeId}&$select=id,displayName`);
+        const matchingContainers = containers.filter(c => c.displayName.toLowerCase() === name.toLowerCase());
+        if (matchingContainers.length === 0) {
+            throw new Error(`The specified container '${name}' does not exist.`);
+        }
+        if (matchingContainers.length > 1) {
+            const containerKeyValuePair = formatting.convertArrayToHashTable('id', matchingContainers);
+            const container = await cli.handleMultipleResultsFound(`Multiple containers with name '${name}' found.`, containerKeyValuePair);
+            return container.id;
+        }
+        return matchingContainers[0].id;
+    }
+};
+//# sourceMappingURL=spe.js.map

package/dist/utils/spo.js

@@ -53,24 +53,6 @@ export const spo = {
         };
         return context;
     },
-    async getAllContainerTypes(spoAdminUrl, logger, verbose) {
-        const formDigestInfo = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
-        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 new Error(response.ErrorInfo.ErrorMessage);
-        }
-        const containerTypes = json[json.length - 1];
-        return containerTypes;
-    },
     async waitUntilFinished({ operationId, siteUrl, logger, currentContext, debug, verbose }) {
         const resFormDigest = await spo.ensureFormDigest(siteUrl, logger, currentContext, debug);
         currentContext = resFormDigest;

package/dist/utils/zod.js

@@ -110,16 +110,41 @@ function parseDef(def, options, currentOption) {
         }
     } while (parsedDef);
 }
+function optionToString(optionInfo) {
+    let s = '';
+    if (optionInfo.short) {
+        s += `-${optionInfo.short}, `;
+    }
+    s += `--${optionInfo.long}`;
+    if (optionInfo.type !== 'boolean') {
+        s += ' ';
+        s += optionInfo.required ? '<' : '[';
+        s += optionInfo.long;
+        s += optionInfo.required ? '>' : ']';
+    }
+    return s;
+}
+;
 export const zod = {
     alias(alias, type) {
         type._def.alias = alias;
         return type;
     },
-    schemaToOptions(schema) {
+    schemaToOptionInfo(schema) {
         const options = [];
         parseDef(schema._def, options);
         return options;
     },
+    schemaToOptions(schema) {
+        const optionsInfo = this.schemaToOptionInfo(schema);
+        const options = optionsInfo.map(option => {
+            return {
+                option: optionToString(option),
+                autocomplete: option.autocomplete
+            };
+        });
+        return options;
+    },
     coercedEnum: (e) => z.preprocess(val => {
         const target = String(val)?.toLowerCase();
         for (const k of Object.values(e)) {

package/docs/docs/cmd/adaptivecard/adaptivecard-send.mdx

@@ -17,7 +17,7 @@ m365 adaptivecard send [options]
 : URL where to send the card to.
 
 `-t, --title [title]`
-: Title of the card. Specify either `title` or `card` but not both.
+: Title of the card. If you specify `title` and `card`, the `title` will be merged into the card.
 
 `-d, --description [description]`
 : Contents of the card.