@pnp/cli-microsoft365 10.8.0-beta.708bf27 → 10.8.0-beta.cdb5c81

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

@@ -0,0 +1,85 @@
+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';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string()),
+    description: zod.alias('d', z.string()).optional(),
+    containerTypeId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    containerTypeName: z.string().optional(),
+    ocrEnabled: z.boolean().optional(),
+    itemMajorVersionLimit: z.number()
+        .refine(numb => validation.isValidPositiveInteger(numb), numb => ({
+        message: `'${numb}' is not a valid positive integer.`
+    })).optional(),
+    itemVersioningEnabled: z.boolean().optional()
+})
+    .strict();
+class SpeContainerAddCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_ADD;
+    }
+    get description() {
+        return 'Creates a new container';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: containerTypeId or containerTypeName.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const containerTypeId = await this.getContainerTypeId(args.options, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Creating container with name '${args.options.name}'...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/storage/fileStorage/containers`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    displayName: args.options.name,
+                    description: args.options.description,
+                    containerTypeId: containerTypeId,
+                    settings: {
+                        isOcrEnabled: args.options.ocrEnabled,
+                        itemMajorVersionLimit: args.options.itemMajorVersionLimit,
+                        isItemVersioningEnabled: args.options.itemVersioningEnabled
+                    }
+                }
+            };
+            const container = await request.post(requestOptions);
+            await logger.log(container);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    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 SpeContainerAddCommand();
+//# sourceMappingURL=container-add.js.map

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

@@ -9,6 +9,7 @@ import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { spe } from '../../../../utils/spe.js';
 import { spo } from '../../../../utils/spo.js';
 class SpeContainerListCommand extends GraphCommand {
     get name() {
@@ -47,15 +48,7 @@ class SpeContainerListCommand extends GraphCommand {
             return options.containerTypeId;
         }
         const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        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.containerTypeName);
-        if (!containerType) {
-            throw new Error(`Container type with name ${options.containerTypeName} not found`);
-        }
-        // The value is returned as "/Guid(073269af-f1d2-042d-2ef5-5bdd6ac83115)/". We need to extract the GUID from it.
-        const containerTypeValue = containerType.ContainerTypeId.toString();
-        return containerTypeValue.substring(containerTypeValue.indexOf('(') + 1, containerTypeValue.lastIndexOf(')'));
+        return spe.getContainerTypeIdByName(spoAdminUrl, options.containerTypeName);
     }
 }
 _SpeContainerListCommand_instances = new WeakSet(), _SpeContainerListCommand_initTelemetry = function _SpeContainerListCommand_initTelemetry() {

package/dist/m365/spe/commands/container/container-permission-list.js

@@ -0,0 +1,52 @@
+import { cli } from '../../../../cli/cli.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import commands from '../../commands.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { odata } from '../../../../utils/odata.js';
+import { formatting } from '../../../../utils/formatting.js';
+const options = globalOptionsZod
+    .extend({
+    containerId: zod.alias('i', z.string())
+})
+    .strict();
+class SpeContainerPermissionListCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_PERMISSION_LIST;
+    }
+    get description() {
+        return 'Lists permissions of a SharePoint Embedded Container';
+    }
+    defaultProperties() {
+        return ['id', 'userPrincipalName', 'roles'];
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving permissions of a SharePoint Embedded Container with id '${args.options.containerId}'...`);
+            }
+            const containerPermission = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/containers/${formatting.encodeQueryParameter(args.options.containerId)}/permissions`);
+            if (!cli.shouldTrimOutput(args.options.output)) {
+                await logger.log(containerPermission);
+            }
+            else {
+                await logger.log(containerPermission.map(i => {
+                    return {
+                        id: i.id,
+                        roles: i.roles.join(','),
+                        userPrincipalName: i.grantedToV2.user.userPrincipalName
+                    };
+                }));
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpeContainerPermissionListCommand();
+//# sourceMappingURL=container-permission-list.js.map

package/dist/m365/spe/commands/container/container-recyclebinitem-list.js

@@ -0,0 +1,62 @@
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { spo } from '../../../../utils/spo.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { spe } from '../../../../utils/spe.js';
+import { odata } from '../../../../utils/odata.js';
+const options = globalOptionsZod
+    .extend({
+    containerTypeId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    containerTypeName: z.string().optional()
+})
+    .strict();
+class SpeContainerRecycleBinItemListCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_RECYCLEBINITEM_LIST;
+    }
+    get description() {
+        return 'Lists deleted containers of a specific container type';
+    }
+    get schema() {
+        return options;
+    }
+    defaultProperties() {
+        return ['id', 'displayName'];
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((options) => [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: containerTypeId or containerTypeName.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const containerTypeId = await this.getContainerTypeId(args.options, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving deleted containers of container type with ID '${containerTypeId}'...`);
+            }
+            const deletedContainers = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/deletedContainers?$filter=containerTypeId eq ${containerTypeId}`);
+            await logger.log(deletedContainers);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getContainerTypeId(options, logger) {
+        if (options.containerTypeId) {
+            return options.containerTypeId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving container type id for container type '${options.containerTypeName}'...`);
+        }
+        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+    }
+}
+export default new SpeContainerRecycleBinItemListCommand();
+//# sourceMappingURL=container-recyclebinitem-list.js.map

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