@pnp/cli-microsoft365 7.0.0-beta.4ebf3ad → 7.0.0-beta.5fdb9e3

package/dist/m365/pa/commands.js

@@ -6,7 +6,9 @@ export default {
     APP_REMOVE: `${prefix} app remove`,
     APP_CONSENT_SET: `${prefix} app consent set`,
     APP_OWNER_SET: `${prefix} app owner set`,
+    APP_PERMISSION_ENSURE: `${prefix} app permission ensure`,
     APP_PERMISSION_LIST: `${prefix} app permission list`,
+    APP_PERMISSION_REMOVE: `${prefix} app permission remove`,
     CONNECTOR_EXPORT: `${prefix} connector export`,
     CONNECTOR_LIST: `${prefix} connector list`,
     ENVIRONMENT_GET: `${prefix} environment get`,

package/dist/m365/planner/commands/bucket/bucket-add.js

@@ -59,8 +59,8 @@ class PlannerBucketAddCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(args.options.rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(args.options.rosterId);
+        return plan.id;
     }
     async getGroupId(args) {
         if (args.options.ownerGroupId) {

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -68,8 +68,8 @@ class PlannerBucketGetCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(rosterId);
+        return plan.id;
     }
     async getBucketById(id) {
         const requestOptions = {

package/dist/m365/planner/commands/bucket/bucket-list.js

@@ -47,8 +47,8 @@ class PlannerBucketListCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(args.options.planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(args.options.rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(args.options.rosterId);
+        return plan.id;
     }
     async getGroupId(args) {
         if (args.options.ownerGroupId) {

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -98,8 +98,8 @@ class PlannerBucketRemoveCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(rosterId);
+        return plan.id;
     }
     async getGroupId(args) {
         const { ownerGroupId, ownerGroupName } = args.options;

package/dist/m365/planner/commands/bucket/bucket-set.js

@@ -89,8 +89,8 @@ class PlannerBucketSetCommand extends GraphCommand {
             const plan = await planner.getPlanByTitle(planTitle, groupId);
             return plan.id;
         }
-        const plans = await planner.getPlansByRosterId(rosterId);
-        return plans[0].id;
+        const plan = await planner.getPlanByRosterId(rosterId);
+        return plan.id;
     }
     async getGroupId(args) {
         const { ownerGroupId, ownerGroupName } = args.options;

package/dist/m365/planner/commands/plan/plan-get.js

@@ -38,8 +38,7 @@ class PlannerPlanGetCommand extends GraphCommand {
             else {
                 let plan = {};
                 if (args.options.rosterId) {
-                    const plans = await planner.getPlansByRosterId(args.options.rosterId);
-                    plan = plans[0];
+                    plan = await planner.getPlanByRosterId(args.options.rosterId);
                 }
                 else {
                     let groupId = undefined;

package/dist/m365/planner/commands/plan/plan-list.js

@@ -29,17 +29,16 @@ class PlannerPlanListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            let plannerPlans = null;
+            let plannerPlans = [];
             if (args.options.ownerGroupId || args.options.ownerGroupName) {
                 const groupId = await this.getGroupId(args);
                 plannerPlans = await planner.getPlansByGroupId(groupId);
             }
             else {
-                plannerPlans = await planner.getPlansByRosterId(args.options.rosterId);
-            }
-            if (plannerPlans && plannerPlans.length > 0) {
-                await logger.log(plannerPlans);
+                const plan = await planner.getPlanByRosterId(args.options.rosterId);
+                plannerPlans.push(plan);
             }
+            await logger.log(plannerPlans);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/planner/commands/plan/plan-set.js

@@ -47,8 +47,8 @@ class PlannerPlanSetCommand extends GraphCommand {
         }
         let groupId = '';
         if (args.options.rosterId) {
-            const plans = await planner.getPlansByRosterId(args.options.rosterId);
-            return plans[0].id;
+            const plan = await planner.getPlanByRosterId(args.options.rosterId);
+            return plan.id;
         }
         else {
             groupId = await this.getGroupId(args);

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.18.0-beta.1.js → doctor-1.18.0-beta.5.js}

@@ -18,4 +18,4 @@ export default [
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
 ];
-//# sourceMappingURL=doctor-1.18.0-beta.1.js.map
+//# sourceMappingURL=doctor-1.18.0-beta.5.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -67,7 +67,7 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-externalize/rules/PnPJsRule.js

@@ -42,7 +42,7 @@ export class PnPJsRule extends BasicDependencyRule {
             }
         ];
     }
-    visit(project) {
+    async visit(project) {
         const findings = this.pnpModules
             .map(x => this.getModuleAndParents(project, x.key))
             .reduce((x, y) => [...x, ...y]);
@@ -67,7 +67,7 @@ export class PnPJsRule extends BasicDependencyRule {
                 targetValue: 'require(\"tslib\");'
             })));
         }
-        return Promise.resolve({ entries: findings, suggestions: fileEdits });
+        return { entries: findings, suggestions: fileEdits };
     }
     getEntryFilesList(project) {
         return project && project.manifests ? project.manifests.map(x => x.path.replace('.manifest.json', '.ts')) : [];

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.2.js

@@ -103,7 +103,7 @@ export default [
                 'fixWith': 'symbol'
               },
               'Function': {
-                'message': 'The \\'Function\\' type accepts any function-like value.\nIt provides no type safety when calling the function, which can be a common source of bugs.\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \'new\'.\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
+                'message': 'The \\'Function\\' type accepts any function-like value.\\nIt provides no type safety when calling the function, which can be a common source of bugs.\\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \\'new\\'.\\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
               }
             }
           }

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.18.0-beta.1.js → upgrade-1.18.0-beta.5.js}

@@ -27,33 +27,33 @@ import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_D
 import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
 import { FN010010_YORC_sdkVersions_teams_js } from './rules/FN010010_YORC_sdkVersions_teams_js.js';
 export default [
-    new FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.1'),
-    new FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.1'),
-    new FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.1'),
-    new FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.1'),
+    new FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.5'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.5'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.5'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.5'),
+    new FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.5'),
+    new FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.5'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.5'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.5'),
     new FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.1'),
-    new FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.1'),
-    new FN001027_DEP_microsoft_sp_http('1.18.0-beta.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.1'),
-    new FN001029_DEP_microsoft_sp_loader('1.18.0-beta.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.1'),
-    new FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.1'),
+    new FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.5'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.5'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.5'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.5'),
+    new FN001027_DEP_microsoft_sp_http('1.18.0-beta.5'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.5'),
+    new FN001029_DEP_microsoft_sp_loader('1.18.0-beta.5'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.5'),
+    new FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.5'),
     new FN001035_DEP_fluentui_react('8.106.4'),
-    new FN001013_DEP_microsoft_decorators('1.18.0-beta.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.1'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN010001_YORC_version('1.18.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators('1.18.0-beta.5'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.5'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.5'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.5'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.5'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN010001_YORC_version('1.18.0-beta.5'),
     new FN010010_YORC_sdkVersions_teams_js('2.12.0')
 ];
-//# sourceMappingURL=upgrade-1.18.0-beta.1.js.map
+//# sourceMappingURL=upgrade-1.18.0-beta.5.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -71,7 +71,7 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -524,14 +524,14 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.0-beta.1': {
+            '1.18.0-beta.5': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
-                    range: '>=16.13.0 <17.0.0',
-                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                    range: '>=16.14.0 <17.0.0',
+                    fix: 'Install Node.js >=16.14.0 <17.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {
@@ -603,31 +603,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             this.handleRejectedPromise(err);
         }
     }
-    checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
-        return new Promise(async (resolve, reject) => {
-            if (args.options.env) {
-                const sp = this.spVersionStringToEnum(args.options.env);
-                if ((prerequisites.sp & sp) === sp) {
-                    await logger.log(formatting.getStatus(CheckStatus.Success, `Supported in ${SharePointVersion[sp]}`));
-                    resolve();
-                }
-                else {
-                    await logger.log(formatting.getStatus(CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
-                    fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
-                    reject(`SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`);
-                }
-            }
-            else {
-                resolve();
+    async checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
+        if (args.options.env) {
+            const sp = this.spVersionStringToEnum(args.options.env);
+            if ((prerequisites.sp & sp) === sp) {
+                await logger.log(formatting.getStatus(CheckStatus.Success, `Supported in ${SharePointVersion[sp]}`));
+                return;
             }
-        });
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
+            fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
+            throw `SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`;
+        }
     }
-    checkNodeVersion(prerequisites, fixes, logger) {
-        return Promise
-            .resolve(this.getNodeVersion())
-            .then((nodeVersion) => {
-            this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
-        });
+    async checkNodeVersion(prerequisites, fixes, logger) {
+        const nodeVersion = this.getNodeVersion();
+        this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
     }
     async checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
         let spfxVersionDetected = await this.getSPFxVersionFromYoRcFile(logger);
@@ -646,54 +636,42 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             fixes.push(versionCheck.fix);
         }
     }
-    checkYo(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (yoVersion) => {
-            if (yoVersion) {
-                this.checkStatus('yo', yoVersion, prerequisites.yo, OptionalOrRequired.Required, fixes, logger);
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `yo not found`));
-                fixes.push(prerequisites.yo.fix);
-            }
-        });
+    async checkYo(prerequisites, fixes, logger) {
+        const yoVersion = await this.getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (yoVersion) {
+            this.checkStatus('yo', yoVersion, prerequisites.yo, OptionalOrRequired.Required, fixes, logger);
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `yo not found`));
+            fixes.push(prerequisites.yo.fix);
+        }
     }
-    checkGulpCli(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (gulpCliVersion) => {
-            if (gulpCliVersion) {
-                this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp-cli not found`));
-                fixes.push(prerequisites.gulpCli.fix);
-            }
-        });
+    async checkGulpCli(prerequisites, fixes, logger) {
+        const gulpCliVersion = await this.getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (gulpCliVersion) {
+            this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp-cli not found`));
+            fixes.push(prerequisites.gulpCli.fix);
+        }
     }
-    checkGulp(fixes, logger) {
-        return this
-            .getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then(async (gulpVersion) => {
-            if (gulpVersion) {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp should be removed`));
-                fixes.push('npm un -g gulp');
-            }
-        });
+    async checkGulp(fixes, logger) {
+        const gulpVersion = await this.getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
+        if (gulpVersion) {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `gulp should be removed`));
+            fixes.push('npm un -g gulp');
+        }
     }
-    checkTypeScript(fixes, logger) {
-        return this
-            .getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger)
-            .then(async (typeScriptVersion) => {
-            if (typeScriptVersion) {
-                await logger.log(formatting.getStatus(CheckStatus.Failure, `typescript v${typeScriptVersion} installed in the project`));
-                fixes.push('npm un typescript');
-            }
-            else {
-                await logger.log(formatting.getStatus(CheckStatus.Success, `bundled typescript used`));
-            }
-        });
+    async checkTypeScript(fixes, logger) {
+        const typeScriptVersion = await this.getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger);
+        if (typeScriptVersion) {
+            await logger.log(formatting.getStatus(CheckStatus.Failure, `typescript v${typeScriptVersion} installed in the project`));
+            fixes.push('npm un typescript');
+        }
+        else {
+            await logger.log(formatting.getStatus(CheckStatus.Success, `bundled typescript used`));
+        }
     }
     spVersionStringToEnum(sp) {
         return SharePointVersion[sp.toUpperCase()];
@@ -742,43 +720,35 @@ class SpfxDoctorCommand extends BaseProjectCommand {
             }
         }
     }
-    getPackageVersion(packageName, searchMode, handlePromise, logger) {
-        return new Promise((resolve, reject) => {
-            const args = ['ls', packageName, '--depth=0', '--json'];
-            if (searchMode === PackageSearchMode.GlobalOnly) {
+    async getPackageVersion(packageName, searchMode, handlePromise, logger) {
+        const args = ['ls', packageName, '--depth=0', '--json'];
+        if (searchMode === PackageSearchMode.GlobalOnly) {
+            args.push('-g');
+        }
+        let version;
+        try {
+            version = await this.getPackageVersionFromNpm(args, logger);
+        }
+        catch {
+            if (searchMode === PackageSearchMode.LocalAndGlobal) {
                 args.push('-g');
+                version = await this.getPackageVersionFromNpm(args, logger);
             }
-            this
-                .getPackageVersionFromNpm(args, logger)
-                .then((version) => {
-                return Promise.resolve(version);
-            })
-                .catch(() => {
-                if (searchMode === PackageSearchMode.LocalAndGlobal) {
-                    args.push('-g');
-                    return this.getPackageVersionFromNpm(args, logger);
-                }
-                else {
-                    return Promise.resolve('');
-                }
-            })
-                .then((version) => {
-                if (version) {
-                    resolve(version);
-                }
-                else {
-                    if (handlePromise === HandlePromise.Continue) {
-                        resolve('');
-                    }
-                    else {
-                        reject();
-                    }
-                }
-            })
-                .catch((err) => {
-                reject(err);
-            });
-        });
+            else {
+                version = '';
+            }
+        }
+        if (version) {
+            return version;
+        }
+        else {
+            if (handlePromise === HandlePromise.Continue) {
+                return '';
+            }
+            else {
+                throw new Error();
+            }
+        }
     }
     getPackageVersionFromNpm(args, logger) {
         return new Promise(async (resolve, reject) => {

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -1,33 +1,34 @@
 import request from '../../../../request.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 export class SpoAppBaseCommand extends SpoCommand {
-    getAppCatalogSiteUrl(logger, authSiteUrl, args) {
-        return new Promise((resolve, reject) => {
-            if (args.options.appCatalogScope === 'sitecollection') {
-                return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
+    async getAppCatalogSiteUrl(logger, authSiteUrl, args) {
+        if (args.options.appCatalogScope === 'sitecollection') {
+            // trim trailing slashes if there are any
+            const appCatalogUrl = args.options.appCatalogUrl.replace(/\/$/, '');
+            const appCatalogUrlChunks = appCatalogUrl.split('/');
+            // Trim the last part of the URL if it ends on '/appcatalog', but don't trim it if the site URL is called like that (/sites/appcatalog).
+            if (appCatalogUrl.toLowerCase().endsWith('/appcatalog') && appCatalogUrlChunks.length !== 5) {
+                return appCatalogUrl.substring(0, appCatalogUrl.lastIndexOf('/'));
             }
-            if (args.options.appCatalogUrl) {
-                return resolve(args.options.appCatalogUrl);
-            }
-            const requestOptions = {
-                url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request
-                .get(requestOptions)
-                .then((res) => {
-                if (res.CorporateCatalogUrl) {
-                    return resolve(res.CorporateCatalogUrl);
-                }
-                reject('Tenant app catalog is not configured.');
-            })
-                .catch((err) => {
-                reject(err);
-            });
-        });
+        }
+        if (args.options.appCatalogUrl) {
+            return args.options.appCatalogUrl.replace(/\/$/, '');
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Getting tenant app catalog url...');
+        }
+        const requestOptions = {
+            url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.CorporateCatalogUrl) {
+            return response.CorporateCatalogUrl;
+        }
+        throw new Error('Tenant app catalog is not configured.');
     }
 }
 //# sourceMappingURL=SpoAppBaseCommand.js.map

package/dist/m365/spo/commands/app/app-add.js

@@ -22,6 +22,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
     constructor() {
         super();
         _SpoAppAddCommand_instances.add(this);
+        this.appCatalogScopeOptions = ['tenant', 'sitecollection'];
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initValidators).call(this);
@@ -62,9 +63,9 @@ class SpoAppAddCommand extends SpoAppBaseCommand {
 _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            overwrite: (!(!args.options.overwrite)).toString(),
+            overwrite: !!args.options.overwrite,
             appCatalogScope: args.options.appCatalogScope || 'tenant',
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
+            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined'
         });
     });
 }, _SpoAppAddCommand_initOptions = function _SpoAppAddCommand_initOptions() {
@@ -72,7 +73,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
         option: '-p, --filePath <filePath>'
     }, {
         option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
+        autocomplete: this.appCatalogScopeOptions
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
@@ -80,14 +81,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     });
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
         if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
+            const appCatalogScope = args.options.appCatalogScope.toLowerCase();
+            if (this.appCatalogScopeOptions.indexOf(appCatalogScope) === -1) {
+                return `${args.options.appCatalogScope} is not a valid appCatalogScope. Allowed values are: ${this.appCatalogScopeOptions.join(', ')}`;
             }
-            if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
+            if (appCatalogScope === 'sitecollection' && !args.options.appCatalogUrl) {
+                return `You must specify appCatalogUrl when appCatalogScope is sitecollection`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);