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

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

@@ -93,33 +93,33 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         return request_1.default.post(requestOptions);
     }
     updateSharePointOnlySite(logger, args) {
-        if (this.debug) {
-            logger.logToStderr('Site is not group connected');
-        }
-        if (typeof args.options.isPublic !== 'undefined') {
-            return Promise.reject(`The isPublic option can't be set on a site that is not groupified`);
-        }
-        return this.updateSiteDescription(logger, args)
-            .then(_ => this.updateSiteOwners(logger, args));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.debug) {
+                logger.logToStderr('Site is not group connected');
+            }
+            if (typeof args.options.isPublic !== 'undefined') {
+                throw `The isPublic option can't be set on a site that is not groupified`;
+            }
+            yield this.updateSiteDescription(logger, args);
+            yield this.updateSiteOwners(logger, args);
+        });
     }
-    waitForSiteUpdateCompletion(logger, args, res) {
-        return new Promise((resolve, reject) => {
-            if (!res) {
-                resolve();
+    waitForSiteUpdateCompletion(logger, args, response) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!response) {
                 return;
             }
-            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;
-                }
+            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 (!args.options.wait || isComplete) {
+                return;
+            }
+            yield new Promise((resolve, reject) => {
                 setTimeout(() => {
                     spo_1.spo.waitUntilFinished({
                         operationId: JSON.stringify(operation._ObjectIdentity_),
@@ -132,29 +132,24 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                         verbose: this.verbose
                     });
                 }, operation.PollingInterval);
-            }
+            });
         });
     }
     updateSiteOwners(logger, args) {
-        if (!args.options.owners) {
-            return Promise.resolve();
-        }
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.owners) {
+                return;
+            }
             if (this.verbose) {
                 logger.logToStderr(`Updating site owners ${args.options.url}...`);
             }
-            Promise.all(args.options.owners.split(',').map(o => {
+            yield Promise.all(args.options.owners.split(',').map(o => {
                 return this.setAdmin(args.options.url, o.trim());
-            }))
-                .then(() => {
-                resolve();
-            }, (err) => {
-                reject(err);
-            });
+            }));
         });
     }
     setAdmin(siteUrl, principal) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
                 url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -162,70 +157,67 @@ class SpoSiteSetCommand 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="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" 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 {
-                    resolve();
-                }
-            }, (err) => {
-                reject(err);
-            });
+            const response = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
         });
     }
     updateSiteDescription(logger, args) {
-        if (!args.options.description) {
-            return Promise.resolve(undefined);
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Setting site description ${args.options.url}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.url}/_api/web`,
-            headers: {
-                'IF-MATCH': '*',
-                'Accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json;odata=nometadata',
-                'X-RequestDigest': this.context.FormDigestValue,
-                'X-HTTP-Method': 'MERGE'
-            },
-            data: {
-                Description: args.options.description
-            },
-            json: true
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.description) {
+                return;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Setting site description ${args.options.url}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.url}/_api/web`,
+                headers: {
+                    'IF-MATCH': '*',
+                    'Accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json;odata=nometadata',
+                    'X-RequestDigest': this.context.FormDigestValue,
+                    'X-HTTP-Method': 'MERGE'
+                },
+                data: {
+                    Description: args.options.description
+                },
+                json: true
+            };
+            yield request_1.default.post(requestOptions);
+        });
     }
     updateSiteLockState(logger, args) {
-        if (!args.options.lockState) {
-            return Promise.resolve(undefined);
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Setting site lock state ${args.options.url}...`);
-        }
-        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><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.lockState)}</Parameter></SetProperty><ObjectPath Id="9" ObjectPathId="8" /><ObjectIdentityQuery Id="10" ObjectPathId="5" /><Query Id="11" ObjectPathId="8"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="5" ParentId="3" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="8" ParentId="5" Name="Update" /><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.lockState) {
+                return;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Setting site lock state ${args.options.url}...`);
+            }
+            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><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.lockState)}</Parameter></SetProperty><ObjectPath Id="9" ObjectPathId="8" /><ObjectIdentityQuery Id="10" ObjectPathId="5" /><Query Id="11" ObjectPathId="8"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="5" ParentId="3" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="8" ParentId="5" Name="Update" /><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
     updateGroupConnectedSite(logger, args) {
-        if (this.debug) {
-            logger.logToStderr(`Site attached to group ${this.groupId}`);
-        }
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.debug) {
+                logger.logToStderr(`Site attached to group ${this.groupId}`);
+            }
             if (typeof args.options.title === 'undefined' &&
                 typeof args.options.description === 'undefined' &&
                 typeof args.options.isPublic === 'undefined' &&
                 typeof args.options.owners === 'undefined') {
-                return resolve();
+                return;
             }
             const promises = [];
             if (typeof args.options.title !== 'undefined') {
@@ -258,13 +250,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 promises.push(this.setGroupifiedSiteDescription(args.options.description));
             }
             promises.push(this.setGroupifiedSiteOwners(logger, args));
-            Promise
-                .all(promises)
-                .then(() => {
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
+            yield Promise.all(promises);
         });
     }
     setGroupifiedSiteDescription(description) {
@@ -280,26 +266,26 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         return request_1.default.patch(requestOptions);
     }
     setGroupifiedSiteOwners(logger, args) {
-        if (typeof args.options.owners === 'undefined') {
-            return Promise.resolve();
-        }
-        const owners = args.options.owners.split(',').map(o => o.trim());
-        if (this.verbose) {
-            logger.logToStderr('Retrieving user information to set group owners...');
-        }
-        const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-            headers: {
-                'content-type': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions)
-            .then((res) => {
-            if (res.value.length === 0) {
-                return Promise.resolve();
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof args.options.owners === 'undefined') {
+                return;
+            }
+            const owners = args.options.owners.split(',').map(o => o.trim());
+            if (this.verbose) {
+                logger.logToStderr('Retrieving user information to set group owners...');
             }
-            return Promise.all(res.value.map(user => {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value.length === 0) {
+                return;
+            }
+            yield Promise.all(response.value.map(user => {
                 const requestOptions = {
                     url: `${this.spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${this.groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
                     headers: {
@@ -327,10 +313,9 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 }
             }
             if (!updatedProperties) {
-                return Promise.resolve(undefined);
+                return;
             }
-            const res = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-            this.context = res;
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
             if (this.verbose) {
                 logger.logToStderr(`Updating site ${args.options.url} properties...`);
             }
@@ -364,6 +349,9 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 const flowsPolicy = args.options.disableFlows ? FlowsPolicy_1.FlowsPolicy.Disabled : FlowsPolicy_1.FlowsPolicy.Enabled;
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Enum">${flowsPolicy}</Parameter></SetProperty>`);
             }
+            if (typeof args.options.socialBarOnSitePagesDisabled !== 'undefined') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SocialBarOnSitePagesDisabled"><Parameter Type="Boolean">${args.options.socialBarOnSitePagesDisabled}</Parameter></SetProperty>`);
+            }
             if (args.options.shareByEmailEnabled !== undefined) {
                 sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
             }
@@ -381,7 +369,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 const requestOptions = {
                     url: `${args.options.url}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
-                        'X-RequestDigest': res.FormDigestValue
+                        '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>${sitePropertiesPayload.join('')}</Actions><ObjectPaths><StaticProperty Id="1" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="5" ParentId="1" Name="Site" /></ObjectPaths></Request>`
                 };
@@ -392,7 +380,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 const requestOptions = {
                     url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
-                        'X-RequestDigest': res.FormDigestValue
+                        '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>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting_1.formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
                 };
@@ -402,38 +390,38 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         });
     }
     applySiteDesign(logger, args) {
-        if (typeof args.options.siteDesignId === 'undefined') {
-            return Promise.resolve();
-        }
-        const options = {
-            webUrl: args.options.url,
-            id: args.options.siteDesignId,
-            asTask: false,
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommand(spoSiteDesignApplyCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof args.options.siteDesignId === 'undefined') {
+                return;
+            }
+            const options = {
+                webUrl: args.options.url,
+                id: args.options.siteDesignId,
+                asTask: false,
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            return Cli_1.Cli.executeCommand(spoSiteDesignApplyCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        });
     }
     loadSiteIds(siteUrl, logger) {
-        if (this.debug) {
-            logger.logToStderr('Loading site IDs...');
-        }
-        const requestOptions = {
-            url: `${siteUrl}/_api/site?$select=GroupId,Id`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((siteInfo) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.debug) {
+                logger.logToStderr('Loading site IDs...');
+            }
+            const requestOptions = {
+                url: `${siteUrl}/_api/site?$select=GroupId,Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const siteInfo = yield request_1.default.get(requestOptions);
             this.groupId = siteInfo.GroupId;
             this.siteId = siteInfo.Id;
             if (this.debug) {
                 logger.logToStderr(`Retrieved site IDs. siteId: ${this.siteId}, groupId: ${this.groupId}`);
             }
-            return Promise.resolve();
         });
     }
     isGroupConnectedSite() {

package/dist/utils/aadGroup.js

@@ -71,6 +71,26 @@ exports.aadGroup = {
             }
             return groups[0].id;
         });
+    },
+    setGroup(id, isPrivate, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (verbose && logger) {
+                logger.logToStderr(`Updating Microsoft 365 Group ${id}...`);
+            }
+            const update = {};
+            if (typeof isPrivate !== 'undefined') {
+                update.visibility = isPrivate ? 'Private' : 'Public';
+            }
+            const requestOptions = {
+                url: `${graphResource}/v1.0/groups/${id}`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: update
+            };
+            yield request_1.default.patch(requestOptions);
+        });
     }
 };
 //# sourceMappingURL=aadGroup.js.map

package/dist/utils/fsUtil.js

@@ -99,6 +99,11 @@ exports.fsUtil = {
     },
     getRemoveCommand(command, shell) {
         return removeFileCommands[shell][command];
+    },
+    ensureDirectory(path) {
+        if (!fs.existsSync(path)) {
+            fs.mkdirSync(path, { recursive: true });
+        }
     }
 };
 //# sourceMappingURL=fsUtil.js.map