@pnp/cli-microsoft365 6.7.0-beta.60f2469 → 6.7.0-beta.872b0f5

package/.devcontainer/Dockerfile

@@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y \
   vim \
   python3.8 \
   python3-pip \
-  && curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - \
+  && curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - \
   && apt-get install nodejs -y \
   && rm -rf /var/lib/apt/lists/*
 

package/README.md

@@ -184,7 +184,7 @@ m365 spo site get --url https://contoso.sharepoint.com --output text
 
 ## Build
 
-To build and run this CLI locally, you will need [`node`](https://nodejs.org) `>= 16.0.0` installed.
+To build and run this CLI locally, you will need [`node`](https://nodejs.org) `>= 18.0.0` installed.
 
 ```sh
 # Clone this repository

package/dist/Auth.js

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Auth = exports.CertificateType = exports.AuthType = exports.Service = void 0;
+exports.Auth = exports.CertificateType = exports.AuthType = exports.Service = exports.CloudType = void 0;
+const msal_common_1 = require("@azure/msal-common");
 const FileTokenStorage_1 = require("./auth/FileTokenStorage");
 const msalCachePlugin_1 = require("./auth/msalCachePlugin");
 const Cli_1 = require("./cli/Cli");
@@ -17,14 +18,24 @@ const Command_1 = require("./Command");
 const config_1 = require("./config");
 const request_1 = require("./request");
 const settingsNames_1 = require("./settingsNames");
+var CloudType;
+(function (CloudType) {
+    CloudType[CloudType["Public"] = 0] = "Public";
+    CloudType[CloudType["USGov"] = 1] = "USGov";
+    CloudType[CloudType["USGovHigh"] = 2] = "USGovHigh";
+    CloudType[CloudType["USGovDoD"] = 3] = "USGovDoD";
+    CloudType[CloudType["China"] = 4] = "China";
+})(CloudType = exports.CloudType || (exports.CloudType = {}));
 class Service {
     constructor() {
         this.connected = false;
         this.authType = AuthType.DeviceCode;
         this.certificateType = CertificateType.Unknown;
+        this.cloudType = CloudType.Public;
         this.accessTokens = {};
         this.appId = config_1.default.cliAadAppId;
         this.tenant = config_1.default.tenant;
+        this.cloudType = CloudType.Public;
     }
     logout() {
         this.connected = false;
@@ -62,11 +73,41 @@ class Auth {
         return this._service;
     }
     get defaultResource() {
-        return 'https://graph.microsoft.com';
+        return Auth.getEndpointForResource('https://graph.microsoft.com', this._service.cloudType);
     }
     constructor() {
         this._service = new Service();
     }
+    // we need to init cloud endpoints here, because we're using CloudType enum
+    // as indexers, which we can't do in the static initializer
+    // it also needs to be a separate method that we call here, because in tests
+    // we're mocking auth and calling its constructor
+    static initialize() {
+        this.cloudEndpoints[CloudType.USGov] = {
+            'https://graph.microsoft.com': 'https://graph.microsoft.com',
+            'https://graph.windows.net': 'https://graph.windows.net',
+            'https://management.azure.com/': 'https://management.usgovcloudapi.net/',
+            'https://login.microsoftonline.com': 'https://login.microsoftonline.com'
+        };
+        this.cloudEndpoints[CloudType.USGovHigh] = {
+            'https://graph.microsoft.com': 'https://graph.microsoft.us',
+            'https://graph.windows.net': 'https://graph.windows.net',
+            'https://management.azure.com/': 'https://management.usgovcloudapi.net/',
+            'https://login.microsoftonline.com': 'https://login.microsoftonline.us'
+        };
+        this.cloudEndpoints[CloudType.USGovDoD] = {
+            'https://graph.microsoft.com': 'https://dod-graph.microsoft.us',
+            'https://graph.windows.net': 'https://graph.windows.net',
+            'https://management.azure.com/': 'https://management.usgovcloudapi.net/',
+            'https://login.microsoftonline.com': 'https://login.microsoftonline.us'
+        };
+        this.cloudEndpoints[CloudType.China] = {
+            'https://graph.microsoft.com': 'https://microsoftgraph.chinacloudapi.cn',
+            'https://graph.windows.net': 'https://graph.chinacloudapi.cn',
+            'https://management.azure.com/': 'https://management.chinacloudapi.cn',
+            'https://login.microsoftonline.com': 'https://login.chinacloudapi.cn'
+        };
+    }
     restoreAuth() {
         return __awaiter(this, void 0, void 0, function* () {
             // check if auth has been restored previously
@@ -196,9 +237,27 @@ class Auth {
             thumbprint: certificateThumbprint,
             privateKey: certificatePrivateKey
         };
+        let azureCloudInstance = 0;
+        switch (this.service.cloudType) {
+            case CloudType.Public:
+                azureCloudInstance = msal_common_1.AzureCloudInstance.AzurePublic;
+                break;
+            case CloudType.China:
+                azureCloudInstance = msal_common_1.AzureCloudInstance.AzureChina;
+                break;
+            case CloudType.USGov:
+            case CloudType.USGovHigh:
+            case CloudType.USGovDoD:
+                azureCloudInstance = msal_common_1.AzureCloudInstance.AzureUsGovernment;
+                break;
+        }
         const config = {
             clientId: this.service.appId,
-            authority: `https://login.microsoftonline.com/${this.service.tenant}`
+            authority: `${Auth.getEndpointForResource('https://login.microsoftonline.com', this.service.cloudType)}/${this.service.tenant}`,
+            azureCloudOptions: {
+                azureCloudInstance,
+                tenant: this.service.tenant
+            }
         };
         const authConfig = cert
             ? Object.assign(Object.assign({}, config), { clientCertificate: cert }) : Object.assign(Object.assign({}, config), { clientSecret });
@@ -534,7 +593,8 @@ class Auth {
         if (pos > -1) {
             resource = resource.substr(0, pos);
         }
-        if (resource === 'https://api.bap.microsoft.com' || resource === 'https://api.powerapps.com') {
+        if (resource === 'https://api.bap.microsoft.com' ||
+            resource === 'https://api.powerapps.com') {
             resource = 'https://service.powerapps.com/';
         }
         if (resource === 'https://api.powerbi.com') {
@@ -571,7 +631,18 @@ class Auth {
     getMsalCacheStorage() {
         return new FileTokenStorage_1.FileTokenStorage(FileTokenStorage_1.FileTokenStorage.msalCacheFilePath());
     }
+    static getEndpointForResource(resource, cloudType) {
+        if (Auth.cloudEndpoints[cloudType] &&
+            Auth.cloudEndpoints[cloudType][resource]) {
+            return Auth.cloudEndpoints[cloudType][resource];
+        }
+        else {
+            return resource;
+        }
+    }
 }
 exports.Auth = Auth;
+Auth.cloudEndpoints = [];
+Auth.initialize();
 exports.default = new Auth();
 //# sourceMappingURL=Auth.js.map

package/dist/AuthServer.js

@@ -4,6 +4,7 @@ exports.AuthServer = void 0;
 const http = require("http");
 const open = require("open");
 const url = require("url");
+const Auth_1 = require("./Auth");
 class AuthServer {
     constructor() {
         this.open = open;
@@ -23,7 +24,7 @@ class AuthServer {
             const requestState = Math.random().toString(16).substr(2, 20);
             const address = this.httpServer.address();
             this.generatedServerUrl = `http://localhost:${address.port}`;
-            const url = `https://login.microsoftonline.com/${this.service.tenant}/oauth2/authorize?response_type=code&client_id=${this.service.appId}&redirect_uri=${this.generatedServerUrl}&state=${requestState}&resource=${this.resource}&prompt=select_account`;
+            const url = `${Auth_1.Auth.getEndpointForResource('https://login.microsoftonline.com', this.service.cloudType)}/${this.service.tenant}/oauth2/authorize?response_type=code&client_id=${this.service.appId}&redirect_uri=${this.generatedServerUrl}&state=${requestState}&resource=${this.resource}&prompt=select_account`;
             if (this.debug) {
                 this.logger.logToStderr('Redirect URL:');
                 this.logger.logToStderr(url);

package/dist/Command.js

@@ -127,21 +127,70 @@ class Command {
             if (!optionsSets || optionsSets.length === 0) {
                 return true;
             }
+            let inquirer;
+            const shouldPrompt = Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
             const argsOptions = Object.keys(args.options);
-            for (const optionSet of optionsSets) {
-                if (optionSet.runsWhen === undefined || optionSet.runsWhen(args)) {
-                    const commonOptions = argsOptions.filter(opt => optionSet.options.includes(opt));
-                    if (commonOptions.length === 0) {
-                        return `Specify one of the following options: ${optionSet.options.map(opt => opt).join(', ')}.`;
+            for (const optionSet of optionsSets.sort(opt => opt.runsWhen ? 0 : 1)) {
+                if (optionSet.runsWhen && !optionSet.runsWhen(args)) {
+                    continue;
+                }
+                const commonOptions = argsOptions.filter(opt => optionSet.options.includes(opt));
+                if (commonOptions.length === 0) {
+                    if (!shouldPrompt) {
+                        return `Specify one of the following options: ${optionSet.options.join(', ')}.`;
                     }
-                    if (commonOptions.length > 1) {
-                        return `Specify one of the following options: ${optionSet.options.map(opt => opt).join(', ')}, but not multiple.`;
+                    yield this.promptForOptionSetNameAndValue(args, optionSet, inquirer);
+                }
+                if (commonOptions.length > 1) {
+                    if (!shouldPrompt) {
+                        return `Specify one of the following options: ${optionSet.options.join(', ')}, but not multiple.`;
                     }
+                    yield this.promptForSpecificOption(args, commonOptions, inquirer);
                 }
             }
             return true;
         });
     }
+    promptForOptionSetNameAndValue(args, optionSet, inquirer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!inquirer) {
+                inquirer = require('inquirer');
+            }
+            Cli_1.Cli.log(`Please specify one of the following options:`);
+            const resultOptionName = yield inquirer
+                .prompt({
+                type: 'list',
+                name: 'missingRequiredOptionName',
+                message: `Option to use:`,
+                choices: optionSet.options
+            });
+            const missingRequiredOptionName = resultOptionName.missingRequiredOptionName;
+            const resultOptionValue = yield inquirer
+                .prompt({
+                name: 'missingRequiredOptionValue',
+                message: `Value for '${missingRequiredOptionName}':`
+            });
+            args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
+            Cli_1.Cli.log();
+        });
+    }
+    promptForSpecificOption(args, commonOptions, inquirer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!inquirer) {
+                inquirer = require('inquirer');
+            }
+            Cli_1.Cli.log(`Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
+            const requiredOptionNameResult = yield inquirer
+                .prompt({
+                type: 'list',
+                name: 'missingRequiredOptionName',
+                message: `Option to use:`,
+                choices: commonOptions
+            });
+            commonOptions.filter(y => y !== requiredOptionNameResult.missingRequiredOptionName).map(optionName => args.options[optionName] = undefined);
+            Cli_1.Cli.log();
+        });
+    }
     validateOutput(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.output &&

package/dist/m365/base/AzmgmtCommand.js

@@ -1,10 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
 class AzmgmtCommand extends Command_1.default {
     get resource() {
         return 'https://management.azure.com/';
     }
+    initAction(args, logger) {
+        super.initAction(args, logger);
+        if (!Auth_1.default.service.connected) {
+            // we fail no login in the base command command class
+            return;
+        }
+        if (Auth_1.default.service.cloudType !== Auth_1.CloudType.Public) {
+            throw new Command_1.CommandError(`Power Automate commands only support the public cloud at the moment. We'll add support for other clouds in the future. Sorry for the inconvenience.`);
+        }
+    }
 }
 exports.default = AzmgmtCommand;
 //# sourceMappingURL=AzmgmtCommand.js.map

package/dist/m365/base/PowerAppsCommand.js

@@ -1,10 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
 class PowerAppsCommand extends Command_1.default {
     get resource() {
         return 'https://api.powerapps.com';
     }
+    initAction(args, logger) {
+        super.initAction(args, logger);
+        if (!Auth_1.default.service.connected) {
+            // we fail no login in the base command command class
+            return;
+        }
+        if (Auth_1.default.service.cloudType !== Auth_1.CloudType.Public) {
+            throw new Command_1.CommandError(`Power Apps commands only support the public cloud at the moment. We'll add support for other clouds in the future. Sorry for the inconvenience.`);
+        }
+    }
 }
 exports.default = PowerAppsCommand;
 //# sourceMappingURL=PowerAppsCommand.js.map

package/dist/m365/base/PowerPlatformCommand.js

@@ -1,10 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
 class PowerPlatformCommand extends Command_1.default {
     get resource() {
         return 'https://api.bap.microsoft.com';
     }
+    initAction(args, logger) {
+        super.initAction(args, logger);
+        if (!Auth_1.default.service.connected) {
+            // we fail no login in the base command command class
+            return;
+        }
+        if (Auth_1.default.service.cloudType !== Auth_1.CloudType.Public) {
+            throw new Command_1.CommandError(`Power Platform commands only support the public cloud at the moment. We'll add support for other clouds in the future. Sorry for the inconvenience.`);
+        }
+    }
 }
 exports.default = PowerPlatformCommand;
 //# sourceMappingURL=PowerPlatformCommand.js.map

package/dist/m365/commands/login.js

@@ -19,6 +19,7 @@ const fs = require("fs");
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
 const config_1 = require("../../config");
+const misc_1 = require("../../utils/misc");
 const commands_1 = require("./commands");
 class LoginCommand extends Command_1.default {
     get name() {
@@ -71,6 +72,12 @@ class LoginCommand extends Command_1.default {
                         Auth_1.default.service.secret = args.options.secret;
                         break;
                 }
+                if (args.options.cloud) {
+                    Auth_1.default.service.cloudType = Auth_1.CloudType[args.options.cloud];
+                }
+                else {
+                    Auth_1.default.service.cloudType = Auth_1.CloudType.Public;
+                }
                 try {
                     yield Auth_1.default.ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug);
                     Auth_1.default.service.connected = true;
@@ -113,8 +120,10 @@ class LoginCommand extends Command_1.default {
 }
 _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
     this.telemetry.push((args) => {
+        var _a;
         Object.assign(this.telemetryProperties, {
-            authType: args.options.authType || 'deviceCode'
+            authType: args.options.authType || 'deviceCode',
+            cloud: (_a = args.options.cloud) !== null && _a !== void 0 ? _a : Auth_1.CloudType.Public
         });
     });
 }, _LoginCommand_initOptions = function _LoginCommand_initOptions() {
@@ -137,6 +146,9 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
         option: '--tenant [tenant]'
     }, {
         option: '--secret [secret]'
+    }, {
+        option: '--cloud [cloud]',
+        autocomplete: misc_1.misc.getEnums(Auth_1.CloudType)
     });
 }, _LoginCommand_initValidators = function _LoginCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -170,6 +182,10 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
                 return 'Required option secret missing';
             }
         }
+        if (args.options.cloud &&
+            typeof Auth_1.CloudType[args.options.cloud] === 'undefined') {
+            return `${args.options.cloud} is not a valid value for cloud. Valid options are ${misc_1.misc.getEnums(Auth_1.CloudType).join(', ')}`;
+        }
         return true;
     }));
 };

package/dist/m365/commands/status.js

@@ -39,7 +39,8 @@ class StatusCommand extends Command_1.default {
                         authType: Auth_1.AuthType[Auth_1.default.service.authType],
                         appId: Auth_1.default.service.appId,
                         appTenant: Auth_1.default.service.tenant,
-                        accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
+                        accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2),
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
                     });
                 }
                 else {
@@ -47,7 +48,8 @@ class StatusCommand extends Command_1.default {
                         connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
                         authType: Auth_1.AuthType[Auth_1.default.service.authType],
                         appId: Auth_1.default.service.appId,
-                        appTenant: Auth_1.default.service.tenant
+                        appTenant: Auth_1.default.service.tenant,
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
                     });
                 }
             }

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

@@ -13,10 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions;
+var _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions, _FlowRunGetCommand_initValidators, _FlowRunGetCommand_initTelemetry;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunGetCommand extends AzmgmtCommand_1.default {
@@ -32,7 +33,9 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
     constructor() {
         super();
         _FlowRunGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowRunGetCommand_instances, "m", _FlowRunGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _FlowRunGetCommand_instances, "m", _FlowRunGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowRunGetCommand_instances, "m", _FlowRunGetCommand_initValidators).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -52,6 +55,18 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
                 res.endTime = res.properties.endTime || '';
                 res.status = res.properties.status;
                 res.triggerName = res.properties.trigger.name;
+                if (args.options.includeTriggerInformation && res.properties.trigger.outputsLink) {
+                    const triggerInformationOptions = {
+                        url: res.properties.trigger.outputsLink.uri,
+                        headers: {
+                            accept: 'application/json',
+                            'x-anonymous': true
+                        },
+                        responseType: 'json'
+                    };
+                    const triggerInformationResponse = yield request_1.default.get(triggerInformationOptions);
+                    res.triggerInformation = triggerInformationResponse.body;
+                }
                 logger.log(res);
             }
             catch (err) {
@@ -67,6 +82,21 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
         option: '-f, --flowName <flowName>'
     }, {
         option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--includeTriggerInformation'
+    });
+}, _FlowRunGetCommand_initValidators = function _FlowRunGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _FlowRunGetCommand_initTelemetry = function _FlowRunGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            includeTriggerInformation: !!args.options.includeTriggerInformation
+        });
     });
 };
 module.exports = new FlowRunGetCommand();

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

@@ -35,55 +35,123 @@ class SpoFileListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initValidators).call(this);
     }
     commandAction(logger, args) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving all files in folder ${args.options.folder} at site ${args.options.webUrl}...`);
             }
             try {
-                const files = yield this.getFiles(args.options.folder, args);
-                logger.log(files.value);
+                const allFiles = [];
+                const allFolders = args.options.recursive
+                    ? [...yield this.getFolders(args.options.folder, args, logger), args.options.folder]
+                    : [args.options.folder];
+                for (const folder of allFolders) {
+                    const files = yield this.getFiles(folder, args, logger);
+                    files.forEach((file) => allFiles.push(file));
+                }
+                // Clean ListItemAllFields.ID property from the output if included
+                // Reason: It causes a casing conflict with 'Id' when parsing JSON in PowerShell
+                if (((_b = (_a = allFiles[0]) === null || _a === void 0 ? void 0 : _a.ListItemAllFields) === null || _b === void 0 ? void 0 : _b.ID) !== undefined) {
+                    allFiles.filter(file => { var _a; return ((_a = file.ListItemAllFields) === null || _a === void 0 ? void 0 : _a.ID) !== undefined; }).forEach(file => delete file.ListItemAllFields['ID']);
+                }
+                logger.log(allFiles);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    // Gets files from a folder recursively.
-    getFiles(folderUrl, args, files = { value: [] }) {
-        // If --recursive option is specified, retrieve both Files and Folder details, otherwise only Files.
-        const expandParameters = args.options.recursive ? 'Files,Folders' : 'Files';
-        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
-        if (args.options.output !== 'json') {
-            requestUrl += '&$select=Files/UniqueId,Files/Name,Files/ServerRelativeUrl';
-        }
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((filesAndFoldersResult) => {
-            filesAndFoldersResult.Files.forEach((file) => files.value.push(file));
-            // If the request is --recursive, call this method for other folders.
-            if (args.options.recursive &&
-                filesAndFoldersResult.Folders !== undefined &&
-                filesAndFoldersResult.Folders.length !== 0) {
-                return Promise.all(filesAndFoldersResult.Folders.map((folder) => this.getFiles(folder.ServerRelativeUrl, args, files)));
+    getFiles(folderUrl, args, logger, skip = 0) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                const page = Math.ceil(skip / SpoFileListCommand.pageSize) + 1;
+                logger.logToStderr(`Retrieving files in folder ${folderUrl}${page > 1 ? ', page ' + page : ''}...`);
+            }
+            const allFiles = [];
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderUrl)}')/Files`;
+            const fieldsProperties = this.formatSelectProperties(args.options.fields, args.options.output);
+            const queryParams = [`$skip=${skip}`, `$top=${SpoFileListCommand.pageSize}`];
+            if (fieldsProperties.expandProperties.length > 0) {
+                queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
+            }
+            if (fieldsProperties.selectProperties.length > 0) {
+                queryParams.push(`$select=${fieldsProperties.selectProperties.join(',')}`);
             }
-            else {
-                return;
+            if (args.options.filter) {
+                queryParams.push(`$filter=${args.options.filter}`);
             }
-        }).then(() => files);
+            const requestOptions = {
+                url: `${requestUrl}?${queryParams.join('&')}`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            response.value.forEach(file => allFiles.push(file));
+            if (response.value.length === SpoFileListCommand.pageSize) {
+                const files = yield this.getFiles(folderUrl, args, logger, skip + SpoFileListCommand.pageSize);
+                files.forEach(file => allFiles.push(file));
+            }
+            return allFiles;
+        });
+    }
+    getFolders(folderUrl, args, logger, skip = 0) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                const page = Math.ceil(skip / SpoFileListCommand.pageSize) + 1;
+                logger.logToStderr(`Retrieving sub folders in folder ${folderUrl}${page > 1 ? ', page ' + page : ''}...`);
+            }
+            const allFolders = [];
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderUrl)}')/Folders?$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            for (const folder of response.value) {
+                allFolders.push(folder.ServerRelativeUrl);
+                const subfolders = yield this.getFolders(folder.ServerRelativeUrl, args, logger);
+                subfolders.forEach(folder => allFolders.push(folder));
+            }
+            if (response.value.length === SpoFileListCommand.pageSize) {
+                const folders = yield this.getFolders(folderUrl, args, logger, skip + SpoFileListCommand.pageSize);
+                folders.forEach(folder => allFolders.push(folder));
+            }
+            return allFolders;
+        });
+    }
+    formatSelectProperties(fields, output) {
+        let selectProperties = [];
+        const expandProperties = [];
+        if (output === 'text' && !fields) {
+            selectProperties = ['UniqueId', 'Name', 'ServerRelativeUrl'];
+        }
+        if (fields) {
+            fields.split(',').forEach((field) => {
+                const subparts = field.trim().split('/');
+                if (subparts.length > 1) {
+                    expandProperties.push(subparts[0]);
+                }
+                selectProperties.push(field.trim());
+            });
+        }
+        return {
+            selectProperties: [...new Set(selectProperties)],
+            expandProperties: [...new Set(expandProperties)]
+        };
     }
 }
 _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry = function _SpoFileListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recursive: args.options.recursive
+            recursive: args.options.recursive,
+            fields: typeof args.options.fields !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
         });
     });
 }, _SpoFileListCommand_initOptions = function _SpoFileListCommand_initOptions() {
@@ -91,11 +159,16 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-f, --folder <folder>'
+    }, {
+        option: '--fields [fields]'
+    }, {
+        option: '--filter [filter]'
     }, {
         option: '-r, --recursive'
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
+SpoFileListCommand.pageSize = 5000;
 module.exports = new SpoFileListCommand();
 //# sourceMappingURL=file-list.js.map