@pnp/cli-microsoft365 6.0.0-beta.27b9708 → 6.0.0-beta.291f17c

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

@@ -13,12 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators, _SpfxDoctorCommand_initTypes;
+var _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
 const semver_1 = require("semver");
-const Command_1 = require("../../../Command");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
 /**
@@ -429,12 +428,29 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.16.0': {
+                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'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTypes).call(this);
+    }
+    get allowedOutputs() {
+        return ['text'];
     }
     get name() {
         return commands_1.default.DOCTOR;
@@ -442,58 +458,61 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
-    commandAction(logger, args, cb) {
-        if (!args.options.output) {
-            args.options.output = 'text';
-        }
-        logger.log(' ');
-        logger.log('CLI for Microsoft 365 SharePoint Framework doctor');
-        logger.log('Verifying configuration of your system for working with the SharePoint Framework');
-        logger.log(' ');
-        let spfxVersion = '';
-        let prerequisites;
-        const fixes = [];
-        this
-            .getSharePointFrameworkVersion(logger)
-            .then((_spfxVersion) => {
-            if (!_spfxVersion) {
-                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework`));
-                return Promise.reject(`SharePoint Framework not found`);
-            }
-            spfxVersion = _spfxVersion;
-            prerequisites = this.versions[spfxVersion];
-            if (!prerequisites) {
-                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersion}`));
-                return Promise.reject(`spfx doctor doesn't support SPFx v${spfxVersion} at this moment`);
-            }
-            logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
-            return Promise.resolve();
-        })
-            .then(_ => this.checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger))
-            .then(_ => this.checkNodeVersion(prerequisites, fixes, logger))
-            .then(_ => this.checkYo(prerequisites, fixes, logger))
-            .then(_ => this.checkGulp(fixes, logger))
-            .then(_ => this.checkGulpCli(prerequisites, fixes, logger))
-            .then(_ => this.checkTypeScript(fixes, logger))
-            .then(_ => {
-            if (fixes.length > 0) {
-                logger.log(' ');
-                logger.log('Recommended fixes:');
-                logger.log(' ');
-                fixes.forEach(f => logger.log(`- ${f}`));
-                logger.log(' ');
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.output) {
+                args.options.output = 'text';
             }
-            cb();
-        })
-            .catch((error) => {
             logger.log(' ');
-            if (fixes.length > 0) {
-                logger.log('Recommended fixes:');
-                logger.log(' ');
-                fixes.forEach(f => logger.log(`- ${f}`));
+            logger.log('CLI for Microsoft 365 SharePoint Framework doctor');
+            logger.log('Verifying configuration of your system for working with the SharePoint Framework');
+            logger.log(' ');
+            let spfxVersion = '';
+            let prerequisites;
+            const fixes = [];
+            try {
+                spfxVersion = (_a = args.options.spfxVersion) !== null && _a !== void 0 ? _a : yield this.getSharePointFrameworkVersion(logger);
+                if (!spfxVersion) {
+                    logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework`));
+                    throw `SharePoint Framework not found`;
+                }
+                prerequisites = this.versions[spfxVersion];
+                if (!prerequisites) {
+                    logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersion}`));
+                    throw `spfx doctor doesn't support SPFx v${spfxVersion} at this moment`;
+                }
+                if (args.options.spfxVersion) {
+                    yield this.checkSharePointFrameworkVersion(args.options.spfxVersion, fixes, logger);
+                }
+                else {
+                    // spfx was detected and if we are here, it means that we support it
+                    logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
+                }
+                yield this.checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger);
+                yield this.checkNodeVersion(prerequisites, fixes, logger);
+                yield this.checkYo(prerequisites, fixes, logger);
+                yield this.checkGulp(fixes, logger);
+                yield this.checkGulpCli(prerequisites, fixes, logger);
+                yield this.checkTypeScript(fixes, logger);
+                if (fixes.length > 0) {
+                    logger.log(' ');
+                    logger.log('Recommended fixes:');
+                    logger.log(' ');
+                    fixes.forEach(f => logger.log(`- ${f}`));
+                    logger.log(' ');
+                }
+            }
+            catch (err) {
                 logger.log(' ');
+                if (fixes.length > 0) {
+                    logger.log('Recommended fixes:');
+                    logger.log(' ');
+                    fixes.forEach(f => logger.log(`- ${f}`));
+                    logger.log(' ');
+                }
+                this.handleRejectedPromise(err);
             }
-            cb(new Command_1.CommandError(error));
         });
     }
     checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
@@ -522,6 +541,23 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
         });
     }
+    checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
+        return this
+            .getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
+            .then((spfxVersionDetected) => {
+            const versionCheck = {
+                range: spfxVersionRequested,
+                fix: `npm i -g @microsoft/generator-sharepoint@${spfxVersionRequested}`
+            };
+            if (spfxVersionDetected) {
+                this.checkStatus(`SharePoint Framework`, spfxVersionDetected, versionCheck, OptionalOrRequired.Required, fixes, logger);
+            }
+            else {
+                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersionRequested} not found`));
+                fixes.push(versionCheck.fix);
+            }
+        });
+    }
     checkYo(prerequisites, fixes, logger) {
         return this
             .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
@@ -700,13 +736,17 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
 _SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            env: args.options.env
+            env: args.options.env,
+            spfxVersion: args.options.spfxVersion
         });
     });
 }, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
     this.options.unshift({
         option: '-e, --env [env]',
         autocomplete: ['sp2016', 'sp2019', 'spo']
+    }, {
+        option: '-v, --spfxVersion [spfxVersion]',
+        autocomplete: Object.keys(this.versions)
     });
 }, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -716,13 +756,13 @@ _SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry =
                 return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
             }
         }
-        if (args.options.output && args.options.output !== 'text') {
-            return `The output option only accepts the type 'text'`;
+        if (args.options.spfxVersion) {
+            if (!this.versions[args.options.spfxVersion]) {
+                return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(this.versions).join(', ')}`;
+            }
         }
         return true;
     }));
-}, _SpfxDoctorCommand_initTypes = function _SpfxDoctorCommand_initTypes() {
-    this.types.string.push('e', 'env');
 };
 module.exports = new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

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

@@ -18,7 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -35,40 +36,39 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Adds an app to the specified SharePoint Online app catalog';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        const overwrite = args.options.overwrite || false;
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((appCatalogUrl) => {
-            const fullPath = path.resolve(args.options.filePath);
-            if (this.verbose) {
-                logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            const overwrite = args.options.overwrite || false;
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                const fullPath = path.resolve(args.options.filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
+                }
+                const fileName = path.basename(fullPath);
+                const requestOptions = {
+                    url: `${appCatalogUrl}/_api/web/${scope}appcatalog/Add(overwrite=${(overwrite.toString().toLowerCase())}, url='${fileName}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        binaryStringRequestBody: 'true'
+                    },
+                    data: fs.readFileSync(fullPath)
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                if (args.options.output === 'json') {
+                    logger.log(json);
+                }
+                else {
+                    logger.log(json.UniqueId);
+                }
             }
-            const fileName = path.basename(fullPath);
-            const requestOptions = {
-                url: `${appCatalogUrl}/_api/web/${scope}appcatalog/Add(overwrite=${(overwrite.toString().toLowerCase())}, url='${fileName}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    binaryStringRequestBody: 'true'
-                },
-                data: fs.readFileSync(fullPath)
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            if (args.options.output === 'json') {
-                logger.log(json);
+            catch (err) {
+                this.handleRejectedODataPromise(err);
             }
-            else {
-                logger.log(json.UniqueId);
-            }
-            cb();
-        }, (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
@@ -110,7 +110,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
             return `Path '${fullPath}' points to a directory`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators, _SpoAppDeployCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -34,54 +35,53 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Deploys the specified app in the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        let appId = '';
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        let appCatalogUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((_appCatalogUrl) => {
-            appCatalogUrl = _appCatalogUrl;
-            if (args.options.id) {
-                if (this.verbose) {
-                    logger.logToStderr(`Using the specified app id ${args.options.id}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let appId = '';
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            let appCatalogUrl = '';
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                let res;
+                if (args.options.id) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Using the specified app id ${args.options.id}`);
+                    }
+                    res = { UniqueId: args.options.id };
                 }
-                return Promise.resolve({ UniqueId: args.options.id });
-            }
-            else {
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    }
+                    const requestOptions = {
+                        url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    res = yield request_1.default.get(requestOptions);
+                }
+                appId = res.UniqueId;
                 if (this.verbose) {
-                    logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    logger.logToStderr(`Deploying app...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                    url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${appId}')/deploy`,
                     headers: {
-                        accept: 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata;charset=utf-8'
                     },
+                    data: { 'skipFeatureDeployment': args.options.skipFeatureDeployment || false },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
+                yield request_1.default.post(requestOptions);
             }
-        })
-            .then((res) => {
-            appId = res.UniqueId;
-            if (this.verbose) {
-                logger.logToStderr(`Deploying app...`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${appId}')/deploy`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata;charset=utf-8'
-                },
-                data: { 'skipFeatureDeployment': args.options.skipFeatureDeployment || false },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemetry = function _SpoAppDeployCommand_initTelemetry() {
@@ -119,16 +119,16 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));
 }, _SpoAppDeployCommand_initOptionSets = function _SpoAppDeployCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoAppDeployCommand();
 //# sourceMappingURL=app-deploy.js.map

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -34,48 +36,47 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Gets information about the specific app from the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        let appCatalogSiteUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((appCatalogUrl) => {
-            appCatalogSiteUrl = appCatalogUrl;
-            if (args.options.id) {
-                return Promise.resolve({ UniqueId: args.options.id });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                let appId;
+                if (args.options.id) {
+                    appId = args.options.id;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    }
+                    const requestOptions = {
+                        url: `${appCatalogSiteUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const app = yield request_1.default.get(requestOptions);
+                    appId = app.UniqueId;
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving information for app ${appId}...`);
+                }
+                const requestOptions = {
+                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(appId)}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
             }
-            if (this.verbose) {
-                logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${appCatalogSiteUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information for app ${res}...`);
-            }
-            const requestOptions = {
-                url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(res.UniqueId)}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = function _SpoAppGetCommand_initTelemetry() {
@@ -110,16 +111,16 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));
 }, _SpoAppGetCommand_initOptionSets = function _SpoAppGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new SpoAppGetCommand();
 //# sourceMappingURL=app-get.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppInstallCommand extends SpoCommand_1.default {
@@ -33,20 +34,25 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
     get description() {
         return 'Installs an app from the specified app catalog in the site';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        if (this.verbose) {
-            logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
-        }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/install`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            if (this.verbose) {
+                logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
+            }
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/install`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataPromise(err);
+            }
+        });
     }
 }
 _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelemetry = function _SpoAppInstallCommand_initTelemetry() {
@@ -72,10 +78,10 @@ _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelem
                 return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppInstallCommand();