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

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionSetCommand_instances, _SpoSiteAppPermissionSetCommand_initTelemetry, _SpoSiteAppPermissionSetCommand_initOptions, _SpoSiteAppPermissionSetCommand_initValidators, _SpoSiteAppPermissionSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
@@ -24,6 +24,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         super();
         _SpoSiteAppPermissionSetCommand_instances.add(this);
         this.siteId = '';
+        this.roles = ['read', 'write', 'manage', 'fullcontrol'];
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initValidators).call(this);
@@ -81,31 +82,29 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
             return Promise.resolve(sitePermissionItems[0].id);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getSpoSiteId(args)
-            .then((siteId) => {
-            this.siteId = siteId;
-            return this.getPermission(args);
-        })
-            .then((sitePermissionId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${sitePermissionId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: {
-                    roles: [args.options.permission]
-                },
-                responseType: 'json'
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.siteId = yield this.getSpoSiteId(args);
+                const sitePermissionId = yield this.getPermission(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${sitePermissionId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        roles: [args.options.permission]
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.patch(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermissionSetCommand_initTelemetry = function _SpoSiteAppPermissionSetCommand_initTelemetry() {
@@ -113,7 +112,8 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             appId: typeof args.options.appId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined'
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            permissions: args.options.permissions
         });
     });
 }, _SpoSiteAppPermissionSetCommand_initOptions = function _SpoSiteAppPermissionSetCommand_initOptions() {
@@ -126,20 +126,21 @@ _SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermission
     }, {
         option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '-p, --permission <permission>'
+        option: '-p, --permission <permission>',
+        autocomplete: this.roles
     });
 }, _SpoSiteAppPermissionSetCommand_initValidators = function _SpoSiteAppPermissionSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (['read', 'write', 'owner'].indexOf(args.options.permission) === -1) {
-            return `${args.options.permission} is not a valid permission value. Allowed values are read|write|owner`;
+        if (this.roles.indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are ${this.roles.join('|')}`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionSetCommand_initOptionSets = function _SpoSiteAppPermissionSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'appId', 'appDisplayName']);
+    this.optionSets.push({ options: ['id', 'appId', 'appDisplayName'] });
 };
 module.exports = new SpoSiteAppPermissionSetCommand();
 //# sourceMappingURL=site-apppermission-set.js.map

package/dist/m365/spo/commands/site/site-chrome-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteChromeSetCommand_instances, _SpoSiteChromeSetCommand_initTelemetry, _SpoSiteChromeSetCommand_initOptions, _SpoSiteChromeSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 var HeaderLayout;
@@ -58,51 +58,56 @@ class SpoSiteChromeSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Set the chrome header and footer for the specified site';
     }
-    commandAction(logger, args, cb) {
-        const headerLayout = args.options.headerLayout ? HeaderLayout[args.options.headerLayout] : null;
-        const headerEmphasis = args.options.headerEmphasis ? Emphasis[args.options.headerEmphasis] : null;
-        const logoAlignment = args.options.logoAlignment ? Alignment[args.options.logoAlignment] : null;
-        const footerLayout = args.options.footerLayout ? FooterLayout[args.options.footerLayout] : null;
-        const footerEmphasis = args.options.footerEmphasis ? Emphasis[args.options.footerEmphasis] : null;
-        const hideTitleInHeader = typeof args.options.hideTitleInHeader !== "undefined" ? args.options.hideTitleInHeader.toLowerCase() === "true" : null;
-        const disableMegaMenu = typeof args.options.disableMegaMenu !== 'undefined' ? args.options.disableMegaMenu.toLowerCase() === "true" : null;
-        const disableFooter = typeof args.options.disableFooter !== 'undefined' ? args.options.disableFooter.toLowerCase() === "true" : null;
-        const body = {};
-        if (headerLayout !== null) {
-            body["headerLayout"] = headerLayout;
-        }
-        if (headerEmphasis !== null) {
-            body["headerEmphasis"] = headerEmphasis;
-        }
-        if (logoAlignment !== null) {
-            body["logoAlignment"] = logoAlignment;
-        }
-        if (footerLayout !== null) {
-            body["footerLayout"] = footerLayout;
-        }
-        if (footerEmphasis !== null) {
-            body["footerEmphasis"] = 3 - parseInt(footerEmphasis); // Footer is inverted
-        }
-        if (hideTitleInHeader !== null) {
-            body["hideTitleInHeader"] = hideTitleInHeader;
-        }
-        if (disableMegaMenu !== null) {
-            body["megaMenuEnabled"] = !disableMegaMenu;
-        }
-        if (disableFooter !== null) {
-            body["footerEnabled"] = !disableFooter;
-        }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/SetChromeOptions`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            data: body,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const headerLayout = args.options.headerLayout ? HeaderLayout[args.options.headerLayout] : null;
+            const headerEmphasis = args.options.headerEmphasis ? Emphasis[args.options.headerEmphasis] : null;
+            const logoAlignment = args.options.logoAlignment ? Alignment[args.options.logoAlignment] : null;
+            const footerLayout = args.options.footerLayout ? FooterLayout[args.options.footerLayout] : null;
+            const footerEmphasis = args.options.footerEmphasis ? Emphasis[args.options.footerEmphasis] : null;
+            const hideTitleInHeader = typeof args.options.hideTitleInHeader !== "undefined" ? args.options.hideTitleInHeader.toLowerCase() === "true" : null;
+            const disableMegaMenu = typeof args.options.disableMegaMenu !== 'undefined' ? args.options.disableMegaMenu.toLowerCase() === "true" : null;
+            const disableFooter = typeof args.options.disableFooter !== 'undefined' ? args.options.disableFooter.toLowerCase() === "true" : null;
+            const body = {};
+            if (headerLayout !== null) {
+                body["headerLayout"] = headerLayout;
+            }
+            if (headerEmphasis !== null) {
+                body["headerEmphasis"] = headerEmphasis;
+            }
+            if (logoAlignment !== null) {
+                body["logoAlignment"] = logoAlignment;
+            }
+            if (footerLayout !== null) {
+                body["footerLayout"] = footerLayout;
+            }
+            if (footerEmphasis !== null) {
+                body["footerEmphasis"] = 3 - parseInt(footerEmphasis); // Footer is inverted
+            }
+            if (hideTitleInHeader !== null) {
+                body["hideTitleInHeader"] = hideTitleInHeader;
+            }
+            if (disableMegaMenu !== null) {
+                body["megaMenuEnabled"] = !disableMegaMenu;
+            }
+            if (disableFooter !== null) {
+                body["footerEnabled"] = !disableFooter;
+            }
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/web/SetChromeOptions`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                data: body,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteChromeSetCommand_instances = new WeakSet(), _SpoSiteChromeSetCommand_initTelemetry = function _SpoSiteChromeSetCommand_initTelemetry() {
@@ -145,7 +150,7 @@ _SpoSiteChromeSetCommand_instances = new WeakSet(), _SpoSiteChromeSetCommand_ini
     });
 }, _SpoSiteChromeSetCommand_initValidators = function _SpoSiteChromeSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/site/site-commsite-enable.js

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
@@ -35,37 +36,33 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     get description() {
         return 'Enables communication site features on the specified site';
     }
-    commandAction(logger, args, cb) {
-        const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            if (this.debug) {
-                logger.logToStderr(`Retrieving request digest...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.debug) {
+                    logger.logToStderr(`Retrieving request digest...`);
+                }
+                const ctxInfo = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': ctxInfo.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="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${formatting_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" 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) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
             }
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.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="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${utils_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" 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) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableCommand_initTelemetry = function _SpoSiteCommSiteEnableCommand_initTelemetry() {
@@ -83,10 +80,10 @@ _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableC
 }, _SpoSiteCommSiteEnableCommand_initValidators = function _SpoSiteCommSiteEnableCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.designPackageId &&
-            !utils_1.validation.isValidGuid(args.options.designPackageId)) {
+            !validation_1.validation.isValidGuid(args.options.designPackageId)) {
             return `${args.options.designPackageId} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+        return validation_1.validation.isValidSharePointUrl(args.options.url);
     }));
 };
 module.exports = new SpoSiteCommSiteEnableCommand();

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

@@ -16,8 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteEnsureCommand_instances, _SpoSiteEnsureCommand_initOptions, _SpoSiteEnsureCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_1 = require("../../../../cli");
-const utils_1 = require("../../../../utils");
+const Cli_1 = require("../../../../cli/Cli");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const spoWebGetCommand = require("../web/web-get");
@@ -37,10 +37,41 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
     get description() {
         return 'Ensures that the particular site collection exists and updates its properties if necessary';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getWeb(args, logger)
-            .then((getWebOutput) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield this.ensureSite(logger, args);
+                if (this.debug) {
+                    logger.logToStderr(res.stderr);
+                }
+                logger.log(res.stdout);
+                if (this.verbose) {
+                    logger.logToStderr(chalk.green('DONE'));
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    ensureSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let getWebOutput;
+            try {
+                getWebOutput = yield this.getWeb(args, logger);
+            }
+            catch (err) {
+                if (this.debug) {
+                    logger.logToStderr(err.stderr);
+                }
+                if (err.error.message !== '404 FILE NOT FOUND') {
+                    throw err;
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`No site found at ${args.options.url}`);
+                }
+                return this.createSite(args, logger);
+            }
             if (this.debug) {
                 logger.logToStderr(getWebOutput.stderr);
             }
@@ -64,12 +95,12 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                         expectedWebTemplate = args.options.webTemplate;
                         break;
                     default:
-                        return Promise.reject(`${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`);
+                        throw `${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`;
                 }
                 if (expectedWebTemplate) {
                     const currentWebTemplate = `${web.WebTemplate}#${web.Configuration}`;
                     if (expectedWebTemplate !== currentWebTemplate) {
-                        return Promise.reject(`Expected web template ${expectedWebTemplate} but site found at ${args.options.url} is based on ${currentWebTemplate}`);
+                        throw `Expected web template ${expectedWebTemplate} but site found at ${args.options.url} is based on ${currentWebTemplate}`;
                     }
                 }
             }
@@ -77,28 +108,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Site matches conditions. Updating...`);
             }
             return this.updateSite(args, logger);
-        }, (err) => {
-            if (this.debug) {
-                logger.logToStderr(err.stderr);
-            }
-            if (err.error.message !== '404 FILE NOT FOUND') {
-                return Promise.reject(err);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`No site found at ${args.options.url}`);
-            }
-            return this.createSite(args, logger);
-        })
-            .then((res) => {
-            if (this.debug) {
-                logger.logToStderr(res.stderr);
-            }
-            logger.log(res.stdout);
-            if (this.verbose) {
-                logger.logToStderr(chalk.green('DONE'));
-            }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getWeb(args, logger) {
         if (this.verbose) {
@@ -110,7 +120,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     createSite(args, logger) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -141,11 +151,11 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 verbose: this.verbose,
                 debug: this.debug
             };
-            const validationResult = yield spoSiteAddCommand.validate({ options: options }, cli_1.Cli.getCommandInfo(spoSiteAddCommand));
+            const validationResult = yield spoSiteAddCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteAddCommand));
             if (validationResult !== true) {
                 return Promise.reject(validationResult);
             }
-            return cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            return Cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
         });
     }
     updateSite(args, logger) {
@@ -166,11 +176,11 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 verbose: this.verbose,
                 debug: this.debug
             };
-            const validationResult = yield spoSiteSetCommand.validate({ options: options }, cli_1.Cli.getCommandInfo(spoSiteSetCommand));
+            const validationResult = yield spoSiteSetCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteSetCommand));
             if (validationResult !== true) {
                 return Promise.reject(validationResult);
             }
-            return cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            return Cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
         });
     }
     /**
@@ -237,7 +247,7 @@ _SpoSiteEnsureCommand_instances = new WeakSet(), _SpoSiteEnsureCommand_initOptio
         option: '--wait'
     });
 }, _SpoSiteEnsureCommand_initValidators = function _SpoSiteEnsureCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteEnsureCommand();
 //# sourceMappingURL=site-ensure.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteGetCommand_instances, _SpoSiteGetCommand_initOptions, _SpoSiteGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteGetCommand extends SpoCommand_1.default {
@@ -32,26 +32,29 @@ class SpoSiteGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specific site collection';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${args.options.url}/_api/site`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.url}/_api/site`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteGetCommand_instances = new WeakSet(), _SpoSiteGetCommand_initOptions = function _SpoSiteGetCommand_initOptions() {
     this.options.unshift({ option: '-u, --url <url>' });
 }, _SpoSiteGetCommand_initValidators = function _SpoSiteGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteGetCommand();
 //# sourceMappingURL=site-get.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteGroupifyCommand_instances, _SpoSiteGroupifyCommand_initTelemetry, _SpoSiteGroupifyCommand_initOptions, _SpoSiteGroupifyCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteGroupifyCommand extends SpoCommand_1.default {
@@ -33,39 +33,42 @@ class SpoSiteGroupifyCommand extends SpoCommand_1.default {
     get description() {
         return 'Connects site collection to an Microsoft 365 Group';
     }
-    commandAction(logger, args, cb) {
-        const optionalParams = {};
-        const payload = {
-            displayName: args.options.displayName,
-            alias: args.options.alias,
-            isPublic: args.options.isPublic === true,
-            optionalParams: optionalParams
-        };
-        if (args.options.description) {
-            optionalParams.Description = args.options.description;
-        }
-        if (args.options.classification) {
-            optionalParams.Classification = args.options.classification;
-        }
-        if (args.options.keepOldHomepage) {
-            optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
-        }
-        const requestOptions = {
-            url: `${args.options.url}/_api/GroupSiteManager/CreateGroupForSite`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata',
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const optionalParams = {};
+            const payload = {
+                displayName: args.options.displayName,
+                alias: args.options.alias,
+                isPublic: args.options.isPublic === true,
+                optionalParams: optionalParams
+            };
+            if (args.options.description) {
+                optionalParams.Description = args.options.description;
+            }
+            if (args.options.classification) {
+                optionalParams.Classification = args.options.classification;
+            }
+            if (args.options.keepOldHomepage) {
+                optionalParams.CreationOptions = ["SharePointKeepOldHomepage"];
+            }
+            const requestOptions = {
+                url: `${args.options.url}/_api/GroupSiteManager/CreateGroupForSite`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata',
+                    responseType: 'json'
+                },
+                data: payload,
                 responseType: 'json'
-            },
-            data: payload,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initTelemetry = function _SpoSiteGroupifyCommand_initTelemetry() {
@@ -94,7 +97,7 @@ _SpoSiteGroupifyCommand_instances = new WeakSet(), _SpoSiteGroupifyCommand_initT
         option: '--keepOldHomepage'
     });
 }, _SpoSiteGroupifyCommand_initValidators = function _SpoSiteGroupifyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSiteGroupifyCommand();
 //# sourceMappingURL=site-groupify.js.map