@pnp/cli-microsoft365 12.0.0-beta.0be7d8d → 12.0.0-beta.1752794

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

@@ -1,15 +1,32 @@
-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 _SpoSiteListCommand_instances, _SpoSiteListCommand_initTelemetry, _SpoSiteListCommand_initOptions, _SpoSiteListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var SiteListType;
+(function (SiteListType) {
+    SiteListType["TeamSite"] = "TeamSite";
+    SiteListType["CommunicationSite"] = "CommunicationSite";
+})(SiteListType || (SiteListType = {}));
+var SiteListState;
+(function (SiteListState) {
+    SiteListState["active"] = "active";
+    SiteListState["fullyArchived"] = "fullyArchived";
+    SiteListState["recentlyArchived"] = "recentlyArchived";
+    SiteListState["archived"] = "archived";
+})(SiteListState || (SiteListState = {}));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: zod.coercedEnum(SiteListType).optional().alias('t'),
+    state: zod.coercedEnum(SiteListState).optional(),
+    webTemplate: z.string().optional(),
+    filter: z.string().optional(),
+    withOneDriveSites: z.boolean().optional()
+});
 class SpoSiteListCommand extends SpoCommand {
     get name() {
         return commands.SITE_LIST;
@@ -20,12 +37,20 @@ class SpoSiteListCommand extends SpoCommand {
     defaultProperties() {
         return ['Title', 'Url'];
     }
-    constructor() {
-        super();
-        _SpoSiteListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteListCommand_instances, "m", _SpoSiteListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(o => !(o.type && o.webTemplate), {
+            message: 'Specify either type or webTemplate, but not both'
+        })
+            .refine(o => !(o.withOneDriveSites && (o.type !== undefined || o.webTemplate !== undefined)), {
+            message: `When using withOneDriveSites, don't specify the type or webTemplate options`
+        })
+            .refine(o => !(o.withOneDriveSites && o.state !== undefined), {
+            message: `When using withOneDriveSites, don't specify the state option`
+        });
     }
     alias() {
         return [commands.SITE_LIST];
@@ -34,13 +59,14 @@ class SpoSiteListCommand extends SpoCommand {
         const webTemplate = this.getWebTemplateId(args.options);
         const includeOneDriveSites = args.options.withOneDriveSites || false;
         const personalSite = includeOneDriveSites === false ? '0' : '1';
+        const effectiveFilter = this.buildFilter(args.options);
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            await this.getAllSites(spoAdminUrl, formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
+            await this.getAllSites(spoAdminUrl, formatting.escapeXml(effectiveFilter), '0', personalSite, webTemplate, undefined, logger);
             await logger.log(this.allSites);
         }
         catch (err) {
@@ -88,43 +114,28 @@ class SpoSiteListCommand extends SpoCommand {
                 return '';
         }
     }
-}
-_SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry = function _SpoSiteListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            webTemplate: args.options.webTemplate,
-            type: args.options.type,
-            filter: (!(!args.options.filter)).toString(),
-            withOneDriveSites: typeof args.options.withOneDriveSites !== 'undefined'
-        });
-    });
-}, _SpoSiteListCommand_initOptions = function _SpoSiteListCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['TeamSite', 'CommunicationSite']
-    }, {
-        option: '--webTemplate [webTemplate]'
-    }, {
-        option: '--filter [filter]'
-    }, {
-        option: '--withOneDriveSites'
-    });
-}, _SpoSiteListCommand_initValidators = function _SpoSiteListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type && args.options.webTemplate) {
-            return 'Specify either type or webTemplate, but not both';
+    buildFilter(options) {
+        const providedFilter = options.filter || '';
+        let stateFilter = '';
+        switch (options.state) {
+            case 'active':
+                stateFilter = `ArchiveStatus -eq 'NotArchived'`;
+                break;
+            case 'fullyArchived':
+                stateFilter = `ArchiveStatus -eq 'FullyArchived'`;
+                break;
+            case 'recentlyArchived':
+                stateFilter = `ArchiveStatus -eq 'RecentlyArchived'`;
+                break;
+            case 'archived':
+                stateFilter = `ArchiveStatus -ne 'NotArchived'`;
+                break;
         }
-        const typeValues = ['TeamSite', 'CommunicationSite'];
-        if (args.options.type &&
-            typeValues.indexOf(args.options.type) < 0) {
-            return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
+        if (stateFilter && providedFilter) {
+            return `${providedFilter} and ${stateFilter}`;
         }
-        if (args.options.withOneDriveSites
-            && (args.options.type || args.options.webTemplate)) {
-            return 'When using withOneDriveSites, don\'t specify the type or webTemplate options';
-        }
-        return true;
-    });
-};
+        return stateFilter || providedFilter;
+    }
+}
 export default new SpoSiteListCommand();
 //# sourceMappingURL=site-list.js.map

package/dist/m365/spo/commands/site/site-remove.js

@@ -71,7 +71,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
                 }
                 if (isGroupSite) {
                     await this.deleteGroupifiedSite(logger, siteUrl);
-                    if (options.skipRecycleBin) {
+                    if (options.permanent) {
                         let isGroupInRecycleBin = await this.isGroupInEntraRecycleBin(logger, siteDetails.GroupId);
                         let amountOfPolls = 0;
                         while (!isGroupInRecycleBin && amountOfPolls < 20) {
@@ -87,7 +87,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
                 else {
                     await this.deleteNonGroupSite(logger, siteUrl);
                 }
-                if (options.skipRecycleBin) {
+                if (options.permanent) {
                     await this.deleteSiteFromSharePointRecycleBin(logger, siteUrl);
                 }
             }
@@ -191,7 +191,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
 _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelemetry = function _SpoSiteRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            skipRecycleBin: !!args.options.skipRecycleBin,
+            permanent: !!args.options.permanent,
             fromRecycleBin: !!args.options.fromRecycleBin,
             force: !!args.options.force
         });
@@ -200,7 +200,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
-        option: '--skipRecycleBin'
+        option: '--permanent'
     }, {
         option: '--fromRecycleBin'
     }, {
@@ -217,14 +217,14 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         if (rootUrl.toLowerCase() === urlUtil.removeTrailingSlashes(args.options.url.toLowerCase())) {
             return `The root site cannot be deleted.`;
         }
-        if (args.options.fromRecycleBin && args.options.skipRecycleBin) {
-            return 'Specify either fromRecycleBin or skipRecycleBin, but not both.';
+        if (args.options.fromRecycleBin && args.options.permanent) {
+            return 'Specify either fromRecycleBin or permanent, but not both.';
         }
         return true;
     });
 }, _SpoSiteRemoveCommand_initTypes = function _SpoSiteRemoveCommand_initTypes() {
     this.types.string.push('url');
-    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'force');
+    this.types.boolean.push('permanent', 'fromRecycleBin', 'force');
 };
 export default new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map

package/dist/m365/spo/commands/spo-get.js

@@ -1,6 +1,8 @@
 import auth from '../../../Auth.js';
+import { globalOptionsZod } from '../../../Command.js';
 import SpoCommand from '../../base/SpoCommand.js';
 import commands from '../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoGetCommand extends SpoCommand {
     get name() {
         return commands.GET;
@@ -8,6 +10,9 @@ class SpoGetCommand extends SpoCommand {
     get description() {
         return 'Gets the context URL for the root SharePoint site collection and SharePoint tenant admin site';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         const spoContext = {
             SpoUrl: auth.connection.spoUrl ? auth.connection.spoUrl : ''

package/dist/m365/spo/commands/spo-set.js

@@ -1,14 +1,16 @@
-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 _SpoSetCommand_instances, _SpoSetCommand_initOptions, _SpoSetCommand_initValidators, _SpoSetCommand_initTypes;
 import auth from '../../../Auth.js';
+import { globalOptionsZod } from '../../../Command.js';
 import { urlUtil } from '../../../utils/urlUtil.js';
 import { validation } from '../../../utils/validation.js';
 import SpoCommand from '../../base/SpoCommand.js';
 import commands from '../commands.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().alias('u').refine(url => validation.isValidSharePointUrl(url) === true, {
+        message: 'Specify a valid SharePoint URL'
+    })
+});
 class SpoSetCommand extends SpoCommand {
     get name() {
         return commands.SET;
@@ -16,12 +18,8 @@ class SpoSetCommand extends SpoCommand {
     get description() {
         return 'Sets the URL of the root SharePoint site collection for use in SPO commands';
     }
-    constructor() {
-        super();
-        _SpoSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         auth.connection.spoUrl = urlUtil.removeTrailingSlashes(args.options.url);
@@ -33,14 +31,5 @@ class SpoSetCommand extends SpoCommand {
         }
     }
 }
-_SpoSetCommand_instances = new WeakSet(), _SpoSetCommand_initOptions = function _SpoSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    });
-}, _SpoSetCommand_initValidators = function _SpoSetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-}, _SpoSetCommand_initTypes = function _SpoSetCommand_initTypes() {
-    this.types.string.push('url');
-};
 export default new SpoSetCommand();
 //# sourceMappingURL=spo-set.js.map

package/dist/m365/spo/commands/storageentity/storageentity-get.js

@@ -1,14 +1,21 @@
-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 _SpoStorageEntityGetCommand_instances, _SpoStorageEntityGetCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    key: z.string().alias('k'),
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u')
+});
 class SpoStorageEntityGetCommand extends SpoCommand {
     get name() {
         return commands.STORAGEENTITY_GET;
@@ -16,16 +23,20 @@ class SpoStorageEntityGetCommand extends SpoCommand {
     get description() {
         return 'Gets details for the specified tenant property';
     }
-    constructor() {
-        super();
-        _SpoStorageEntityGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityGetCommand_instances, "m", _SpoStorageEntityGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
-            const spoUrl = await spo.getSpoUrl(logger, this.debug);
+            let appCatalogUrl = args.options.appCatalogUrl;
+            if (!appCatalogUrl) {
+                appCatalogUrl = await spo.getTenantAppCatalogUrl(logger, this.debug);
+                if (!appCatalogUrl) {
+                    throw 'Tenant app catalog URL not found. Specify the URL of the app catalog site using the appCatalogUrl option.';
+                }
+            }
             const requestOptions = {
-                url: `${spoUrl}/_api/web/GetStorageEntity('${formatting.encodeQueryParameter(args.options.key)}')`,
+                url: `${appCatalogUrl}/_api/web/GetStorageEntity('${formatting.encodeQueryParameter(args.options.key)}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
@@ -51,10 +62,5 @@ class SpoStorageEntityGetCommand extends SpoCommand {
         }
     }
 }
-_SpoStorageEntityGetCommand_instances = new WeakSet(), _SpoStorageEntityGetCommand_initOptions = function _SpoStorageEntityGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-k, --key <key>'
-    });
-};
 export default new SpoStorageEntityGetCommand();
 //# sourceMappingURL=storageentity-get.js.map

package/dist/m365/spo/commands/storageentity/storageentity-list.js

@@ -1,13 +1,19 @@
-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 _SpoStorageEntityListCommand_instances, _SpoStorageEntityListCommand_initOptions, _SpoStorageEntityListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.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';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u')
+});
 class SpoStorageEntityListCommand extends SpoCommand {
     get name() {
         return commands.STORAGEENTITY_LIST;
@@ -15,30 +21,35 @@ class SpoStorageEntityListCommand extends SpoCommand {
     get description() {
         return 'Lists tenant properties stored on the specified SharePoint Online app catalog';
     }
-    constructor() {
-        super();
-        _SpoStorageEntityListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityListCommand_instances, "m", _SpoStorageEntityListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityListCommand_instances, "m", _SpoStorageEntityListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving details for all tenant properties in ${args.options.appCatalogUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.appCatalogUrl}/_api/web/AllProperties?$select=storageentitiesindex`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
         try {
+            let appCatalogUrl = args.options.appCatalogUrl;
+            if (!appCatalogUrl) {
+                appCatalogUrl = await spo.getTenantAppCatalogUrl(logger, this.debug);
+                if (!appCatalogUrl) {
+                    throw 'Tenant app catalog URL not found. Specify the URL of the app catalog site using the appCatalogUrl option.';
+                }
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving details for all tenant properties in ${appCatalogUrl}...`);
+            }
+            const requestOptions = {
+                url: `${appCatalogUrl}/_api/web/AllProperties?$select=storageentitiesindex`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
             const web = await request.get(requestOptions);
             if (!web.storageentitiesindex ||
                 web.storageentitiesindex.trim().length === 0) {
                 if (this.verbose) {
                     await logger.logToStderr('No tenant properties found');
                 }
+                await logger.log([]);
             }
             else {
                 const properties = JSON.parse(web.storageentitiesindex);
@@ -47,17 +58,16 @@ class SpoStorageEntityListCommand extends SpoCommand {
                     if (this.verbose) {
                         await logger.logToStderr('No tenant properties found');
                     }
+                    await logger.log([]);
                 }
                 else {
-                    await logger.log(keys.map((key) => {
-                        const property = properties[key];
-                        return {
-                            Key: key,
-                            Value: property.Value,
-                            Description: property.Description,
-                            Comment: property.Comment
-                        };
+                    const result = keys.map(key => ({
+                        Key: key,
+                        Value: properties[key].Value,
+                        Description: properties[key].Description,
+                        Comment: properties[key].Comment
                     }));
+                    await logger.log(result);
                 }
             }
         }
@@ -66,12 +76,5 @@ class SpoStorageEntityListCommand extends SpoCommand {
         }
     }
 }
-_SpoStorageEntityListCommand_instances = new WeakSet(), _SpoStorageEntityListCommand_initOptions = function _SpoStorageEntityListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --appCatalogUrl <appCatalogUrl>'
-    });
-}, _SpoStorageEntityListCommand_initValidators = function _SpoStorageEntityListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.appCatalogUrl));
-};
 export default new SpoStorageEntityListCommand();
 //# sourceMappingURL=storageentity-list.js.map

package/dist/m365/spo/commands/storageentity/storageentity-remove.js

@@ -1,17 +1,24 @@
-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 _SpoStorageEntityRemoveCommand_instances, _SpoStorageEntityRemoveCommand_initTelemetry, _SpoStorageEntityRemoveCommand_initOptions, _SpoStorageEntityRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u'),
+    key: z.string().alias('k'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoStorageEntityRemoveCommand extends SpoCommand {
     get name() {
         return commands.STORAGEENTITY_REMOVE;
@@ -19,12 +26,8 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes tenant property stored on the specified SharePoint Online app catalog';
     }
-    constructor() {
-        super();
-        _SpoStorageEntityRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityRemoveCommand_instances, "m", _SpoStorageEntityRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityRemoveCommand_instances, "m", _SpoStorageEntityRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityRemoveCommand_instances, "m", _SpoStorageEntityRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -38,10 +41,17 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
         }
     }
     async removeTenantProperty(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Removing tenant property ${args.options.key} from ${args.options.appCatalogUrl}...`);
-        }
         try {
+            let appCatalogUrl = args.options.appCatalogUrl;
+            if (!appCatalogUrl) {
+                appCatalogUrl = await spo.getTenantAppCatalogUrl(logger, this.debug);
+                if (!appCatalogUrl) {
+                    throw 'Tenant app catalog URL not found. Specify the URL of the app catalog site using the appCatalogUrl option.';
+                }
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Removing tenant property ${args.options.key} from ${appCatalogUrl}...`);
+            }
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const digestInfo = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
@@ -49,7 +59,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
                 headers: {
                     'X-RequestDigest': digestInfo.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="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
+                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="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
             };
             const processQuery = await request.post(requestOptions);
             const json = JSON.parse(processQuery);
@@ -63,22 +73,5 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemoveCommand_initTelemetry = function _SpoStorageEntityRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoStorageEntityRemoveCommand_initOptions = function _SpoStorageEntityRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --appCatalogUrl <appCatalogUrl>'
-    }, {
-        option: '-k, --key <key>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoStorageEntityRemoveCommand_initValidators = function _SpoStorageEntityRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.appCatalogUrl));
-};
 export default new SpoStorageEntityRemoveCommand();
 //# sourceMappingURL=storageentity-remove.js.map