@pnp/cli-microsoft365 7.7.0 → 7.8.0-beta.5ca5055

package/dist/utils/spo.js

@@ -11,8 +11,9 @@ import { odata } from './odata.js';
 import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
 import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
+import { setTimeout } from 'timers/promises';
 export const spo = {
-    getRequestDigest(siteUrl) {
+    async getRequestDigest(siteUrl) {
         const requestOptions = {
             url: `${siteUrl}/_api/contextinfo`,
             headers: {
@@ -22,172 +23,128 @@ export const spo = {
         };
         return request.post(requestOptions);
     },
-    ensureFormDigest(siteUrl, logger, context, debug) {
-        return new Promise(async (resolve, reject) => {
-            if (validation.isValidFormDigest(context)) {
-                if (debug) {
-                    await logger.logToStderr('Existing form digest still valid');
-                }
-                resolve(context);
-                return;
-            }
-            spo
-                .getRequestDigest(siteUrl)
-                .then((res) => {
-                const now = new Date();
-                now.setSeconds(now.getSeconds() + res.FormDigestTimeoutSeconds - 5);
-                context = {
-                    FormDigestValue: res.FormDigestValue,
-                    FormDigestTimeoutSeconds: res.FormDigestTimeoutSeconds,
-                    FormDigestExpiresAt: now,
-                    WebFullUrl: res.WebFullUrl
-                };
-                resolve(context);
-            }, (error) => {
-                reject(error);
-            });
-        });
-    },
-    waitUntilFinished({ operationId, siteUrl, resolve, reject, logger, currentContext, debug, verbose }) {
-        spo
-            .ensureFormDigest(siteUrl, logger, currentContext, debug)
-            .then(async (res) => {
-            currentContext = res;
+    async ensureFormDigest(siteUrl, logger, context, debug) {
+        if (validation.isValidFormDigest(context)) {
             if (debug) {
-                await logger.logToStderr(`Checking if operation ${operationId} completed...`);
+                await logger.logToStderr('Existing form digest still valid');
             }
-            const requestOptions = {
-                url: `${siteUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': currentContext.FormDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="188" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="184" Name="${operationId.replace(/\\n/g, '&#xA;').replace(/"/g, '')}" /></ObjectPaths></Request>`
-            };
-            return request.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 (isComplete) {
-                    if (!debug && verbose) {
-                        process.stdout.write('\n');
-                    }
-                    resolve();
-                    return;
+            return context;
+        }
+        const res = await spo.getRequestDigest(siteUrl);
+        const now = new Date();
+        now.setSeconds(now.getSeconds() + res.FormDigestTimeoutSeconds - 5);
+        context = {
+            FormDigestValue: res.FormDigestValue,
+            FormDigestTimeoutSeconds: res.FormDigestTimeoutSeconds,
+            FormDigestExpiresAt: now,
+            WebFullUrl: res.WebFullUrl
+        };
+        return context;
+    },
+    async waitUntilFinished({ operationId, siteUrl, logger, currentContext, debug, verbose }) {
+        const resFormDigest = await spo.ensureFormDigest(siteUrl, logger, currentContext, debug);
+        currentContext = resFormDigest;
+        if (debug) {
+            await logger.logToStderr(`Checking if operation ${operationId} completed...`);
+        }
+        const requestOptions = {
+            url: `${siteUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': currentContext.FormDigestValue
+            },
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="188" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="184" Name="${operationId.replace(/\\n/g, '&#xA;').replace(/"/g, '')}" /></ObjectPaths></Request>`
+        };
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw new Error(response.ErrorInfo.ErrorMessage);
+        }
+        else {
+            const operation = json[json.length - 1];
+            const isComplete = operation.IsComplete;
+            if (isComplete) {
+                if (!debug && verbose) {
+                    process.stdout.write('\n');
                 }
-                setTimeout(() => {
-                    spo.waitUntilFinished({
-                        operationId: JSON.stringify(operation._ObjectIdentity_),
-                        siteUrl,
-                        resolve,
-                        reject,
-                        logger,
-                        currentContext,
-                        debug,
-                        verbose
-                    });
-                }, operation.PollingInterval);
+                return;
             }
-        });
+            await setTimeout(operation.PollingInterval);
+            await spo.waitUntilFinished({
+                operationId: JSON.stringify(operation._ObjectIdentity_),
+                siteUrl,
+                logger,
+                currentContext,
+                debug,
+                verbose
+            });
+        }
     },
     async getSpoUrl(logger, debug) {
         if (auth.connection.spoUrl) {
             if (debug) {
                 await logger.logToStderr(`SPO URL previously retrieved ${auth.connection.spoUrl}. Returning...`);
             }
-            return Promise.resolve(auth.connection.spoUrl);
+            return auth.connection.spoUrl;
+        }
+        if (debug) {
+            await logger.logToStderr(`No SPO URL available. Retrieving from MS Graph...`);
         }
-        return new Promise(async (resolve, reject) => {
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/sites/root?$select=webUrl`,
+            headers: {
+                'accept': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        auth.connection.spoUrl = res.webUrl;
+        try {
+            await auth.storeConnectionInfo();
+        }
+        catch (e) {
             if (debug) {
-                await logger.logToStderr(`No SPO URL available. Retrieving from MS Graph...`);
+                await logger.logToStderr('Error while storing connection info');
             }
-            const requestOptions = {
-                url: `https://graph.microsoft.com/v1.0/sites/root?$select=webUrl`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            request
-                .get(requestOptions)
-                .then((res) => {
-                auth.connection.spoUrl = res.webUrl;
-                return auth.storeConnectionInfo();
-            })
-                .then(() => {
-                resolve(auth.connection.spoUrl);
-            }, (err) => {
-                if (auth.connection.spoUrl) {
-                    resolve(auth.connection.spoUrl);
-                }
-                else {
-                    reject(err);
-                }
-            });
-        });
+        }
+        return auth.connection.spoUrl;
     },
-    getSpoAdminUrl(logger, debug) {
-        return new Promise((resolve, reject) => {
-            spo
-                .getSpoUrl(logger, debug)
-                .then((spoUrl) => {
-                resolve(spoUrl.replace(/(https:\/\/)([^\.]+)(.*)/, '$1$2-admin$3'));
-            }, (error) => {
-                reject(error);
-            });
-        });
+    async getSpoAdminUrl(logger, debug) {
+        const spoUrl = await spo.getSpoUrl(logger, debug);
+        return (spoUrl.replace(/(https:\/\/)([^\.]+)(.*)/, '$1$2-admin$3'));
     },
     async getTenantId(logger, debug) {
         if (auth.connection.spoTenantId) {
             if (debug) {
                 await logger.logToStderr(`SPO Tenant ID previously retrieved ${auth.connection.spoTenantId}. Returning...`);
             }
-            return Promise.resolve(auth.connection.spoTenantId);
+            return auth.connection.spoTenantId;
+        }
+        if (debug) {
+            await logger.logToStderr(`No SPO Tenant ID available. Retrieving...`);
+        }
+        const spoAdminUrl = await spo.getSpoAdminUrl(logger, debug);
+        const contextInfo = await spo.getRequestDigest(spoAdminUrl);
+        const tenantInfoRequestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': contextInfo.FormDigestValue,
+                accept: 'application/json;odata=nometadata'
+            },
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const res = await request.post(tenantInfoRequestOptions);
+        const json = JSON.parse(res);
+        auth.connection.spoTenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '&#xA;');
+        try {
+            await auth.storeConnectionInfo();
         }
-        return new Promise(async (resolve, reject) => {
+        catch (e) {
             if (debug) {
-                await logger.logToStderr(`No SPO Tenant ID available. Retrieving...`);
+                await logger.logToStderr('Error while storing connection info');
             }
-            let spoAdminUrl = '';
-            spo
-                .getSpoAdminUrl(logger, debug)
-                .then((_spoAdminUrl) => {
-                spoAdminUrl = _spoAdminUrl;
-                return spo.getRequestDigest(spoAdminUrl);
-            })
-                .then((contextInfo) => {
-                const tenantInfoRequestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': contextInfo.FormDigestValue,
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request.post(tenantInfoRequestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                auth.connection.spoTenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '&#xA;');
-                return auth.storeConnectionInfo();
-            })
-                .then(() => {
-                resolve(auth.connection.spoTenantId);
-            }, (err) => {
-                if (auth.connection.spoTenantId) {
-                    resolve(auth.connection.spoTenantId);
-                }
-                else {
-                    reject(err);
-                }
-            });
-        });
+        }
+        return auth.connection.spoTenantId;
     },
     /**
      * Returns the Graph id of a site
@@ -214,10 +171,10 @@ export const spo = {
     async ensureFolder(webFullUrl, folderToEnsure, logger, debug) {
         const webUrl = url.parse(webFullUrl);
         if (!webUrl.protocol || !webUrl.hostname) {
-            return Promise.reject('webFullUrl is not a valid URL');
+            throw new Error('webFullUrl is not a valid URL');
         }
         if (!folderToEnsure) {
-            return Promise.reject('folderToEnsure cannot be empty');
+            throw new Error('folderToEnsure cannot be empty');
         }
         // remove last '/' of webFullUrl if exists
         const webFullUrlLastCharPos = webFullUrl.length - 1;
@@ -242,12 +199,12 @@ export const spo = {
             await logger.log('');
         }
         // recursive function
-        const checkOrAddFolder = async (resolve, reject) => {
+        async function checkOrAddFolder() {
             if (folderIndex === folders.length) {
                 if (debug) {
                     await logger.log(`All sub-folders exist`);
                 }
-                return resolve();
+                return;
             }
             // append the next sub-folder to the folder path and check if it exists
             prevFolder = nextFolder;
@@ -259,13 +216,12 @@ export const spo = {
                     'accept': 'application/json;odata=nometadata'
                 }
             };
-            request
-                .get(requestOptions)
-                .then(() => {
+            try {
+                await request.get(requestOptions);
                 folderIndex++;
-                checkOrAddFolder(resolve, reject);
-            })
-                .catch(() => {
+                await checkOrAddFolder();
+            }
+            catch {
                 const prevFolderServerRelativeUrl = urlUtil.getServerRelativePath(webFullUrl, prevFolder);
                 const requestOptions = {
                     url: `${webFullUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl=@a1)/AddSubFolderUsingPath(DecodedUrl=@a2)?@a1=%27${formatting.encodeQueryParameter(prevFolderServerRelativeUrl)}%27&@a2=%27${formatting.encodeQueryParameter(folders[folderIndex])}%27`,
@@ -274,20 +230,21 @@ export const spo = {
                     },
                     responseType: 'json'
                 };
-                return request.post(requestOptions)
-                    .then(() => {
+                try {
+                    await request.post(requestOptions);
                     folderIndex++;
-                    checkOrAddFolder(resolve, reject);
-                })
-                    .catch(async (err) => {
+                    await checkOrAddFolder();
+                }
+                catch (err) {
                     if (debug) {
                         await logger.log(`Could not create sub-folder ${folderServerRelativeUrl}`);
                     }
-                    reject(err);
-                });
-            });
-        };
-        return new Promise(checkOrAddFolder);
+                    throw err;
+                }
+            }
+        }
+        ;
+        return checkOrAddFolder();
     },
     /**
      * Requests web object identity for the current web.
@@ -299,7 +256,7 @@ export const spo = {
      * @param webUrl web url
      * @param formDigestValue formDigestValue
      */
-    getCurrentWebIdentity(webUrl, formDigestValue) {
+    async getCurrentWebIdentity(webUrl, formDigestValue) {
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {
@@ -307,23 +264,20 @@ export const spo = {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then((res) => {
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x.ErrorInfo; });
-                if (contents && contents.ErrorInfo) {
-                    return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const identityObject = json.find(x => { return x._ObjectIdentity_; });
-                if (identityObject) {
-                    return resolve({
-                        objectIdentity: identityObject._ObjectIdentity_,
-                        serverRelativeUrl: identityObject.ServerRelativeUrl
-                    });
-                }
-                reject('Cannot proceed. _ObjectIdentity_ not found'); // this is not supposed to happen
-            }, (err) => { reject(err); });
-        });
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x.ErrorInfo; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+        }
+        const identityObject = json.find(x => { return x._ObjectIdentity_; });
+        if (identityObject) {
+            return {
+                objectIdentity: identityObject._ObjectIdentity_,
+                serverRelativeUrl: identityObject.ServerRelativeUrl
+            };
+        }
+        throw 'Cannot proceed. _ObjectIdentity_ not found';
     },
     /**
      * Gets EffectiveBasePermissions for web return type is "_ObjectType_\":\"SP.Web\".
@@ -332,7 +286,7 @@ export const spo = {
      * @param siteAccessToken site access token
      * @param formDigestValue formDigestValue
      */
-    getEffectiveBasePermissions(webObjectIdentity, webUrl, formDigestValue, logger, debug) {
+    async getEffectiveBasePermissions(webObjectIdentity, webUrl, formDigestValue, logger, debug) {
         const basePermissionsResult = new BasePermissions();
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -341,25 +295,22 @@ export const spo = {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="11" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="EffectiveBasePermissions" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="${webObjectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then(async (res) => {
-                if (debug) {
-                    await logger.log('Attempt to get the web EffectiveBasePermissions');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x.ErrorInfo; });
-                if (contents && contents.ErrorInfo) {
-                    return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const permissionsObj = json.find(x => { return x.EffectiveBasePermissions; });
-                if (permissionsObj) {
-                    basePermissionsResult.high = permissionsObj.EffectiveBasePermissions.High;
-                    basePermissionsResult.low = permissionsObj.EffectiveBasePermissions.Low;
-                    return resolve(basePermissionsResult);
-                }
-                reject('Cannot proceed. EffectiveBasePermissions not found'); // this is not supposed to happen
-            }, (err) => { reject(err); });
-        });
+        const res = await request.post(requestOptions);
+        if (debug) {
+            await logger.log('Attempt to get the web EffectiveBasePermissions');
+        }
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x.ErrorInfo; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+        }
+        const permissionsObj = json.find(x => { return x.EffectiveBasePermissions; });
+        if (permissionsObj) {
+            basePermissionsResult.high = permissionsObj.EffectiveBasePermissions.High;
+            basePermissionsResult.low = permissionsObj.EffectiveBasePermissions.Low;
+            return basePermissionsResult;
+        }
+        throw ('Cannot proceed. EffectiveBasePermissions not found'); // this is not supposed to happen
     },
     /**
       * Gets folder by server relative url (GetFolderByServerRelativeUrl in REST)
@@ -371,7 +322,7 @@ export const spo = {
       * @param siteRelativeUrl site relative url e.g. /Shared Documents/Folder1
       * @param formDigestValue formDigestValue
       */
-    getFolderIdentity(webObjectIdentity, webUrl, siteRelativeUrl, formDigestValue) {
+    async getFolderIdentity(webObjectIdentity, webUrl, siteRelativeUrl, formDigestValue) {
         const serverRelativePath = urlUtil.getServerRelativePath(webUrl, siteRelativeUrl);
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -380,23 +331,20 @@ export const spo = {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><Query Id="12" ObjectPathId="9"><Query SelectAllProperties="false"><Properties><Property Name="Properties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="9" ParentId="5" Name="GetFolderByServerRelativeUrl"><Parameters><Parameter Type="String">${serverRelativePath}</Parameter></Parameters></Method><Identity Id="5" Name="${webObjectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            return request.post(requestOptions).then((res) => {
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x.ErrorInfo; });
-                if (contents && contents.ErrorInfo) {
-                    return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const objectIdentity = json.find(x => { return x._ObjectIdentity_; });
-                if (objectIdentity) {
-                    return resolve({
-                        objectIdentity: objectIdentity._ObjectIdentity_,
-                        serverRelativeUrl: serverRelativePath
-                    });
-                }
-                reject('Cannot proceed. Folder _ObjectIdentity_ not found'); // this is not suppose to happen
-            }, (err) => { reject(err); });
-        });
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x.ErrorInfo; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+        }
+        const objectIdentity = json.find(x => { return x._ObjectIdentity_; });
+        if (objectIdentity) {
+            return {
+                objectIdentity: objectIdentity._ObjectIdentity_,
+                serverRelativeUrl: serverRelativePath
+            };
+        }
+        throw 'Cannot proceed. Folder _ObjectIdentity_ not found';
     },
     /**
      * Retrieves the SiteId, VroomItemId and VroomDriveId from a specific file.
@@ -702,19 +650,14 @@ export const spo = {
                 if (!wait || isComplete) {
                     return;
                 }
-                await new Promise((resolve, reject) => {
-                    setTimeout(() => {
-                        spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: context,
-                            verbose: verbose,
-                            debug: verbose
-                        });
-                    }, operation.PollingInterval);
+                await setTimeout(operation.PollingInterval);
+                await spo.waitUntilFinished({
+                    operationId: JSON.stringify(operation._ObjectIdentity_),
+                    siteUrl: spoAdminUrl,
+                    logger,
+                    currentContext: context,
+                    verbose: verbose,
+                    debug: verbose
                 });
             }
         }
@@ -921,19 +864,14 @@ export const spo = {
         if (!wait || isComplete) {
             return;
         }
-        await new Promise((resolve, reject) => {
-            setTimeout(() => {
-                spo.waitUntilFinished({
-                    operationId: JSON.stringify(operation._ObjectIdentity_),
-                    siteUrl: spoAdminUrl,
-                    resolve,
-                    reject,
-                    logger,
-                    currentContext: context,
-                    verbose: verbose,
-                    debug: verbose
-                });
-            }, operation.PollingInterval);
+        await setTimeout(operation.PollingInterval);
+        await spo.waitUntilFinished({
+            operationId: JSON.stringify(operation._ObjectIdentity_),
+            siteUrl: spoAdminUrl,
+            logger,
+            currentContext: context,
+            verbose: verbose,
+            debug: verbose
         });
     },
     /**
@@ -1072,19 +1010,14 @@ export const spo = {
                 const operation = json[json.length - 1];
                 const isComplete = operation.IsComplete;
                 if (!isComplete) {
-                    await new Promise((resolve, reject) => {
-                        setTimeout(() => {
-                            spo.waitUntilFinished({
-                                operationId: JSON.stringify(operation._ObjectIdentity_),
-                                siteUrl: spoAdminUrl,
-                                resolve,
-                                reject,
-                                logger,
-                                currentContext: context,
-                                verbose: verbose,
-                                debug: verbose
-                            });
-                        }, operation.PollingInterval);
+                    await setTimeout(operation.PollingInterval);
+                    await spo.waitUntilFinished({
+                        operationId: JSON.stringify(operation._ObjectIdentity_),
+                        siteUrl: spoAdminUrl,
+                        logger,
+                        currentContext: context,
+                        verbose: verbose,
+                        debug: verbose
                     });
                 }
             }
@@ -1113,21 +1046,19 @@ export const spo = {
             },
             responseType: 'json'
         };
-        return request.get(requestOptions)
-            .then((res) => {
-            if (res.value.length === 0) {
-                return Promise.resolve();
-            }
-            return Promise.all(res.value.map(user => {
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
-                    headers: {
-                        'content-type': 'application/json;odata=verbose'
-                    }
-                };
-                return request.post(requestOptions);
-            }));
-        });
+        const res = await request.get(requestOptions);
+        if (res.value.length === 0) {
+            return;
+        }
+        await Promise.all(res.value.map(user => {
+            const requestOptions = {
+                url: `${spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
+                headers: {
+                    'content-type': 'application/json;odata=verbose'
+                }
+            };
+            return request.post(requestOptions);
+        }));
     },
     /**
      * Updates the site admin
@@ -1216,7 +1147,7 @@ export const spo = {
      */
     async applyRetentionLabelToListItems(webUrl, name, listAbsoluteUrl, itemIds, logger, verbose) {
         if (verbose && logger) {
-            logger.logToStderr(`Applying retention label '${name}' to item(s) in list '${listAbsoluteUrl}'...`);
+            await logger.logToStderr(`Applying retention label '${name}' to item(s) in list '${listAbsoluteUrl}'...`);
         }
         const requestOptions = {
             url: `${webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetComplianceTagOnBulkItems`,
@@ -1349,7 +1280,7 @@ export const spo = {
      */
     async removeRetentionLabelFromListItems(webUrl, listAbsoluteUrl, itemIds, logger, verbose) {
         if (verbose && logger) {
-            logger.logToStderr(`Removing retention label from item(s) in list '${listAbsoluteUrl}'...`);
+            await logger.logToStderr(`Removing retention label from item(s) in list '${listAbsoluteUrl}'...`);
         }
         const requestOptions = {
             url: `${webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetComplianceTagOnBulkItems`,
@@ -1376,7 +1307,7 @@ export const spo = {
      */
     async applyDefaultRetentionLabelToList(webUrl, name, listAbsoluteUrl, syncToItems, logger, verbose) {
         if (verbose && logger) {
-            logger.logToStderr(`Applying default retention label '${name}' to the list '${listAbsoluteUrl}'...`);
+            await logger.logToStderr(`Applying default retention label '${name}' to the list '${listAbsoluteUrl}'...`);
         }
         const requestOptions = {
             url: `${webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`,
@@ -1403,7 +1334,7 @@ export const spo = {
      */
     async removeDefaultRetentionLabelFromList(webUrl, listAbsoluteUrl, logger, verbose) {
         if (verbose && logger) {
-            logger.logToStderr(`Removing the default retention label from the list '${listAbsoluteUrl}'...`);
+            await logger.logToStderr(`Removing the default retention label from the list '${listAbsoluteUrl}'...`);
         }
         const requestOptions = {
             url: `${webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`,