@pnp/cli-microsoft365 6.11.0-beta.b75e15f → 6.11.0-beta.cb74646

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.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/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) => {

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

@@ -141,18 +141,16 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                         requestOptions.data.request.Owner = args.options.owners;
                     }
                 }
-                const res = yield request_1.default.post(requestOptions);
+                const response = yield request_1.default.post(requestOptions);
                 if (isTeamSite) {
-                    if (res.ErrorMessage !== null) {
-                        throw res.ErrorMessage;
-                    }
-                    else {
-                        logger.log(res.SiteUrl);
+                    if (response.ErrorMessage !== null) {
+                        throw response.ErrorMessage;
                     }
+                    logger.log(response.SiteUrl);
                 }
                 else {
-                    if (res.SiteStatus === 2) {
-                        logger.log(res.SiteUrl);
+                    if (response.SiteStatus === 2) {
+                        logger.log(response.SiteUrl);
                     }
                     else {
                         throw 'An error has occurred while creating the site';
@@ -171,7 +169,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                 this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
                 let exists;
                 if (args.options.removeDeletedSite) {
-                    exists = yield this.siteExistsInTheRecycleBin(args.options.url, logger);
+                    exists = yield this.siteExists(args.options.url, logger);
                 }
                 else {
                     // assume site doesn't exist
@@ -205,153 +203,18 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                     },
                     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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${formatting_1.formatting.escapeXml(args.options.owners)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${formatting_1.formatting.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${formatting_1.formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
-                const res = yield request_1.default.post(requestOptions);
-                yield 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(() => {
-                            spo_1.spo.waitUntilFinished({
-                                operationId: JSON.stringify(operation._ObjectIdentity_),
-                                siteUrl: this.spoAdminUrl,
-                                resolve,
-                                reject,
-                                logger,
-                                currentContext: this.context,
-                                verbose: this.verbose,
-                                debug: this.debug
-                            });
-                        }, operation.PollingInterval);
-                    }
-                });
-            }
-            catch (err) {
-                this.handleRejectedPromise(err);
-            }
-        });
-    }
-    siteExistsInTheRecycleBin(url, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then((res) => {
-                this.context = res;
-                if (this.verbose) {
-                    logger.logToStderr(`Checking if the site ${url} exists...`);
-                }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.context.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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    if (response.ErrorInfo.ErrorTypeName === 'Microsoft.Online.SharePoint.Common.SpoNoSiteException') {
-                        return Promise.resolve(false);
-                    }
-                    else {
-                        return Promise.reject(response.ErrorInfo.ErrorMessage);
-                    }
-                }
-                else {
-                    const site = json[json.length - 1];
-                    if (site.Status === 'Recycled') {
-                        return Promise.reject(true);
-                    }
-                    else {
-                        return Promise.resolve(false);
-                    }
-                }
-            })
-                .then(() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Site doesn't exist. Checking if the site ${url} exists in the recycle bin...`);
+                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 requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.context.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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    if (response.ErrorInfo.ErrorTypeName === 'Microsoft.SharePoint.Client.UnknownError') {
-                        resolve(false);
-                    }
-                    else {
-                        reject(response.ErrorInfo.ErrorMessage);
-                    }
+                const operation = json[json.length - 1];
+                const isComplete = operation.IsComplete;
+                if (!args.options.wait || isComplete) {
+                    return;
                 }
-                else {
-                    const site = json[json.length - 1];
-                    if (site.Status === 'Recycled') {
-                        resolve(true);
-                    }
-                    else {
-                        resolve(false);
-                    }
-                }
-            }, (error) => {
-                if (typeof error === 'boolean') {
-                    resolve(error);
-                }
-                else {
-                    reject(error);
-                }
-            });
-        });
-    }
-    deleteSiteFromTheRecycleBin(url, wait, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then((res) => {
-                this.context = res;
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting site ${url} from the recycle bin...`);
-                }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.context.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="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                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 (!wait || isComplete) {
-                        resolve();
-                        return;
-                    }
+                yield new Promise((resolve, reject) => {
                     setTimeout(() => {
                         spo_1.spo.waitUntilFinished({
                             operationId: JSON.stringify(operation._ObjectIdentity_),
@@ -364,7 +227,103 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                             debug: this.debug
                         });
                     }, operation.PollingInterval);
+                });
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
+    }
+    siteExists(url, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            if (this.verbose) {
+                logger.logToStderr(`Checking if the site ${url} exists...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                if (responseContent.ErrorInfo.ErrorTypeName === 'Microsoft.Online.SharePoint.Common.SpoNoSiteException') {
+                    return yield this.siteExistsInTheRecycleBin(url, logger);
                 }
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
+            else {
+                const site = json[json.length - 1];
+                return site.Status === 'Recycled';
+            }
+        });
+    }
+    siteExistsInTheRecycleBin(url, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Site doesn't exist. Checking if the site ${url} exists in the recycle bin...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                if (response.ErrorInfo.ErrorTypeName === 'Microsoft.SharePoint.Client.UnknownError') {
+                    return false;
+                }
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            const site = json[json.length - 1];
+            return site.Status === 'Recycled';
+        });
+    }
+    deleteSiteFromTheRecycleBin(url, wait, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            if (this.verbose) {
+                logger.logToStderr(`Deleting site ${url} from the recycle bin...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></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 operation = json[json.length - 1];
+            const isComplete = operation.IsComplete;
+            if (!wait || isComplete) {
+                return;
+            }
+            yield new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    spo_1.spo.waitUntilFinished({
+                        operationId: JSON.stringify(operation._ObjectIdentity_),
+                        siteUrl: this.spoAdminUrl,
+                        resolve,
+                        reject,
+                        logger,
+                        currentContext: this.context,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    });
+                }, operation.PollingInterval);
             });
         });
     }

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -39,40 +39,39 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
     getAppInfo(args) {
-        if (args.options.appId && args.options.appDisplayName) {
-            return Promise.resolve({
-                appId: args.options.appId,
-                displayName: args.options.appDisplayName
-            });
-        }
-        let endpoint = "";
-        if (args.options.appId) {
-            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
-        }
-        else {
-            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
-        }
-        const appRequestOptions = {
-            url: endpoint,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(appRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appId && args.options.appDisplayName) {
+                return {
+                    appId: args.options.appId,
+                    displayName: args.options.appDisplayName
+                };
+            }
+            let endpoint = "";
+            if (args.options.appId) {
+                endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
+            }
+            else {
+                endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+            }
+            const appRequestOptions = {
+                url: endpoint,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(appRequestOptions);
             const appItem = response.value[0];
             if (!appItem) {
-                return Promise.reject("The specified Azure AD app does not exist");
+                throw "The specified Azure AD app does not exist";
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD app with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.appId)}`);
+                throw `Multiple Azure AD app with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.appId)}`;
             }
-            return Promise.resolve({
+            return {
                 appId: appItem.appId,
                 displayName: appItem.displayName
-            });
+            };
         });
     }
     /**