@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.04832fc

package/dist/m365/aad/commands/sp/sp-add.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadSpAddCommand extends GraphCommand_1.default {
@@ -94,10 +94,10 @@ class AadSpAddCommand extends GraphCommand_1.default {
         if (optionsSpecified !== 1) {
             return 'Specify either appId, appName, or objectId';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid objectId GUID`;
         }
         return true;

package/dist/m365/aad/commands/sp/sp-get.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadSpGetCommand extends GraphCommand_1.default {
@@ -94,10 +94,10 @@ class AadSpGetCommand extends GraphCommand_1.default {
         if (optionsSpecified !== 1) {
             return 'Specify either appId, objectId or displayName';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid objectId GUID`;
         }
         return true;

package/dist/m365/aad/commands/user/user-get.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserGetCommand extends GraphCommand_1.default {
@@ -86,7 +86,7 @@ class AadUserGetCommand extends GraphCommand_1.default {
             return 'Use either id, userName or email, but not all';
         }
         if (args.options.id &&
-            !Utils_1.default.isValidGuid(args.options.id)) {
+            !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/user/user-hibp.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class AadUserHibpCommand extends AnonymousCommand_1.default {
@@ -57,7 +57,7 @@ class AadUserHibpCommand extends AnonymousCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidUserPrincipalName(args.options.userName)) {
+        if (!utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return 'Specify valid userName';
         }
         return true;

package/dist/m365/aad/commands/user/user-list.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadUserListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadUserListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.USER_LIST;
     }
@@ -25,10 +26,10 @@ class AadUserListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         const filter = this.getFilter(args.options);
         const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
         const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
-        this
-            .getAllItems(url, logger, true)
-            .then(() => {
-            logger.log(this.items);
+        utils_1.odata
+            .getAllItems(url, logger)
+            .then((users) => {
+            logger.log(users);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }

package/dist/m365/aad/commands/user/user-set.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserSetCommand extends GraphCommand_1.default {
@@ -80,7 +80,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
             return 'Specify either objectId or userPrincipalName but not both';
         }
         if (args.options.objectId &&
-            !Utils_1.default.isValidGuid(args.options.objectId)) {
+            !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands.js

@@ -24,6 +24,7 @@ exports.default = {
     O365GROUP_GET: `${prefix} o365group get`,
     O365GROUP_LIST: `${prefix} o365group list`,
     O365GROUP_CONVERSATION_LIST: `${prefix} o365group conversation list`,
+    O365GROUP_CONVERSATION_POST_LIST: `${prefix} o365group conversation post list`,
     O365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} o365group recyclebinitem clear`,
     O365GROUP_RECYCLEBINITEM_LIST: `${prefix} o365group recyclebinitem list`,
     O365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} o365group recyclebinitem restore`,

package/dist/m365/base/AppCommand.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const cli_1 = require("../../cli");
 const Command_1 = require("../../Command");
-const Utils_1 = require("../../Utils");
+const utils_1 = require("../../utils");
 class AppCommand extends Command_1.default {
     get resource() {
         return 'https://graph.microsoft.com';
@@ -66,7 +66,7 @@ class AppCommand extends Command_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         return true;

package/dist/m365/base/SpoCommand.js

@@ -11,8 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
-const config_1 = require("../../config");
-const request_1 = require("../../request");
 const csomDefs = require('../../../csom.json');
 class SpoCommand extends Command_1.default {
     /**
@@ -60,16 +58,6 @@ class SpoCommand extends Command_1.default {
     getExcludedOptionsWithUrls() {
         return undefined;
     }
-    getRequestDigest(siteUrl) {
-        const requestOptions = {
-            url: `${siteUrl}/_api/contextinfo`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
-    }
     processOptions(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const namesOfOptionsWithUrls = this.getNamesOfOptionsWithUrls();
@@ -91,234 +79,6 @@ class SpoCommand extends Command_1.default {
             }
         });
     }
-    static isValidSharePointUrl(url) {
-        if (!url) {
-            return false;
-        }
-        if (url.indexOf('https://') !== 0) {
-            return `${url} is not a valid SharePoint Online site URL`;
-        }
-        else {
-            return true;
-        }
-    }
-    ensureFormDigest(siteUrl, logger, context, debug) {
-        return new Promise((resolve, reject) => {
-            if (this.isValidFormDigest(context)) {
-                if (debug) {
-                    logger.logToStderr('Existing form digest still valid');
-                }
-                resolve(context);
-                return;
-            }
-            this
-                .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);
-            });
-        });
-    }
-    isValidFormDigest(contextInfo) {
-        if (!contextInfo) {
-            return false;
-        }
-        const now = new Date();
-        if (contextInfo.FormDigestValue && now < contextInfo.FormDigestExpiresAt) {
-            return true;
-        }
-        return false;
-    }
-    waitUntilFinished(operationId, siteUrl, resolve, reject, logger, currentContext, dots) {
-        this
-            .ensureFormDigest(siteUrl, logger, currentContext, this.debug)
-            .then((res) => {
-            currentContext = res;
-            if (this.debug) {
-                logger.logToStderr(`Checking if operation ${operationId} completed...`);
-            }
-            if (!this.debug && this.verbose) {
-                dots += '.';
-                process.stdout.write(`\r${dots}`);
-            }
-            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_1.default.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_1.default.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 (!this.debug && this.verbose) {
-                        process.stdout.write('\n');
-                    }
-                    resolve();
-                    return;
-                }
-                setTimeout(() => {
-                    this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), siteUrl, resolve, reject, logger, currentContext, dots);
-                }, operation.PollingInterval);
-            }
-        });
-    }
-    waitUntilCopyJobFinished(copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, dots) {
-        const requestUrl = `${siteUrl}/_api/site/GetCopyJobProgress`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: { "copyJobInfo": copyJobInfo },
-            responseType: 'json'
-        };
-        if (!this.debug && this.verbose) {
-            dots += '.';
-            process.stdout.write(`\r${dots}`);
-        }
-        request_1.default
-            .post(requestOptions)
-            .then((resp) => {
-            if (this.debug) {
-                logger.logToStderr('getCopyJobProgress response...');
-                logger.logToStderr(resp);
-            }
-            for (const item of resp.Logs) {
-                const log = JSON.parse(item);
-                // reject if progress error
-                if (log.Event === "JobError" || log.Event === "JobFatalError") {
-                    return reject(log.Message);
-                }
-            }
-            // two possible scenarios
-            // job done = success promise returned
-            // job in progress = recursive call using setTimeout returned
-            if (resp.JobState === 0) {
-                // job done
-                if (this.verbose) {
-                    process.stdout.write('\n');
-                }
-                resolve();
-            }
-            else {
-                setTimeout(() => {
-                    this.waitUntilCopyJobFinished(copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, dots);
-                }, pollingInterval);
-            }
-        });
-    }
-    getSpoUrl(logger, debug) {
-        if (Auth_1.default.service.spoUrl) {
-            if (debug) {
-                logger.logToStderr(`SPO URL previously retrieved ${Auth_1.default.service.spoUrl}. Returning...`);
-            }
-            return Promise.resolve(Auth_1.default.service.spoUrl);
-        }
-        return new Promise((resolve, reject) => {
-            if (debug) {
-                logger.logToStderr(`No SPO URL available. Retrieving from MS Graph...`);
-            }
-            const requestOptions = {
-                url: `https://graph.microsoft.com/v1.0/sites/root?$select=webUrl`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                Auth_1.default.service.spoUrl = res.webUrl;
-                return Auth_1.default.storeConnectionInfo();
-            })
-                .then(() => {
-                resolve(Auth_1.default.service.spoUrl);
-            }, (err) => {
-                if (Auth_1.default.service.spoUrl) {
-                    resolve(Auth_1.default.service.spoUrl);
-                }
-                else {
-                    reject(err);
-                }
-            });
-        });
-    }
-    getSpoAdminUrl(logger, debug) {
-        return new Promise((resolve, reject) => {
-            this
-                .getSpoUrl(logger, debug)
-                .then((spoUrl) => {
-                resolve(spoUrl.replace(/(https:\/\/)([^\.]+)(.*)/, '$1$2-admin$3'));
-            }, (error) => {
-                reject(error);
-            });
-        });
-    }
-    getTenantId(logger, debug) {
-        if (Auth_1.default.service.tenantId) {
-            if (debug) {
-                logger.logToStderr(`SPO Tenant ID previously retrieved ${Auth_1.default.service.tenantId}. Returning...`);
-            }
-            return Promise.resolve(Auth_1.default.service.tenantId);
-        }
-        return new Promise((resolve, reject) => {
-            if (debug) {
-                logger.logToStderr(`No SPO Tenant ID available. Retrieving...`);
-            }
-            let spoAdminUrl = '';
-            this
-                .getSpoAdminUrl(logger, debug)
-                .then((_spoAdminUrl) => {
-                spoAdminUrl = _spoAdminUrl;
-                return this.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_1.default.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_1.default.post(tenantInfoRequestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                Auth_1.default.service.tenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '&#xA;');
-                return Auth_1.default.storeConnectionInfo();
-            })
-                .then(() => {
-                resolve(Auth_1.default.service.tenantId);
-            }, (err) => {
-                if (Auth_1.default.service.tenantId) {
-                    resolve(Auth_1.default.service.tenantId);
-                }
-                else {
-                    reject(err);
-                }
-            });
-        });
-    }
     validateUnknownOptions(options, csomObject, csomPropertyType) {
         const unknownOptions = this.getUnknownOptions(options);
         const optionNames = Object.getOwnPropertyNames(unknownOptions);
@@ -337,26 +97,6 @@ class SpoCommand extends Command_1.default {
         }
         return true;
     }
-    /**
-     * Combines base and relative url considering any missing slashes
-     * @param baseUrl https://contoso.com
-     * @param relativeUrl sites/abc
-     */
-    urlCombine(baseUrl, relativeUrl) {
-        // remove last '/' of base if exists
-        if (baseUrl.lastIndexOf('/') === baseUrl.length - 1) {
-            baseUrl = baseUrl.substring(0, baseUrl.length - 1);
-        }
-        // remove '/' at 0
-        if (relativeUrl.charAt(0) === '/') {
-            relativeUrl = relativeUrl.substring(1, relativeUrl.length);
-        }
-        // remove last '/' of next if exists
-        if (relativeUrl.lastIndexOf('/') === relativeUrl.length - 1) {
-            relativeUrl = relativeUrl.substring(0, relativeUrl.length - 1);
-        }
-        return `${baseUrl}/${relativeUrl}`;
-    }
     action(logger, args, cb) {
         Auth_1.default
             .restoreAuth()

package/dist/m365/cli/commands/cli-doctor.js

@@ -4,7 +4,7 @@ const os = require("os");
 const Auth_1 = require("../../../Auth");
 const cli_1 = require("../../../cli");
 const Command_1 = require("../../../Command");
-const Utils_1 = require("../../../Utils");
+const utils_1 = require("../../../utils");
 const commands_1 = require("../commands");
 const packageJSON = require('../../../../package.json');
 class CliDoctorCommand extends Command_1.default {
@@ -31,7 +31,7 @@ class CliDoctorCommand extends Command_1.default {
             cliVersion: packageJSON.version,
             nodeVersion: process.version,
             cliAadAppId: Auth_1.default.service.appId,
-            cliAadAppTenant: Utils_1.default.isValidGuid(Auth_1.default.service.tenant) ? 'single' : Auth_1.default.service.tenant,
+            cliAadAppTenant: utils_1.validation.isValidGuid(Auth_1.default.service.tenant) ? 'single' : Auth_1.default.service.tenant,
             authMode: Auth_1.AuthType[Auth_1.default.service.authType],
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
             cliConfig: cli_1.Cli.getInstance().config.all,

package/dist/m365/commands/status.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
-const Utils_1 = require("../../Utils");
+const utils_1 = require("../../utils");
 const commands_1 = require("./commands");
 class StatusCommand extends Command_1.default {
     get name() {
@@ -15,14 +15,14 @@ class StatusCommand extends Command_1.default {
         if (Auth_1.default.service.connected) {
             if (this.debug) {
                 logger.logToStderr({
-                    connectedAs: Utils_1.default.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
                     authType: Auth_1.AuthType[Auth_1.default.service.authType],
                     accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
                 });
             }
             else {
                 logger.log({
-                    connectedAs: Utils_1.default.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
                 });
             }
         }

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

@@ -4,8 +4,8 @@ const fs = require("fs");
 const path = require("path");
 const url = require("url");
 const request_1 = require("../../../request");
+const utils_1 = require("../../../utils");
 const GraphCommand_1 = require("../../base/GraphCommand");
-const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class FileAddCommand extends GraphCommand_1.default {
     get name() {
@@ -229,12 +229,12 @@ class FileAddCommand extends GraphCommand_1.default {
             return `Specified source file ${args.options.sourceFile} doesn't exist`;
         }
         if (args.options.siteUrl) {
-            const isValidSiteUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+            const isValidSiteUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
             if (isValidSiteUrl !== true) {
                 return isValidSiteUrl;
             }
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.folderUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.folderUrl);
     }
 }
 module.exports = new FileAddCommand();

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
-const GraphItemsListCommand_1 = require("../../base/GraphItemsListCommand");
-const SpoCommand_1 = require("../../base/SpoCommand");
+const utils_1 = require("../../../utils");
+const GraphCommand_1 = require("../../base/GraphCommand");
 const commands_1 = require("../commands");
-class FileListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class FileListCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
         this.foldersToGetFilesFrom = [];
@@ -46,8 +46,8 @@ class FileListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             }
             return this.loadFilesFromFolders(driveId, this.foldersToGetFilesFrom, logger);
         })
-            .then(_ => {
-            logger.log(this.items);
+            .then(files => {
+            logger.log(files);
             cb();
         }, err => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
@@ -151,17 +151,19 @@ class FileListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         if (this.verbose) {
             logger.logToStderr(`Loading files from folders...`);
         }
-        this.items = [];
+        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
-        this.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`, logger, false)))
-            .then(_ => {
+        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`, logger)))
+            .then(res => {
+            // flatten data from all promises
+            files = files.concat(...res);
             // remove folders from the list of files
-            this.items = this.items.filter((item) => item.file);
-            this.items.forEach(file => { var _a, _b; return file.lastModifiedByUser = (_b = (_a = file.lastModifiedBy) === null || _a === void 0 ? void 0 : _a.user) === null || _b === void 0 ? void 0 : _b.displayName; });
-            return Promise.resolve();
+            files = files.filter((item) => item.file);
+            files.forEach(file => { var _a, _b; return file.lastModifiedByUser = (_b = (_a = file.lastModifiedBy) === null || _a === void 0 ? void 0 : _a.user) === null || _b === void 0 ? void 0 : _b.displayName; });
+            return files;
         });
     }
     options() {
@@ -174,7 +176,7 @@ class FileListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new FileListCommand();

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../request");
-const Utils_1 = require("../../../Utils");
+const utils_1 = require("../../../utils");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowExportCommand extends AzmgmtCommand_1.default {
@@ -164,7 +164,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
     }
     validate(args) {
         const lowerCaseFormat = args.options.format ? args.options.format.toLowerCase() : '';
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.format && (lowerCaseFormat !== 'json' && lowerCaseFormat !== 'zip')) {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const cli_1 = require("../../../cli");
 const request_1 = require("../../../request");
-const Utils_1 = require("../../../Utils");
+const utils_1 = require("../../../utils");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowRemoveCommand extends AzmgmtCommand_1.default {
@@ -84,7 +84,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.name)) {
+        if (!utils_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunCancelCommand extends AzmgmtCommand_1.default {
@@ -66,7 +66,7 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.flow)) {
+        if (!utils_1.validation.isValidGuid(args.options.flow)) {
             return `${args.options.flow} is not a valid GUID`;
         }
         return true;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
@@ -90,7 +90,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.flow)) {
+        if (!utils_1.validation.isValidGuid(args.options.flow)) {
             return `${args.options.flow} is not a valid GUID`;
         }
         return true;