@pnp/cli-microsoft365 6.11.0-beta.259c884 → 6.11.0-beta.2d03676

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
-            });
+            };
         });
     }
     /**

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

@@ -31,15 +31,14 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
     constructor() {
         super();
         _SpoSiteAppPermissionRemoveCommand_instances.add(this);
-        this.siteId = '';
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptionSets).call(this);
     }
-    getPermissions() {
+    getPermissions(siteId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
+            url: `${this.resource}/v1.0/sites/${siteId}/permissions`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -47,34 +46,33 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    getFilteredPermissions(args, permissions) {
+    getFilteredPermissions(options, permissions) {
         let filterProperty = 'displayName';
-        let filterValue = args.options.appDisplayName;
-        if (args.options.appId) {
+        let filterValue = options.appDisplayName;
+        if (options.appId) {
             filterProperty = 'id';
-            filterValue = args.options.appId;
+            filterValue = options.appId;
         }
         return permissions.filter((p) => {
             return p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue);
         });
     }
-    getPermissionIds(args) {
-        if (args.options.id) {
-            return Promise.resolve([args.options.id]);
-        }
-        return this
-            .getPermissions()
-            .then((res) => {
-            let permissions = res.value;
-            if (args.options.appId || args.options.appDisplayName) {
-                permissions = this.getFilteredPermissions(args, res.value);
+    getPermissionIds(siteId, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return Promise.resolve([options.id]);
+            }
+            const permissionsObject = yield this.getPermissions(siteId);
+            let permissions = permissionsObject.value;
+            if (options.appId || options.appDisplayName) {
+                permissions = this.getFilteredPermissions(options, permissionsObject.value);
             }
-            return Promise.resolve(permissions.map(x => x.id));
+            return permissions.map(x => x.id);
         });
     }
-    removePermissions(permissionId) {
+    removePermissions(siteId, permissionId) {
         const spRequestOptions = {
-            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${permissionId}`,
+            url: `${this.resource}/v1.0/sites/${siteId}/permissions/${permissionId}`,
             headers: {
                 'accept': 'application/json;odata.metadata=none'
             },
@@ -84,23 +82,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeSiteAppPermission = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
-                    const permissionIdsToRemove = yield this.getPermissionIds(args);
-                    const tasks = [];
-                    for (const permissionId of permissionIdsToRemove) {
-                        tasks.push(this.removePermissions(permissionId));
-                    }
-                    const res = yield Promise.all(tasks);
-                    logger.log(res);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeSiteAppPermission();
+                yield this.removeSiteAppPermission(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -110,11 +93,28 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
                 });
                 if (result.continue) {
-                    yield removeSiteAppPermission();
+                    yield this.removeSiteAppPermission(logger, args.options);
                 }
             }
         });
     }
+    removeSiteAppPermission(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const siteId = yield spo_1.spo.getSpoGraphSiteId(options.siteUrl);
+                const permissionIdsToRemove = yield this.getPermissionIds(siteId, options);
+                const tasks = [];
+                for (const permissionId of permissionIdsToRemove) {
+                    tasks.push(this.removePermissions(siteId, permissionId));
+                }
+                const response = yield Promise.all(tasks);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermissionRemoveCommand_initTelemetry = function _SpoSiteAppPermissionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -47,27 +47,26 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         return permissions.filter((p) => p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue));
     }
     getPermission(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const permissionRequestOptions = {
-            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(permissionRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const permissionRequestOptions = {
+                url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(permissionRequestOptions);
             const sitePermissionItems = this.getFilteredPermissions(args, response.value);
             if (sitePermissionItems.length === 0) {
-                return Promise.reject('The specified app permission does not exist');
+                throw 'The specified app permission does not exist';
             }
             if (sitePermissionItems.length > 1) {
-                return Promise.reject(`Multiple app permissions with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.grantedToIdentities.map(y => y.application.id))}`);
+                throw `Multiple app permissions with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.grantedToIdentities.map(y => y.application.id))}`;
             }
-            return Promise.resolve(sitePermissionItems[0].id);
+            return sitePermissionItems[0].id;
         });
     }
     commandAction(logger, args) {

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

@@ -16,14 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteEnsureCommand_instances, _SpoSiteEnsureCommand_initOptions, _SpoSiteEnsureCommand_initTypes, _SpoSiteEnsureCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-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");
 const SharingCapabilities_1 = require("./SharingCapabilities");
-const spoSiteAddCommand = require("./site-add");
-const spoSiteSetCommand = require("./site-set");
+const spo_1 = require("../../../../utils/spo");
 class SpoSiteEnsureCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.SITE_ENSURE;
@@ -42,10 +39,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
         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);
+                logger.log(res);
                 if (this.verbose) {
                     logger.logToStderr(chalk.green('DONE'));
                 }
@@ -63,9 +57,9 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             }
             catch (err) {
                 if (this.debug) {
-                    logger.logToStderr(err.stderr);
+                    logger.logToStderr(err);
                 }
-                if (err.error.message !== '404 FILE NOT FOUND') {
+                if (err.error !== '404 FILE NOT FOUND') {
                     throw err;
                 }
                 if (this.verbose) {
@@ -74,12 +68,15 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 return this.createSite(args, logger);
             }
             if (this.debug) {
-                logger.logToStderr(getWebOutput.stderr);
+                logger.logToStderr(getWebOutput);
             }
             if (this.verbose) {
                 logger.logToStderr(`Site found at ${args.options.url}. Checking if site matches conditions...`);
             }
-            const web = JSON.parse(getWebOutput.stdout);
+            const web = {
+                Configuration: getWebOutput.Configuration,
+                WebTemplate: getWebOutput.WebTemplate
+            };
             if (args.options.type) {
                 // type was specified so we need to check if the existing site matches
                 // it. If not, we throw an error and stop
@@ -112,51 +109,20 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
         });
     }
     getWeb(args, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Checking if site ${args.options.url} exists...`);
-        }
-        const options = {
-            url: args.options.url,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Checking if site ${args.options.url} exists...`);
+            }
+            return yield spo_1.spo.getWeb(args.options.url, logger, this.verbose);
+        });
     }
     createSite(args, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Creating site...`);
             }
-            const options = {
-                type: args.options.type,
-                title: args.options.title,
-                alias: args.options.alias,
-                description: args.options.description,
-                classification: args.options.classification,
-                isPublic: args.options.isPublic,
-                lcid: args.options.lcid,
-                url: typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url,
-                owners: args.options.owners,
-                shareByEmailEnabled: args.options.shareByEmailEnabled,
-                siteDesign: args.options.siteDesign,
-                siteDesignId: args.options.siteDesignId,
-                timeZone: args.options.timeZone,
-                webTemplate: args.options.webTemplate,
-                resourceQuota: args.options.resourceQuota,
-                resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
-                storageQuota: args.options.storageQuota,
-                storageQuotaWarningLevel: args.options.storageQuotaWarningLevel,
-                removeDeletedSite: args.options.removeDeletedSite,
-                wait: args.options.wait,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            const validationResult = yield spoSiteAddCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteAddCommand));
-            if (validationResult !== true) {
-                throw validationResult;
-            }
-            return Cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const url = typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url;
+            return yield spo_1.spo.addSite(args.options.title, logger, this.verbose, args.options.wait, args.options.type, args.options.alias, args.options.description, args.options.owners, args.options.shareByEmailEnabled, args.options.removeDeletedSite, args.options.classification, args.options.isPublic, args.options.lcid, url, args.options.siteDesign, args.options.siteDesignId, args.options.timeZone, args.options.webTemplate, args.options.resourceQuota, args.options.resourceQuotaWarningLevel, args.options.storageQuota, args.options.storageQuotaWarningLevel);
         });
     }
     updateSite(args, logger) {
@@ -164,24 +130,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Updating site...`);
             }
-            const options = {
-                classification: args.options.classification,
-                disableFlows: args.options.disableFlows,
-                isPublic: args.options.isPublic,
-                owners: args.options.owners,
-                shareByEmailEnabled: args.options.shareByEmailEnabled,
-                siteDesignId: args.options.siteDesignId,
-                title: args.options.title,
-                url: args.options.url,
-                sharingCapability: args.options.sharingCapability,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            const validationResult = yield spoSiteSetCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteSetCommand));
-            if (validationResult !== true) {
-                throw validationResult;
-            }
-            return Cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            return yield spo_1.spo.updateSite(args.options.url, logger, this.verbose, args.options.title, args.options.classification, args.options.disableFlows, args.options.isPublic, args.options.owners, args.options.shareByEmailEnabled, args.options.siteDesignId, args.options.sharingCapability);
         });
     }
     /**