@pnp/cli-microsoft365 5.1.0-beta.ffd9bc8 → 5.2.0-beta.119724d

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

@@ -6,6 +6,7 @@ const path = require("path");
 // uncomment to support upgrading to preview releases
 const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
+const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
 const FN017001_MISC_npm_dedupe_1 = require("./project-upgrade/rules/FN017001_MISC_npm_dedupe");
@@ -97,7 +98,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         }
         const pos = this.supportedVersions.indexOf(this.projectVersion);
         if (pos < 0) {
-            cb(new Command_1.CommandError(`CLI for Microsoft 365 doesn't support upgrading projects build on SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION));
+            cb(new Command_1.CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION));
             return;
         }
         const posTo = this.supportedVersions.indexOf(this.toVersion);
@@ -188,33 +189,33 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             // matches must be in this particular order to avoid false matches, eg.
             // uninstallDev contains install
             if (f.resolution.startsWith('uninstallDev')) {
-                f.resolution = f.resolution.replace('uninstallDev', this.getPackageManagerCommand('uninstallDev'));
+                f.resolution = f.resolution.replace('uninstallDev', utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
                 return;
             }
             if (f.resolution.startsWith('installDev')) {
-                f.resolution = f.resolution.replace('installDev', this.getPackageManagerCommand('installDev'));
+                f.resolution = f.resolution.replace('installDev', utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
                 return;
             }
             if (f.resolution.startsWith('uninstall')) {
-                f.resolution = f.resolution.replace('uninstall', this.getPackageManagerCommand('uninstall'));
+                f.resolution = f.resolution.replace('uninstall', utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
                 return;
             }
             if (f.resolution.startsWith('install')) {
-                f.resolution = f.resolution.replace('install', this.getPackageManagerCommand('install'));
+                f.resolution = f.resolution.replace('install', utils_1.packageManager.getPackageManagerCommand('install', this.packageManager));
                 return;
             }
             // copy support for multiple shells
             if (f.resolution.startsWith('copy_cmd')) {
-                f.resolution = f.resolution.replace('copy_cmd', this.getCopyCommand('copyCommand'));
-                f.resolution = f.resolution.replace('DestinationParam', this.getCopyCommand('copyDestinationParam'));
+                f.resolution = f.resolution.replace('copy_cmd', utils_1.fsUtil.getCopyCommand('copyCommand', this.shell));
+                f.resolution = f.resolution.replace('DestinationParam', utils_1.fsUtil.getCopyCommand('copyDestinationParam', this.shell));
                 return;
             }
             // createdir support for multiple shells
             if (f.resolution.startsWith('create_dir_cmd')) {
-                f.resolution = f.resolution.replace('create_dir_cmd', this.getDirectoryCommand('createDirectoryCommand'));
-                f.resolution = f.resolution.replace('NameParam', this.getDirectoryCommand('createDirectoryNameParam'));
-                f.resolution = f.resolution.replace('PathParam', this.getDirectoryCommand('createDirectoryPathParam'));
-                f.resolution = f.resolution.replace('ItemTypeParam', this.getDirectoryCommand('createDirectoryItemTypeParam'));
+                f.resolution = f.resolution.replace('create_dir_cmd', utils_1.fsUtil.getDirectoryCommand('createDirectoryCommand', this.shell));
+                f.resolution = f.resolution.replace('NameParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryNameParam', this.shell));
+                f.resolution = f.resolution.replace('PathParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryPathParam', this.shell));
+                f.resolution = f.resolution.replace('ItemTypeParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryItemTypeParam', this.shell));
                 return;
             }
             // 'Add' support for multiple shells
@@ -225,7 +226,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                 const contentStart = f.resolution.indexOf('[BEFORECONTENT]') + '[BEFORECONTENT]'.length;
                 const contentEnd = f.resolution.indexOf('[AFTERCONTENT]');
                 const fileContent = f.resolution.substring(contentStart, contentEnd);
-                f.resolution = this.getAddCommand('addFileCommand');
+                f.resolution = utils_1.fsUtil.getAddCommand('addFileCommand', this.shell);
                 f.resolution = f.resolution.replace('[FILECONTENT]', fileContent);
                 f.resolution = f.resolution.replace('[FILEPATH]', filePath);
                 f.resolution = f.resolution.replace('[BEFOREPATH]', ' ');
@@ -236,7 +237,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             }
             // 'Remove' support for multiple shells
             if (f.resolution.startsWith('remove_cmd')) {
-                f.resolution = f.resolution.replace('remove_cmd', this.getRemoveCommand('removeFileCommand'));
+                f.resolution = f.resolution.replace('remove_cmd', utils_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
                 return;
             }
         });
@@ -270,10 +271,10 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '-----------------------', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(this.getPackageManagerCommand('install')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('installDev')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstall')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstallDev')) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             os.EOL,
             Object.keys(reportData.modificationPerFile).map(file => {
                 return [
@@ -329,10 +330,10 @@ ${f.resolution}
             '```sh', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(this.getPackageManagerCommand('install')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('installDev')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstall')) === -1 &&
-                command.indexOf(this.getPackageManagerCommand('uninstallDev')) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             '```', os.EOL,
             os.EOL,
             '### Modify files', os.EOL,
@@ -412,7 +413,14 @@ ${f.resolution}
             if (f.resolutionType === 'cmd') {
                 if (f.resolution.indexOf('npm') > -1 ||
                     f.resolution.indexOf('yarn') > -1) {
-                    this.mapPackageManagerCommand(f.resolution, packagesDevExact, packagesDepExact, packagesDepUn, packagesDevUn);
+                    utils_1.packageManager.mapPackageManagerCommand({
+                        command: f.resolution,
+                        packagesDevExact,
+                        packagesDepExact,
+                        packagesDepUn,
+                        packagesDevUn,
+                        packageMgr: this.packageManager
+                    });
                 }
                 else {
                     commandsToExecute.push(f.resolution);
@@ -431,7 +439,13 @@ ${f.resolution}
                 });
             }
         });
-        const packageManagerCommands = this.reducePackageManagerCommand(packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn);
+        const packageManagerCommands = utils_1.packageManager.reducePackageManagerCommand({
+            packagesDepExact,
+            packagesDevExact,
+            packagesDepUn,
+            packagesDevUn,
+            packageMgr: this.packageManager
+        });
         if (this.packageManager === 'npm') {
             const dedupeFinding = findings.filter(f => f.id === 'FN017001');
             if (dedupeFinding.length > 0) {
@@ -445,58 +459,6 @@ ${f.resolution}
             modificationTypePerFile: modificationTypePerFile
         };
     }
-    mapPackageManagerCommand(command, packagesDevExact, packagesDepExact, packagesDepUn, packagesDevUn) {
-        // matches must be in this particular order to avoid false matches, eg.
-        // uninstallDev contains install
-        if (command.startsWith(`${this.getPackageManagerCommand('uninstallDev')} `)) {
-            packagesDevUn.push(command.replace(this.getPackageManagerCommand('uninstallDev'), '').trim());
-            return;
-        }
-        if (command.startsWith(`${this.getPackageManagerCommand('installDev')} `)) {
-            packagesDevExact.push(command.replace(this.getPackageManagerCommand('installDev'), '').trim());
-            return;
-        }
-        if (command.startsWith(`${this.getPackageManagerCommand('uninstall')} `)) {
-            packagesDepUn.push(command.replace(this.getPackageManagerCommand('uninstall'), '').trim());
-            return;
-        }
-        if (command.startsWith(`${this.getPackageManagerCommand('install')} `)) {
-            packagesDepExact.push(command.replace(this.getPackageManagerCommand('install'), '').trim());
-        }
-    }
-    reducePackageManagerCommand(packagesDepExact, packagesDevExact, packagesDepUn, packagesDevUn) {
-        const commandsToExecute = [];
-        // uninstall commands must come first otherwise there is a chance that
-        // whatever we recommended to install, will be immediately uninstalled
-        if (packagesDepUn.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('uninstall')} ${packagesDepUn.join(' ')}`);
-        }
-        if (packagesDevUn.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('uninstallDev')} ${packagesDevUn.join(' ')}`);
-        }
-        if (packagesDepExact.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('install')} ${packagesDepExact.join(' ')}`);
-        }
-        if (packagesDevExact.length > 0) {
-            commandsToExecute.push(`${this.getPackageManagerCommand('installDev')} ${packagesDevExact.join(' ')}`);
-        }
-        return commandsToExecute;
-    }
-    getPackageManagerCommand(command) {
-        return SpfxProjectUpgradeCommand.packageCommands[this.packageManager][command];
-    }
-    getCopyCommand(command) {
-        return SpfxProjectUpgradeCommand.copyCommands[this.shell][command];
-    }
-    getDirectoryCommand(command) {
-        return SpfxProjectUpgradeCommand.createDirectoryCommands[this.shell][command];
-    }
-    getAddCommand(command) {
-        return SpfxProjectUpgradeCommand.addFileCommands[this.shell][command];
-    }
-    getRemoveCommand(command) {
-        return SpfxProjectUpgradeCommand.removeFileCommands[this.shell][command];
-    }
     options() {
         const options = [
             {
@@ -538,84 +500,6 @@ ${f.resolution}
 }
 SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
 SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
-SpfxProjectUpgradeCommand.packageCommands = {
-    npm: {
-        install: 'npm i -SE',
-        installDev: 'npm i -DE',
-        uninstall: 'npm un -S',
-        uninstallDev: 'npm un -D'
-    },
-    pnpm: {
-        install: 'pnpm i -E',
-        installDev: 'pnpm i -DE',
-        uninstall: 'pnpm un',
-        uninstallDev: 'pnpm un'
-    },
-    yarn: {
-        install: 'yarn add -E',
-        installDev: 'yarn add -DE',
-        uninstall: 'yarn remove',
-        uninstallDev: 'yarn remove'
-    }
-};
-SpfxProjectUpgradeCommand.copyCommands = {
-    bash: {
-        copyCommand: 'cp',
-        copyDestinationParam: ' '
-    },
-    powershell: {
-        copyCommand: 'Copy-Item',
-        copyDestinationParam: ' -Destination '
-    },
-    cmd: {
-        copyCommand: 'copy',
-        copyDestinationParam: ' '
-    }
-};
-SpfxProjectUpgradeCommand.createDirectoryCommands = {
-    bash: {
-        createDirectoryCommand: 'mkdir',
-        createDirectoryPathParam: ' "',
-        createDirectoryNameParam: '/',
-        createDirectoryItemTypeParam: '"'
-    },
-    powershell: {
-        createDirectoryCommand: 'New-Item',
-        createDirectoryPathParam: ' -Path "',
-        createDirectoryNameParam: '" -Name "',
-        createDirectoryItemTypeParam: '" -ItemType "directory"'
-    },
-    cmd: {
-        createDirectoryCommand: 'mkdir',
-        createDirectoryPathParam: ' "',
-        createDirectoryNameParam: '\\',
-        createDirectoryItemTypeParam: '"'
-    }
-};
-SpfxProjectUpgradeCommand.addFileCommands = {
-    bash: {
-        addFileCommand: 'cat > [FILEPATH] << EOF [FILECONTENT]EOF'
-    },
-    powershell: {
-        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath "[FILEPATH]"
-      `
-    },
-    cmd: {
-        addFileCommand: `echo [FILECONTENT] > "[FILEPATH]"
-      `
-    }
-};
-SpfxProjectUpgradeCommand.removeFileCommands = {
-    bash: {
-        removeFileCommand: 'rm'
-    },
-    powershell: {
-        removeFileCommand: 'Remove-Item'
-    },
-    cmd: {
-        removeFileCommand: 'del'
-    }
-};
 SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION = 2;
 SpfxProjectUpgradeCommand.ERROR_NO_VERSION = 3;

package/dist/m365/spfx/commands/project/{project-upgrade → report-model}/index.js

@@ -14,10 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./DependencyInformation"), exports);
-__exportStar(require("./Dictionary"), exports);
 __exportStar(require("./Finding"), exports);
 __exportStar(require("./FindingToReport"), exports);
-__exportStar(require("./Hash"), exports);
+__exportStar(require("./FindingTour"), exports);
+__exportStar(require("./FindingTourStep"), exports);
 __exportStar(require("./Occurrence"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -481,6 +481,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         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');
@@ -758,6 +761,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 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'`;
+        }
         return true;
     }
 }

package/dist/m365/spfx/commands.js

@@ -4,6 +4,7 @@ const prefix = 'spfx';
 exports.default = {
     DOCTOR: `${prefix} doctor`,
     PACKAGE_GENERATE: `${prefix} package generate`,
+    PROJECT_DOCTOR: `${prefix} project doctor`,
     PROJECT_UPGRADE: `${prefix} project upgrade`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
     PROJECT_RENAME: `${prefix} project rename`

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -0,0 +1,180 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+const request_1 = require("../../../../request");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
+const commands_1 = require("../../commands");
+const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
+class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
+    get name() {
+        return commands_1.default.APP_TEAMSPACKAGE_DOWNLOAD;
+    }
+    get description() {
+        return 'Downloads Teams app package for an SPFx solution deployed to tenant app catalog';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.appCatalogUrl = typeof args.options.appCatalogUrl !== 'undefined';
+        telemetryProps.appItemUniqueId = typeof args.options.appItemUniqueId !== 'undefined';
+        telemetryProps.appItemId = typeof args.options.appItemId !== 'undefined';
+        telemetryProps.appName = typeof args.options.appName !== 'undefined';
+        telemetryProps.fileName = typeof args.options.fileName !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        var _a, _b;
+        this.appCatalogUrl = args.options.appCatalogUrl;
+        const appInfo = {
+            id: (_a = args.options.appItemId) !== null && _a !== void 0 ? _a : undefined,
+            packageFileName: (_b = args.options.fileName) !== null && _b !== void 0 ? _b : undefined
+        };
+        if (this.debug) {
+            logger.logToStderr(`appInfo: ${JSON.stringify(appInfo)}`);
+        }
+        this
+            .ensureAppInfo(logger, args, appInfo)
+            .then(_ => {
+            if (this.debug) {
+                logger.logToStderr(`ensureAppInfo: ${JSON.stringify(appInfo)}`);
+            }
+            return this.loadAppCatalogUrl(logger, args);
+        })
+            .then(_ => {
+            const requestOptions = {
+                url: `${this.appCatalogUrl}/_api/web/tenantappcatalog/downloadteamssolution(${appInfo.id})/$value`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'stream'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((file) => {
+            return new Promise((resolve, reject) => {
+                const writer = fs.createWriteStream(appInfo.packageFileName);
+                file.data.pipe(writer);
+                writer.on('error', err => {
+                    reject(err);
+                });
+                writer.on('close', () => {
+                    resolve(appInfo.packageFileName);
+                });
+            });
+        })
+            .then((file) => {
+            if (this.verbose) {
+                logger.logToStderr(`Package saved to ${file}`);
+            }
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    ensureAppInfo(logger, args, appInfo) {
+        if (appInfo.id && appInfo.packageFileName) {
+            return Promise.resolve();
+        }
+        if (args.options.appName && !appInfo.packageFileName) {
+            appInfo.packageFileName = this.getPackageNameFromFileName(args.options.appName);
+        }
+        return this
+            .loadAppCatalogUrl(logger, args)
+            .then(_ => {
+            const appCatalogListName = 'AppCatalog';
+            const serverRelativeAppCatalogListUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(this.appCatalogUrl)}/${appCatalogListName}`;
+            let url = `${this.appCatalogUrl}/_api/web/`;
+            if (args.options.appItemUniqueId) {
+                url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemByUniqueId('${args.options.appItemUniqueId}')?$expand=File&$select=Id,File/Name`;
+            }
+            else if (args.options.appItemId) {
+                url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemById(${args.options.appItemId})?$expand=File&$select=File/Name`;
+            }
+            else if (args.options.appName) {
+                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${encodeURIComponent(args.options.appName)}')/ListItemAllFields?$select=Id`;
+            }
+            const requestOptions = {
+                url,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then(res => {
+            if (args.options.appItemUniqueId) {
+                appInfo.id = parseInt(res.Id);
+                if (!appInfo.packageFileName) {
+                    appInfo.packageFileName = this.getPackageNameFromFileName(res.File.Name);
+                }
+                return Promise.resolve();
+            }
+            if (args.options.appItemId) {
+                if (!appInfo.packageFileName) {
+                    appInfo.packageFileName = this.getPackageNameFromFileName(res.File.Name);
+                }
+                return Promise.resolve();
+            }
+            // if (args.options.appName)
+            // skipped 'if' clause to provide a default code branch
+            appInfo.id = parseInt(res.Id);
+            return Promise.resolve();
+        });
+    }
+    getPackageNameFromFileName(fileName) {
+        return `${path.basename(fileName, path.extname(fileName))}.zip`;
+    }
+    loadAppCatalogUrl(logger, args) {
+        if (this.appCatalogUrl) {
+            return Promise.resolve();
+        }
+        return spo_1.spo
+            .getSpoUrl(logger, this.debug)
+            .then(spoUrl => this.getAppCatalogSiteUrl(logger, spoUrl, args))
+            .then(appCatalogUrl => {
+            this.appCatalogUrl = appCatalogUrl;
+        });
+    }
+    options() {
+        const options = [
+            { option: '--appItemId [appItemId]' },
+            { option: '--appItemUniqueId [appItemUniqueId]' },
+            { option: '--appName [appName]' },
+            { option: '--fileName [fileName]' },
+            { option: '-u, --appCatalogUrl [appCatalogUrl]' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!args.options.appItemUniqueId &&
+            !args.options.appItemId &&
+            !args.options.appName) {
+            return `Specify appItemUniqueId, appItemId or appName`;
+        }
+        if ((args.options.appItemUniqueId && args.options.appItemId) ||
+            (args.options.appItemUniqueId && args.options.appName) ||
+            (args.options.appItemId && args.options.appName)) {
+            return `Specify appItemUniqueId, appItemId or appName but not multiple`;
+        }
+        if (args.options.appItemUniqueId &&
+            !validation_1.validation.isValidGuid(args.options.appItemUniqueId)) {
+            return `${args.options.appItemUniqueId} is not a valid GUID`;
+        }
+        if (args.options.appItemId &&
+            isNaN(args.options.appItemId)) {
+            return `${args.options.appItemId} is not a number`;
+        }
+        if (args.options.fileName &&
+            fs.existsSync(args.options.fileName)) {
+            return `File ${args.options.fileName} already exists`;
+        }
+        if (args.options.appCatalogUrl) {
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+        }
+        return true;
+    }
+}
+module.exports = new SpoAppTeamsPackageDownloadCommand();
+//# sourceMappingURL=app-teamspackage-download.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -18,58 +17,25 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this.dots = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((adminUrl) => {
-            this.spoAdminUrl = adminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
-            if (this.verbose) {
-                logger.logToStderr(`Restoring deleted site collection ${args.options.url}...`);
-            }
             const requestOptions = {
-                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/RestoreDeletedSite`,
                 headers: {
-                    'X-RequestDigest': this.context.FormDigestValue
+                    accept: 'application/json;odata=nometadata',
+                    'content-type': 'application/json;charset=utf-8'
                 },
-                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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="RestoreDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: {
+                    siteUrl: args.options.url
+                }
             };
             return request_1.default.post(requestOptions);
         })
-            .then((res) => {
-            return new Promise((resolve, reject) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!args.options.wait || isComplete) {
-                        resolve();
-                        return;
-                    }
-                    setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            dots: this.dots,
-                            debug: this.debug,
-                            verbose: this.verbose
-                        });
-                    }, operation.PollingInterval);
-                }
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+            .then(res => {
+            logger.log(JSON.parse(res));
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     options() {
         const options = [

package/dist/m365/spo/commands.js

@@ -10,6 +10,7 @@ exports.default = {
     APP_LIST: `${prefix} app list`,
     APP_REMOVE: `${prefix} app remove`,
     APP_RETRACT: `${prefix} app retract`,
+    APP_TEAMSPACKAGE_DOWNLOAD: `${prefix} app teamspackage download`,
     APP_UNINSTALL: `${prefix} app uninstall`,
     APP_UPGRADE: `${prefix} app upgrade`,
     APPPAGE_ADD: `${prefix} apppage add`,