@pnp/cli-microsoft365 6.11.0-beta.6b1d864 → 6.11.0-beta.79a1133

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -0,0 +1,171 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 _SpfxProjectGithubWorkflowAddCommand_instances, _SpfxProjectGithubWorkflowAddCommand_initTelemetry, _SpfxProjectGithubWorkflowAddCommand_initOptions, _SpfxProjectGithubWorkflowAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+const yaml = require("yaml");
+const Command_1 = require("../../../../Command");
+const fsUtil_1 = require("../../../../utils/fsUtil");
+const validation_1 = require("../../../../utils/validation");
+const commands_1 = require("../../commands");
+const DeployWorkflow_1 = require("./DeployWorkflow");
+const base_project_command_1 = require("./base-project-command");
+class SpfxProjectGithubWorkflowAddCommand extends base_project_command_1.BaseProjectCommand {
+    get name() {
+        return commands_1.default.PROJECT_GITHUB_WORKFLOW_ADD;
+    }
+    get description() {
+        return 'Adds a GitHub workflow for a SharePoint Framework project.';
+    }
+    constructor() {
+        super();
+        _SpfxProjectGithubWorkflowAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.projectRootPath = this.getProjectRoot(process.cwd());
+            if (this.projectRootPath === null) {
+                throw new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectGithubWorkflowAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            }
+            const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
+            const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
+            const solutionName = JSON.parse(packageJson).name;
+            if (this.debug) {
+                logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
+            }
+            try {
+                this.updateWorkflow(solutionName, DeployWorkflow_1.workflow, args.options);
+                this.saveWorkflow(DeployWorkflow_1.workflow);
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
+        });
+    }
+    saveWorkflow(workflow) {
+        const githubPath = path.join(this.projectRootPath, '.github');
+        fsUtil_1.fsUtil.ensureDirectory(githubPath);
+        const workflowPath = path.join(githubPath, 'workflows');
+        fsUtil_1.fsUtil.ensureDirectory(workflowPath);
+        const workflowFile = path.join(workflowPath, 'deploy-spfx-solution.yml');
+        fs.writeFileSync(path.resolve(workflowFile), yaml.stringify(workflow), 'utf-8');
+    }
+    updateWorkflow(solutionName, workflow, options) {
+        var _a;
+        workflow.name = workflow.name.replace('{{ name }}', (_a = options.name) !== null && _a !== void 0 ? _a : solutionName);
+        if (options.branchName) {
+            workflow.on.push.branches[0] = options.branchName;
+        }
+        if (options.manuallyTrigger) {
+            // eslint-disable-next-line camelcase
+            workflow.on.workflow_dispatch = null;
+        }
+        if (options.skipFeatureDeployment) {
+            this.getDeployAction(workflow).with.SKIP_FEATURE_DEPLOYMENT = true;
+        }
+        if (options.overwrite) {
+            this.getDeployAction(workflow).with.OVERWRITE = true;
+        }
+        if (options.loginMethod === 'user') {
+            const loginAction = this.getLoginAction(workflow);
+            loginAction.with = {
+                ADMIN_USERNAME: '${{ secrets.ADMIN_USERNAME }}',
+                ADMIN_PASSWORD: '${{ secrets.ADMIN_PASSWORD }}'
+            };
+        }
+        if (options.scope === 'sitecollection') {
+            const deployAction = this.getDeployAction(workflow);
+            deployAction.with.SCOPE = 'sitecollection';
+            deployAction.with.SITE_COLLECTION_URL = options.siteUrl;
+        }
+        if (solutionName) {
+            const deployAction = this.getDeployAction(workflow);
+            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ solutionName }}', solutionName);
+        }
+    }
+    getLoginAction(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.uses && step.uses.indexOf('action-cli-login') >= 0);
+    }
+    getDeployAction(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.uses && step.uses.indexOf('action-cli-deploy') >= 0);
+    }
+    getWorkFlowSteps(workflow) {
+        return workflow.jobs['build-and-deploy'].steps;
+    }
+}
+_SpfxProjectGithubWorkflowAddCommand_instances = new WeakSet(), _SpfxProjectGithubWorkflowAddCommand_initTelemetry = function _SpfxProjectGithubWorkflowAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined',
+            branchName: typeof args.options.branchName !== 'undefined',
+            manuallyTrigger: !!args.options.manuallyTrigger,
+            loginMethod: typeof args.options.loginMethod !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined',
+            skipFeatureDeployment: !!args.options.skipFeatureDeployment,
+            overwrite: !!args.options.overwrite
+        });
+    });
+}, _SpfxProjectGithubWorkflowAddCommand_initOptions = function _SpfxProjectGithubWorkflowAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name [name]'
+    }, {
+        option: '-b, --branchName [branchName]'
+    }, {
+        option: '-m, --manuallyTrigger'
+    }, {
+        option: '-l, --loginMethod [loginMethod]',
+        autocomplete: SpfxProjectGithubWorkflowAddCommand.loginMethod
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: SpfxProjectGithubWorkflowAddCommand.scope
+    }, {
+        option: '-u, --siteUrl [siteUrl]'
+    }, {
+        option: '--skipFeatureDeployment'
+    }, {
+        option: '--overwrite'
+    });
+}, _SpfxProjectGithubWorkflowAddCommand_initValidators = function _SpfxProjectGithubWorkflowAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.scope && args.options.scope === 'sitecollection') {
+            if (!args.options.siteUrl) {
+                return `siteUrl option has to be defined when scope set to ${args.options.scope}`;
+            }
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
+        if (args.options.loginMethod && SpfxProjectGithubWorkflowAddCommand.loginMethod.indexOf(args.options.loginMethod) < 0) {
+            return `${args.options.loginMethod} is not a valid login method. Allowed values are ${SpfxProjectGithubWorkflowAddCommand.loginMethod.join(', ')}`;
+        }
+        if (args.options.scope && SpfxProjectGithubWorkflowAddCommand.scope.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${SpfxProjectGithubWorkflowAddCommand.scope.join(', ')}`;
+        }
+        return true;
+    }));
+};
+SpfxProjectGithubWorkflowAddCommand.loginMethod = ['application', 'user'];
+SpfxProjectGithubWorkflowAddCommand.scope = ['tenant', 'sitecollection'];
+SpfxProjectGithubWorkflowAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
+module.exports = new SpfxProjectGithubWorkflowAddCommand();
+//# sourceMappingURL=project-github-workflow-add.js.map

package/dist/m365/spfx/commands/project/project-github-workflow-model.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=project-github-workflow-model.js.map

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

@@ -105,7 +105,7 @@ module.exports = [
                 '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}

@@ -29,33 +29,33 @@ const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023
 const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
 const FN010010_YORC_sdkVersions_teams_js_1 = require("./rules/FN010010_YORC_sdkVersions_teams_js");
 module.exports = [
-    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.1'),
-    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.1'),
-    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.1'),
-    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.1'),
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.5'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.5'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.5'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.5'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.5'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.5'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.5'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.5'),
     new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.1'),
-    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.1'),
-    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.18.0-beta.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.1'),
-    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.18.0-beta.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.1'),
-    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.5'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.5'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.5'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.5'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.18.0-beta.5'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.5'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.18.0-beta.5'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.5'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.5'),
     new FN001035_DEP_fluentui_react_1.FN001035_DEP_fluentui_react('8.106.4'),
-    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.18.0-beta.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.1'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN010001_YORC_version_1.FN010001_YORC_version('1.18.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.18.0-beta.5'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.5'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.5'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.5'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.5'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.18.0-beta.5'),
     new FN010010_YORC_sdkVersions_teams_js_1.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

@@ -82,7 +82,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '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

@@ -535,14 +535,14 @@ class SpfxDoctorCommand extends base_project_command_1.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: {

package/dist/m365/spfx/commands.js

@@ -6,6 +6,7 @@ exports.default = {
     PACKAGE_GENERATE: `${prefix} package generate`,
     PROJECT_DOCTOR: `${prefix} project doctor`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
+    PROJECT_GITHUB_WORKFLOW_ADD: `${prefix} project github workflow add`,
     PROJECT_PERMISSIONS_GRANT: `${prefix} project permissions grant`,
     PROJECT_RENAME: `${prefix} project rename`,
     PROJECT_UPGRADE: `${prefix} project upgrade`

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

@@ -1,16 +1,34 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpoAppBaseCommand = void 0;
 const request_1 = require("../../../../request");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 class SpoAppBaseCommand extends SpoCommand_1.default {
     getAppCatalogSiteUrl(logger, authSiteUrl, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (args.options.appCatalogScope === 'sitecollection') {
-                return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
+                // 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);
+                return args.options.appCatalogUrl.replace(/\/$/, '');
+            }
+            if (this.verbose) {
+                logger.logToStderr('Getting tenant app catalog url...');
             }
             const requestOptions = {
                 url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
@@ -19,17 +37,11 @@ class SpoAppBaseCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                if (res.CorporateCatalogUrl) {
-                    return resolve(res.CorporateCatalogUrl);
-                }
-                reject('Tenant app catalog is not configured.');
-            })
-                .catch((err) => {
-                reject(err);
-            });
+            const response = yield request_1.default.get(requestOptions);
+            if (response.CorporateCatalogUrl) {
+                return response.CorporateCatalogUrl;
+            }
+            throw new Error('Tenant app catalog is not configured.');
         });
     }
 }

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

@@ -33,6 +33,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.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);
@@ -75,9 +76,9 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.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() {
@@ -85,7 +86,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]'
     }, {
@@ -93,14 +94,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     });
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        // 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);

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

@@ -21,6 +21,12 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+var OrgAssetType;
+(function (OrgAssetType) {
+    OrgAssetType[OrgAssetType["ImageDocumentLibrary"] = 1] = "ImageDocumentLibrary";
+    OrgAssetType[OrgAssetType["OfficeTemplateLibrary"] = 2] = "OfficeTemplateLibrary";
+    OrgAssetType[OrgAssetType["OfficeFontLibrary"] = 4] = "OfficeFontLibrary";
+})(OrgAssetType || (OrgAssetType = {}));
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.ORGASSETSLIBRARY_ADD;
@@ -42,6 +48,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
             const cdnType = cdnTypeString === 'Private' ? 1 : 0;
             const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
             try {
+                const orgAssetType = this.getOrgAssetType(args.options.orgAssetType);
                 spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
@@ -49,7 +56,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">${orgAssetType}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -63,12 +70,23 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
             }
         });
     }
+    getOrgAssetType(orgAssetType) {
+        switch (orgAssetType) {
+            case 'OfficeTemplateLibrary':
+                return OrgAssetType.OfficeTemplateLibrary;
+            case 'OfficeFontLibrary':
+                return OrgAssetType.OfficeFontLibrary;
+            default:
+                return OrgAssetType.ImageDocumentLibrary;
+        }
+    }
 }
 _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.cdnType || 'Private',
-            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined'
+            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined',
+            orgAssetType: args.options.orgAssetType
         });
     });
 }, _SpoOrgAssetsLibraryAddCommand_initOptions = function _SpoOrgAssetsLibraryAddCommand_initOptions() {
@@ -78,7 +96,10 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         option: '--thumbnailUrl [thumbnailUrl]'
     }, {
         option: '--cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
+        autocomplete: SpoOrgAssetsLibraryAddCommand.cdnTypes
+    }, {
+        option: '--orgAssetType [orgAssetType]',
+        autocomplete: SpoOrgAssetsLibraryAddCommand.orgAssetTypes
     });
 }, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -86,8 +107,16 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
+        if (args.options.cdnType && SpoOrgAssetsLibraryAddCommand.cdnTypes.indexOf(args.options.cdnType) < 0) {
+            return `${args.options.cdnType} is not a valid value for cdnType. Valid values are ${SpoOrgAssetsLibraryAddCommand.cdnTypes.join(', ')}`;
+        }
+        if (args.options.orgAssetType && SpoOrgAssetsLibraryAddCommand.orgAssetTypes.indexOf(args.options.orgAssetType) < 0) {
+            return `${args.options.orgAssetType} is not a valid value for orgAssetType. Valid values are ${SpoOrgAssetsLibraryAddCommand.orgAssetTypes.join(', ')}`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.libraryUrl);
     }));
 };
+SpoOrgAssetsLibraryAddCommand.orgAssetTypes = ['ImageDocumentLibrary', 'OfficeTemplateLibrary', 'OfficeFontLibrary'];
+SpoOrgAssetsLibraryAddCommand.cdnTypes = ['Public', 'Private'];
 module.exports = new SpoOrgAssetsLibraryAddCommand();
 //# sourceMappingURL=orgassetslibrary-add.js.map

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

@@ -40,38 +40,8 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const toggleServicePrincipal = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
-                    if (this.verbose) {
-                        logger.logToStderr(`${(args.options.enabled ? 'Enabling' : 'Disabling')} service principal...`);
-                    }
-                    const requestOptions = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                        headers: {
-                            'X-RequestDigest': reqDigest.FormDigestValue
-                        },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="28" ObjectPathId="27" /><SetProperty Id="29" ObjectPathId="27" Name="AccountEnabled"><Parameter Type="Boolean">${args.options.enabled}</Parameter></SetProperty><Method Name="Update" Id="30" ObjectPathId="27" /><Query Id="31" ObjectPathId="27"><Query SelectAllProperties="true"><Properties><Property Name="AccountEnabled" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="27" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /></ObjectPaths></Request>`
-                    };
-                    const res = yield request_1.default.post(requestOptions);
-                    const json = JSON.parse(res);
-                    const response = json[0];
-                    if (response.ErrorInfo) {
-                        throw response.ErrorInfo.ErrorMessage;
-                    }
-                    else {
-                        const output = json[json.length - 1];
-                        delete output._ObjectType_;
-                        logger.log(output);
-                    }
-                }
-                catch (err) {
-                    this.handleRejectedPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield toggleServicePrincipal();
+                yield this.toggleServicePrincipal(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -81,11 +51,41 @@ class SpoServicePrincipalSetCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to ${args.options.enabled ? 'enable' : 'disable'} the service principal?`
                 });
                 if (result.continue) {
-                    yield toggleServicePrincipal();
+                    yield this.toggleServicePrincipal(logger, args);
                 }
             }
         });
     }
+    toggleServicePrincipal(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`${(args.options.enabled ? 'Enabling' : 'Disabling')} service principal...`);
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="28" ObjectPathId="27" /><SetProperty Id="29" ObjectPathId="27" Name="AccountEnabled"><Parameter Type="Boolean">${args.options.enabled}</Parameter></SetProperty><Method Name="Update" Id="30" ObjectPathId="27" /><Query Id="31" ObjectPathId="27"><Query SelectAllProperties="true"><Properties><Property Name="AccountEnabled" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="27" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /></ObjectPaths></Request>`
+                };
+                const response = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(response);
+                const responseContent = json[0];
+                if (responseContent.ErrorInfo) {
+                    throw responseContent.ErrorInfo.ErrorMessage;
+                }
+                const output = json[json.length - 1];
+                delete output._ObjectType_;
+                logger.log(output);
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
+    }
 }
 _SpoServicePrincipalSetCommand_instances = new WeakSet(), _SpoServicePrincipalSetCommand_initTelemetry = function _SpoServicePrincipalSetCommand_initTelemetry() {
     this.telemetry.push((args) => {