@pnp/cli-microsoft365 6.9.0-beta.6a23aba → 6.9.0-beta.8393174

package/dist/m365/file/commands/file-add.js

@@ -58,25 +58,23 @@ class FileAddCommand extends GraphCommand_1.default {
      * @returns Absolute URL of the uploaded file
      */
     uploadFile(localFilePath, targetGraphFileUrl) {
-        const fileContents = fs.readFileSync(localFilePath);
-        const isEmptyFile = fileContents.length === 0;
-        const requestOptions = {
-            url: isEmptyFile ? `${targetGraphFileUrl}:/content` : `${targetGraphFileUrl}:/createUploadSession`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        if (isEmptyFile) {
-            return request_1.default
-                .put(requestOptions)
-                .then((res) => res.webUrl);
-        }
-        else {
-            return request_1.default
-                .post(requestOptions)
-                .then((res) => {
-                const requestOptions = {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fileContents = fs.readFileSync(localFilePath);
+            const isEmptyFile = fileContents.length === 0;
+            const requestOptions = {
+                url: isEmptyFile ? `${targetGraphFileUrl}:/content` : `${targetGraphFileUrl}:/createUploadSession`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            if (isEmptyFile) {
+                const res = yield request_1.default.put(requestOptions);
+                return res.webUrl;
+            }
+            else {
+                const res = yield request_1.default.post(requestOptions);
+                const requestOptionsPut = {
                     url: res.uploadUrl,
                     headers: {
                         'x-anonymous': true,
@@ -87,10 +85,10 @@ class FileAddCommand extends GraphCommand_1.default {
                     data: fileContents,
                     responseType: 'json'
                 };
-                return request_1.default.put(requestOptions);
-            })
-                .then((res) => res.webUrl);
-        }
+                const resPut = yield request_1.default.put(requestOptionsPut);
+                return resPut.webUrl;
+            }
+        });
     }
     /**
      * Gets Graph's drive item URL for the specified file. If the user specified
@@ -111,17 +109,16 @@ class FileAddCommand extends GraphCommand_1.default {
      * @returns Graph's drive item URL for the specified file
      */
     getGraphFileUrl(logger, fileWebUrl, siteUrl) {
-        if (this.debug) {
-            logger.logToStderr(`Resolving Graph drive item URL for ${fileWebUrl}`);
-        }
-        const _fileWebUrl = url.parse(fileWebUrl);
-        const _siteUrl = url.parse(siteUrl || fileWebUrl);
-        const isSiteUrl = typeof siteUrl !== 'undefined';
-        let siteId = '';
-        let driveRelativeFileUrl = '';
-        return this
-            .getGraphSiteInfoFromFullUrl(_siteUrl.host, _siteUrl.path, isSiteUrl)
-            .then(siteInfo => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.debug) {
+                logger.logToStderr(`Resolving Graph drive item URL for ${fileWebUrl}`);
+            }
+            const _fileWebUrl = url.parse(fileWebUrl);
+            const _siteUrl = url.parse(siteUrl || fileWebUrl);
+            const isSiteUrl = typeof siteUrl !== 'undefined';
+            let siteId = '';
+            let driveRelativeFileUrl = '';
+            const siteInfo = yield this.getGraphSiteInfoFromFullUrl(_siteUrl.host, _siteUrl.path, isSiteUrl);
             siteId = siteInfo.id;
             let siteRelativeFileUrl = _fileWebUrl.path.replace(siteInfo.serverRelativeUrl, '');
             // normalize site-relative URLs for root site collections and root sites
@@ -131,9 +128,7 @@ class FileAddCommand extends GraphCommand_1.default {
             const siteRelativeFileUrlChunks = siteRelativeFileUrl.split('/');
             driveRelativeFileUrl = `/${siteRelativeFileUrlChunks.slice(2).join('/')}`;
             // chunk 0 is empty because the URL starts with /
-            return this.getDriveId(logger, siteId, siteRelativeFileUrlChunks[1]);
-        })
-            .then(driveId => {
+            const driveId = yield this.getDriveId(logger, siteId, siteRelativeFileUrlChunks[1]);
             const graphUrl = `${this.resource}/v1.0/sites/${siteId}/drives/${driveId}/root:${driveRelativeFileUrl}`;
             if (this.debug) {
                 logger.logToStderr(`Resolved URL ${graphUrl}`);
@@ -150,10 +145,10 @@ class FileAddCommand extends GraphCommand_1.default {
      * @returns ID and server-relative URL of the site denoted by urlPath
      */
     getGraphSiteInfoFromFullUrl(hostName, urlPath, isSiteUrl) {
-        const siteId = '';
-        const urlChunks = urlPath.split('/');
-        return new Promise((resolve, reject) => {
-            this.getGraphSiteInfo(hostName, urlChunks, isSiteUrl ? urlChunks.length - 1 : 0, siteId, resolve, reject);
+        return __awaiter(this, void 0, void 0, function* () {
+            const siteId = '';
+            const urlChunks = urlPath.split('/');
+            return yield this.getGraphSiteInfo(hostName, urlChunks, isSiteUrl ? urlChunks.length - 1 : 0, siteId);
         });
     }
     /**
@@ -166,52 +161,52 @@ class FileAddCommand extends GraphCommand_1.default {
      * @param urlChunks Array of chunks from server-relative URL, eg. ['sites', 'site', 'subsite', 'docs', 'file1.aspx']
      * @param currentChunk Current chunk that's being tested, eg. sites
      * @param lastSiteId Last correctly resolved Graph site ID
-     * @param resolve Callback method to call when resolving site info succeeded
-     * @param reject Callback method to call when resolving site info failed
      * @returns Graph site ID and server-relative URL of the site specified through chunks
      */
-    getGraphSiteInfo(hostName, urlChunks, currentChunk, lastSiteId, resolve, reject) {
-        let currentPath = urlChunks.slice(0, currentChunk + 1).join('/');
-        if (currentPath.endsWith('/sites') ||
-            currentPath.endsWith('/teams') ||
-            currentPath.endsWith('/personal')) {
-            return this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, '', resolve, reject);
-        }
-        if (!currentPath.startsWith('/')) {
-            currentPath = '/' + currentPath;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${hostName}:${currentPath}?$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        const getResult = (id, serverRelativeUrl) => {
-            return {
-                id,
-                serverRelativeUrl
-            };
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (currentChunk === urlChunks.length - 1) {
-                resolve(getResult(res.id, currentPath));
+    getGraphSiteInfo(hostName, urlChunks, currentChunk, lastSiteId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let currentPath = urlChunks.slice(0, currentChunk + 1).join('/');
+            if (currentPath.endsWith('/sites') ||
+                currentPath.endsWith('/teams') ||
+                currentPath.endsWith('/personal')) {
+                return yield this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, '');
             }
-            else {
-                this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, res.id, resolve, reject);
+            if (!currentPath.startsWith('/')) {
+                currentPath = '/' + currentPath;
             }
-        }, err => {
-            if (lastSiteId) {
-                let serverRelativeUrl = `${urlChunks.slice(0, currentChunk).join('/')}`;
-                if (!serverRelativeUrl.startsWith('/')) {
-                    serverRelativeUrl = '/' + serverRelativeUrl;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${hostName}:${currentPath}?$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const getResult = (id, serverRelativeUrl) => {
+                return {
+                    id,
+                    serverRelativeUrl
+                };
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (currentChunk === urlChunks.length - 1) {
+                    return getResult(res.id, currentPath);
+                }
+                else {
+                    return yield this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, res.id);
                 }
-                resolve(getResult(lastSiteId, serverRelativeUrl));
             }
-            else {
-                reject(err);
+            catch (err) {
+                if (lastSiteId) {
+                    let serverRelativeUrl = `${urlChunks.slice(0, currentChunk).join('/')}`;
+                    if (!serverRelativeUrl.startsWith('/')) {
+                        serverRelativeUrl = '/' + serverRelativeUrl;
+                    }
+                    return getResult(lastSiteId, serverRelativeUrl);
+                }
+                else {
+                    throw err;
+                }
             }
         });
     }
@@ -222,24 +217,23 @@ class FileAddCommand extends GraphCommand_1.default {
      * @returns Graph drive ID of the specified document library
      */
     getDriveId(logger, graphSiteId, siteRelativeListUrl) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${graphSiteId}/drives?$select=webUrl,id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${graphSiteId}/drives?$select=webUrl,id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (this.debug) {
                 logger.logToStderr(`Searching for drive with a URL ending with /${siteRelativeListUrl}...`);
             }
             const drive = res.value.find(d => d.webUrl.endsWith(`/${siteRelativeListUrl}`));
             if (!drive) {
-                return Promise.reject('Drive not found');
+                throw 'Drive not found';
             }
-            return Promise.resolve(drive.id);
+            return drive.id;
         });
     }
 }

package/dist/m365/file/commands/file-list.js

@@ -95,19 +95,18 @@ class FileListCommand extends GraphCommand_1.default {
         });
     }
     getDocumentLibrary(siteId, folderUrl, folderUrlFromUser, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting document library...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((drives) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting document library...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const drives = yield request_1.default.get(requestOptions);
             const lowerCaseFolderUrl = folderUrl.href.toLowerCase();
             const drive = drives.value
                 .sort((a, b) => b.webUrl.localeCompare(a.webUrl))
@@ -119,29 +118,28 @@ class FileListCommand extends GraphCommand_1.default {
                         lowerCaseFolderUrl[driveUrl.length] === '/');
             });
             if (!drive) {
-                return Promise.reject(`Document library '${folderUrlFromUser}' not found`);
+                throw `Document library '${folderUrlFromUser}' not found`;
             }
             if (this.verbose) {
                 logger.logToStderr(`Document library: ${drive.webUrl}, ${drive.id}`);
             }
-            return Promise.resolve(drive);
+            return drive;
         });
     }
     getStartingFolderId(documentLibrary, folderUrl, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting starting folder id...`);
-        }
-        const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(documentLibrary.webUrl, 'i'), '');
-        const requestOptions = {
-            url: `${this.resource}/v1.0/drives/${documentLibrary.id}/root${documentLibraryRelativeFolderUrl.length > 0 ? `:${documentLibraryRelativeFolderUrl}` : ''}?$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((folder) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting starting folder id...`);
+            }
+            const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(documentLibrary.webUrl, 'i'), '');
+            const requestOptions = {
+                url: `${this.resource}/v1.0/drives/${documentLibrary.id}/root${documentLibraryRelativeFolderUrl.length > 0 ? `:${documentLibraryRelativeFolderUrl}` : ''}?$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const folder = yield request_1.default.get(requestOptions);
             if (this.verbose) {
                 logger.logToStderr(`Starting folder id: ${folder.id}`);
             }
@@ -149,37 +147,33 @@ class FileListCommand extends GraphCommand_1.default {
         });
     }
     loadFoldersToGetFilesFrom(folderId, driveId, recursive) {
-        if (!recursive) {
-            return Promise.resolve();
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/drives/${driveId}/items('${folderId}')/children?$filter=folder ne null&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((subfolders) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!recursive) {
+                return;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/drives/${driveId}/items('${folderId}')/children?$filter=folder ne null&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const subfolders = yield request_1.default.get(requestOptions);
             const subfolderIds = subfolders.value.map((subfolder) => subfolder.id);
             this.foldersToGetFilesFrom = this.foldersToGetFilesFrom.concat(subfolderIds);
-            return Promise
-                .all(subfolderIds.map((subfolderId) => this.loadFoldersToGetFilesFrom(subfolderId, driveId, recursive)))
-                .then(_ => Promise.resolve());
+            yield Promise.all(subfolderIds.map((subfolderId) => this.loadFoldersToGetFilesFrom(subfolderId, driveId, recursive)));
         });
     }
     loadFilesFromFolders(driveId, folderIds, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Loading files from folders...`);
-        }
-        let files = [];
-        return Promise
-            .all(folderIds.map((folderId) => 
-        // get items from folder. Because we can't filter out folders here
-        // we need to get all items from the folder and filter them out later
-        odata_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
-            .then(res => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Loading files from folders...`);
+            }
+            let files = [];
+            const res = yield Promise.all(folderIds.map((folderId) => 
+            // get items from folder. Because we can't filter out folders here
+            // we need to get all items from the folder and filter them out later
+            odata_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)));
             // flatten data from all promises
             files = files.concat(...res);
             // remove folders from the list of files

package/dist/m365/flow/commands/flow-list.js

@@ -31,7 +31,7 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     constructor() {
         super();
         _FlowListCommand_instances.add(this);
-        this.allowedSharingStatusses = ['all', 'personal', 'ownedByMe', 'sharedWithMe'];
+        this.allowedSharingStatuses = ['all', 'personal', 'ownedByMe', 'sharedWithMe'];
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initValidators).call(this);
@@ -88,7 +88,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
         option: '-e, --environmentName <environmentName>'
     }, {
         option: '--sharingStatus [sharingStatus]',
-        autocomplete: this.allowedSharingStatusses
+        autocomplete: this.allowedSharingStatuses
     }, {
         option: '--asAdmin'
     });
@@ -97,8 +97,8 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
         if (args.options.asAdmin && args.options.sharingStatus) {
             return `The options asAdmin and sharingStatus cannot be specified together.`;
         }
-        if (args.options.sharingStatus && !this.allowedSharingStatusses.some(status => status === args.options.sharingStatus)) {
-            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatusses.join(',')}`;
+        if (args.options.sharingStatus && !this.allowedSharingStatuses.some(status => status === args.options.sharingStatus)) {
+            return `${args.options.sharingStatus} is not a valid sharing status. Allowed values are: ${this.allowedSharingStatuses.join(',')}`;
         }
         return true;
     }));

package/dist/m365/flow/commands/flow-remove.js

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRemoveCommand_instances, _FlowRemoveCommand_initTelemetry, _FlowRemoveCommand_initOptions, _FlowRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
 const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
 const formatting_1 = require("../../../utils/formatting");
@@ -44,7 +43,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
             const removeFlow = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
                     url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
-                    resolveWithFullResponse: true,
+                    fullResponse: true,
                     headers: {
                         accept: 'application/json'
                     },
@@ -55,7 +54,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
                     // handle 204 and throw error message to cmd when invalid flow id is passed
                     // https://github.com/pnp/cli-microsoft365/issues/1063#issuecomment-537218957
                     if (rawRes.statusCode === 204) {
-                        logger.log(chalk.red(`Error: Resource '${args.options.name}' does not exist in environment '${args.options.environmentName}'`));
+                        throw `Error: Resource '${args.options.name}' does not exist in environment '${args.options.environmentName}'`;
                     }
                 }
                 catch (err) {

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -77,16 +77,17 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
         });
     }
     getTriggerName(environment, flow) {
-        const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(environment)}/flows/${formatting_1.formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => Promise.resolve(res.value[0].name));
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(environment)}/flows/${formatting_1.formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return res.value[0].name;
+        });
     }
 }
 _FlowRunResubmitCommand_instances = new WeakSet(), _FlowRunResubmitCommand_initTelemetry = function _FlowRunResubmitCommand_initTelemetry() {

package/dist/m365/onedrive/commands/onedrive-list.js

@@ -41,39 +41,28 @@ class OneDriveListCommand extends SpoCommand_1.default {
         });
     }
     getAllSites(spoAdminUrl, startIndex, formDigest, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
-                .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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">1</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">SPSPERS</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                    return;
-                }
-                else {
-                    const sites = json[json.length - 1];
-                    this.allSites.push(...sites._Child_Items_);
-                    if (sites.NextStartIndexFromSharePoint) {
-                        this
-                            .getAllSites(spoAdminUrl, sites.NextStartIndexFromSharePoint, formDigest, logger)
-                            .then(_ => resolve(), err => reject(err));
-                    }
-                    else {
-                        resolve();
-                    }
+        return __awaiter(this, void 0, void 0, function* () {
+            const formDigestInfo = yield spo_1.spo.ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug);
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigestInfo.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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">1</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">SPSPERS</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw (response.ErrorInfo.ErrorMessage);
+            }
+            else {
+                const sites = json[json.length - 1];
+                this.allSites.push(...sites._Child_Items_);
+                if (sites.NextStartIndexFromSharePoint) {
+                    yield this.getAllSites(spoAdminUrl, sites.NextStartIndexFromSharePoint, formDigest, logger);
                 }
-            }, err => reject(err));
+            }
         });
     }
 }

package/dist/m365/outlook/commands/message/message-list.js

@@ -53,16 +53,16 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
         });
     }
     getFolderId(args) {
-        if (!args.options.folderId && !args.options.folderName) {
-            return Promise.resolve('');
-        }
-        if (args.options.folderId) {
-            return Promise.resolve(args.options.folderId);
-        }
-        if (Outlook_1.Outlook.wellKnownFolderNames.indexOf(args.options.folderName) > -1) {
-            return Promise.resolve(args.options.folderName);
-        }
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.folderId && !args.options.folderName) {
+                return '';
+            }
+            if (args.options.folderId) {
+                return args.options.folderId;
+            }
+            if (Outlook_1.Outlook.wellKnownFolderNames.indexOf(args.options.folderName) > -1) {
+                return args.options.folderName;
+            }
             const requestOptions = {
                 url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.folderName)}'&$select=id`,
                 headers: {
@@ -70,19 +70,14 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((response) => {
-                if (response.value.length === 1) {
-                    return resolve(response.value[0].id);
-                }
-                if (response.value.length === 0) {
-                    return reject(`Folder with name '${args.options.folderName}' not found`);
-                }
-                if (response.value.length > 1) {
-                    return reject(`Multiple folders with name '${args.options.folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`);
-                }
-            }, err => reject(err));
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value.length === 0) {
+                throw `Folder with name '${args.options.folderName}' not found`;
+            }
+            if (response.value.length > 1) {
+                throw `Multiple folders with name '${args.options.folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`;
+            }
+            return response.value[0].id;
         });
     }
 }

package/dist/m365/outlook/commands/message/message-move.js

@@ -61,13 +61,13 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         });
     }
     getFolderId(folderId, folderName) {
-        if (folderId) {
-            return Promise.resolve(folderId);
-        }
-        if (Outlook_1.Outlook.wellKnownFolderNames.indexOf(folderName) > -1) {
-            return Promise.resolve(folderName);
-        }
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (folderId) {
+                return folderId;
+            }
+            if (Outlook_1.Outlook.wellKnownFolderNames.indexOf(folderName) > -1) {
+                return folderName;
+            }
             const requestOptions = {
                 url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(folderName)}'&$select=id`,
                 headers: {
@@ -75,19 +75,14 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((response) => {
-                if (response.value.length === 1) {
-                    return resolve(response.value[0].id);
-                }
-                if (response.value.length === 0) {
-                    return reject(`Folder with name '${folderName}' not found`);
-                }
-                if (response.value.length > 1) {
-                    return reject(`Multiple folders with name '${folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`);
-                }
-            }, err => reject(err));
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value.length === 0) {
+                throw `Folder with name '${folderName}' not found`;
+            }
+            if (response.value.length > 1) {
+                throw `Multiple folders with name '${folderName}' found. Please disambiguate:${os.EOL}${response.value.map(f => `- ${f.id}`).join(os.EOL)}`;
+            }
+            return response.value[0].id;
         });
     }
 }