@pnp/cli-microsoft365 6.9.0-beta.d8f8efb → 6.9.0-beta.ef7c408

package/.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:7.1.0-ubuntu-focal
+FROM mcr.microsoft.com/powershell:alpine-3.17
 
 LABEL name="CLI for Microsoft 365 Development" \
   description="Development container for contributing to CLI for Microsoft 365" \
@@ -17,22 +17,15 @@ LABEL name="CLI for Microsoft 365 Development" \
 ENV NPM_CONFIG_PREFIX=/home/cli-microsoft365-dev/.npm-global \
   PATH=$PATH:/home/cli-microsoft365-dev/.npm-global/bin
 
-RUN apt-get update && apt-get install -y \
+RUN apk add --no-cache \
   git \
   curl \
   sudo \
+  shadow \
   zsh \
   jq \
-  vim \
-  python3.8 \
-  python3-pip \
-  && curl -sL https://deb.nodesource.com/setup_18.x | sudo -E bash - \
-  && apt-get install nodejs -y \
-  && rm -rf /var/lib/apt/lists/*
-
-COPY ../docs/pip_requirements.txt .
-
-RUN pip install -r pip_requirements.txt
+  nodejs \
+  npm
 
 RUN useradd \
   --user-group \
@@ -45,15 +38,15 @@ USER cli-microsoft365-dev
 
 WORKDIR /home/cli-microsoft365
 
-RUN zsh -c "$(curl https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" --unattended \
- && git clone https://github.com/denysdovhan/spaceship-prompt.git "$HOME/.oh-my-zsh/custom/themes/spaceship-prompt" --depth=1 \
- && ln -s "$HOME/.oh-my-zsh/custom/themes/spaceship-prompt/spaceship.zsh-theme" "$HOME/.oh-my-zsh/custom/themes/spaceship.zsh-theme" \
- && cp "$HOME/.oh-my-zsh/templates/zshrc.zsh-template" $HOME/.zshrc \
- && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting \
- && git clone https://github.com/zsh-users/zsh-autosuggestions $HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions \
+RUN git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh \
+ && cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc \
+ && git clone https://github.com/denysdovhan/spaceship-prompt.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship-prompt --depth=1 \
+ && ln -s ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship-prompt/spaceship.zsh-theme ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/spaceship.zsh-theme \
  && sed -i "11s/ZSH_THEME=\"robbyrussell\"/ZSH_THEME=\"spaceship\"/" ~/.zshrc \
- && sed -i "27s/# DISABLE_AUTO_UPDATE=\"true\"/DISABLE_AUTO_UPDATE=\"true\"/" ~/.zshrc \
+ && git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting \
+ && git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions \
  && sed -i "73s/plugins=(git)/plugins=(git zsh-autosuggestions zsh-syntax-highlighting)/" ~/.zshrc \
+ && sed -i "27s/# DISABLE_AUTO_UPDATE=\"true\"/DISABLE_AUTO_UPDATE=\"true\"/" ~/.zshrc \
  && sed -i "50s/# COMPLETION_WAITING_DOTS/COMPLETION_WAITING_DOTS/" ~/.zshrc
 
 CMD [ "/bin/zsh", "-l" ]

package/.devcontainer/devcontainer.json

@@ -2,22 +2,29 @@
   "name": "CLI for Microsoft 365",
   "dockerFile": "Dockerfile",
   "context": "..",
-  "settings": {
-    "terminal.integrated.profiles.linux": {
-      "zsh": {
-        "path": "/bin/zsh",
-        "args": [
-          "-l"
-        ]
-      }
-    },
-    "terminal.integrated.defaultProfile.linux": "zsh"
+  "postCreateCommand": {
+    "cli": "npm i && npm run clean && npm run build && npm link",
+    "docs": "cd docs && npm i"
   },
-  "postCreateCommand": "npm i && npm run clean && npm run build && npm link",
-  "extensions": [
-    "dbaeumer.vscode-eslint",
-    "hbenl.vscode-test-explorer",
-    "hbenl.vscode-mocha-test-adapter",
-    "eamodio.gitlens"
-  ]
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "dbaeumer.vscode-eslint",
+        "hbenl.vscode-test-explorer",
+        "hbenl.vscode-mocha-test-adapter",
+        "eamodio.gitlens"
+      ],
+      "settings": {
+        "terminal.integrated.profiles.linux": {
+          "zsh": {
+            "path": "/bin/zsh",
+            "args": [
+              "-l"
+            ]
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "zsh"
+      }
+    }
+  }
 }

package/Dockerfile

@@ -43,10 +43,12 @@ RUN bash -c 'echo "export PATH=$PATH:/home/cli-microsoft365/.npm-global/bin:/hom
   && bash -c 'echo "export CLIMICROSOFT365_ENV=\"docker\"" >> ~/.bash_profile' \
   && bash -c 'npm i -g @pnp/cli-microsoft365@${CLI_VERSION} --production --quiet --no-progress' \ 
   && bash -c 'echo "source /etc/profile.d/bash_completion.sh" >> ~/.bash_profile' \
+  && bash -c 'echo "alias \"m365?\"=\"m365_chili\"" >> ~/.bash_profile' \
   && bash -c 'echo ". .bashrc" >> ~/.bash_profile' \
   && bash -c 'npm cache clean --force' \
   && bash -c 'm365 cli completion sh setup' \
-  && pwsh -c 'm365 cli completion pwsh setup --profile $profile'
+  && pwsh -c 'm365 cli completion pwsh setup --profile $profile' \
+  && pwsh -c 'Add-Content -Path $PROFILE -Value "`r`Set-Alias -Name m365? -Value m365_chili"'
 
 RUN pip install setuptools==58
 RUN pip install jmespath-terminal

package/dist/Auth.js

@@ -18,6 +18,7 @@ const Command_1 = require("./Command");
 const config_1 = require("./config");
 const request_1 = require("./request");
 const settingsNames_1 = require("./settingsNames");
+const browserUtil_1 = require("./utils/browserUtil");
 var CloudType;
 (function (CloudType) {
     CloudType[CloudType["Public"] = 0] = "Public";
@@ -361,14 +362,7 @@ class Auth {
         }
         logger.log(response.message);
         if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
-            // _open is never set before hitting this line, but this check
-            // is implemented so that we can support lazy loading
-            // but also stub it for testing
-            /* c8 ignore next 3 */
-            if (!this._open) {
-                this._open = require('open');
-            }
-            this._open(response.verificationUri);
+            browserUtil_1.browserUtil.open(response.verificationUri);
         }
         if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.copyDeviceCodeToClipboard, false)) {
             // _clipboardy is never set before hitting this line, but this check

package/dist/AuthServer.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthServer = void 0;
 const http = require("http");
-const open = require("open");
 const url = require("url");
 const Auth_1 = require("./Auth");
+const browserUtil_1 = require("./utils/browserUtil");
 class AuthServer {
     constructor() {
-        this.open = open;
         this.debug = false;
         this.resource = "";
         this.generatedServerUrl = "";
@@ -85,8 +84,7 @@ class AuthServer {
         return this.httpServer;
     }
     openUrl(url) {
-        this
-            .open(url)
+        browserUtil_1.browserUtil.open(url)
             .then(_ => {
             this.logger.logToStderr("To sign in, use the web browser that just has been opened. Please sign-in there.");
         })

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-restore.js

@@ -58,35 +58,34 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
         });
     }
     getGroupId(options) {
-        const { id, displayName, mailNickname } = options;
-        if (id) {
-            return Promise.resolve(id);
-        }
-        let filterValue = '';
-        if (displayName) {
-            filterValue = `displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`;
-        }
-        if (mailNickname) {
-            filterValue = `mailNickname eq '${formatting_1.formatting.encodeQueryParameter(mailNickname)}'`;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, displayName, mailNickname } = options;
+            if (id) {
+                return id;
+            }
+            let filterValue = '';
+            if (displayName) {
+                filterValue = `displayName eq '${formatting_1.formatting.encodeQueryParameter(displayName)}'`;
+            }
+            if (mailNickname) {
+                filterValue = `mailNickname eq '${formatting_1.formatting.encodeQueryParameter(mailNickname)}'`;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             const groups = response.value;
             if (groups.length === 0) {
-                return Promise.reject(`The specified group '${displayName || mailNickname}' does not exist.`);
+                throw `The specified group '${displayName || mailNickname}' does not exist.`;
             }
             if (groups.length > 1) {
-                return Promise.reject(`Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`);
+                throw `Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`;
             }
-            return Promise.resolve(groups[0].id);
+            return groups[0].id;
         });
     }
 }

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

@@ -21,6 +21,7 @@ const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const promises_1 = require("timers/promises");
 class AadO365GroupSetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_SET;
@@ -31,6 +32,7 @@ class AadO365GroupSetCommand extends GraphCommand_1.default {
     constructor() {
         super();
         _AadO365GroupSetCommand_instances.add(this);
+        this.pollingInterval = 500;
         __classPrivateFieldGet(this, _AadO365GroupSetCommand_instances, "m", _AadO365GroupSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupSetCommand_instances, "m", _AadO365GroupSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupSetCommand_instances, "m", _AadO365GroupSetCommand_initTypes).call(this);
@@ -75,9 +77,7 @@ class AadO365GroupSetCommand extends GraphCommand_1.default {
                         },
                         data: fs.readFileSync(fullPath)
                     };
-                    yield new Promise((resolve, reject) => {
-                        this.setGroupLogo(requestOptions, AadO365GroupSetCommand.numRepeat, resolve, reject, logger);
-                    });
+                    yield this.setGroupLogo(requestOptions, AadO365GroupSetCommand.numRepeat, logger);
                 }
                 else if (this.debug) {
                     logger.logToStderr('logoPath not set. Skipping');
@@ -142,24 +142,19 @@ class AadO365GroupSetCommand extends GraphCommand_1.default {
             }
         });
     }
-    setGroupLogo(requestOptions, retryLeft, resolve, reject, logger) {
-        request_1.default
-            .put(requestOptions)
-            .then((res) => {
-            if (this.debug) {
-                logger.logToStderr('Response:');
-                logger.logToStderr(res);
-                logger.logToStderr('');
-            }
-            resolve();
-        }, (err) => {
-            if (--retryLeft > 0) {
-                setTimeout(() => {
-                    this.setGroupLogo(requestOptions, retryLeft, resolve, reject, logger);
-                }, 500 * (AadO365GroupSetCommand.numRepeat - retryLeft));
+    setGroupLogo(requestOptions, retryLeft, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield request_1.default.put(requestOptions);
             }
-            else {
-                reject(err);
+            catch (err) {
+                if (--retryLeft > 0) {
+                    yield (0, promises_1.setTimeout)(this.pollingInterval * (AadO365GroupSetCommand.numRepeat - retryLeft));
+                    yield this.setGroupLogo(requestOptions, retryLeft, logger);
+                }
+                else {
+                    throw err;
+                }
             }
         });
     }

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

@@ -0,0 +1,78 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadSpListCommand_instances, _AadSpListCommand_initTelemetry, _AadSpListCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadSpListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SP_LIST;
+    }
+    defaultProperties() {
+        return ['appId', 'displayName', 'tag'];
+    }
+    get description() {
+        return 'Lists the service principals in the directory';
+    }
+    constructor() {
+        super();
+        _AadSpListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadSpListCommand_instances, "m", _AadSpListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadSpListCommand_instances, "m", _AadSpListCommand_initOptions).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving service principal information...`);
+            }
+            try {
+                let requestUrl = `${this.resource}/v1.0/servicePrincipals`;
+                const filter = [];
+                if (args.options.tag) {
+                    filter.push(`(tags/any(t:t eq '${args.options.tag}'))`);
+                }
+                if (args.options.displayName) {
+                    filter.push(`(displayName eq '${args.options.displayName}')`);
+                }
+                if (filter.length > 0) {
+                    requestUrl += `?$filter=${filter.join(' and ')}`;
+                }
+                const res = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_AadSpListCommand_instances = new WeakSet(), _AadSpListCommand_initTelemetry = function _AadSpListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            tag: typeof args.options.tag !== 'undefined'
+        });
+    });
+}, _AadSpListCommand_initOptions = function _AadSpListCommand_initOptions() {
+    this.options.unshift({
+        option: '--displayName [displayName]'
+    }, {
+        option: '--tag [tag]'
+    });
+};
+module.exports = new AadSpListCommand();
+//# sourceMappingURL=sp-list.js.map

package/dist/m365/aad/commands.js

@@ -56,6 +56,7 @@ exports.default = {
     SITECLASSIFICATION_SET: `${prefix} siteclassification set`,
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
+    SP_LIST: `${prefix} sp list`,
     USER_ADD: `${prefix} user add`,
     USER_GET: `${prefix} user get`,
     USER_GUEST_ADD: `${prefix} user guest add`,

package/dist/m365/app/commands/app-open.js

@@ -17,6 +17,7 @@ var _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_in
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../cli/Cli");
 const settingsNames_1 = require("../../../settingsNames");
+const browserUtil_1 = require("../../../utils/browserUtil");
 const AppCommand_1 = require("../../base/AppCommand");
 const commands_1 = require("../commands");
 class AppOpenCommand extends AppCommand_1.default {
@@ -43,26 +44,15 @@ class AppOpenCommand extends AppCommand_1.default {
         });
     }
     logOrOpenUrl(args, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const previewPrefix = args.options.preview === true ? "preview." : "";
             const url = `https://${previewPrefix}portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/${this.appId}/isMSAApp/`;
             if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
                 logger.log(`Use a web browser to open the page ${url}`);
-                return resolve();
+                return;
             }
             logger.log(`Opening the following page in your browser: ${url}`);
-            // 'open' is required here so we can lazy load the dependency.
-            // _open is never set before hitting this line, but this check
-            // is implemented so that we can stub it when testing.
-            /* c8 ignore next 3 */
-            if (!this._open) {
-                this._open = require('open');
-            }
-            this._open(url).then(() => {
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
+            yield browserUtil_1.browserUtil.open(url);
         });
     }
 }

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliIssueCommand_instances, _CliIssueCommand_initTelemetry, _CliIssueCommand_initOptions, _CliIssueCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const open = require("open");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
+const browserUtil_1 = require("../../../utils/browserUtil");
 class CliIssueCommand extends AnonymousCommand_1.default {
     get name() {
         return commands_1.default.ISSUE;
@@ -25,9 +25,8 @@ class CliIssueCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Returns, or opens a URL that takes the user to the right place in the CLI GitHub repo to create a new issue reporting bug, feedback, ideas, etc.';
     }
-    constructor(open) {
+    constructor() {
         super();
-        this.open = open;
         _CliIssueCommand_instances.add(this);
         __classPrivateFieldGet(this, _CliIssueCommand_instances, "m", _CliIssueCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _CliIssueCommand_instances, "m", _CliIssueCommand_initOptions).call(this);
@@ -47,15 +46,10 @@ class CliIssueCommand extends AnonymousCommand_1.default {
                     issueLink = 'https://aka.ms/cli-m365/new-sample-script';
                     break;
             }
-            yield this.openBrowser(issueLink);
+            yield browserUtil_1.browserUtil.open(issueLink);
             logger.log(issueLink);
         });
     }
-    openBrowser(issueLink) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.open(issueLink, { wait: false });
-        });
-    }
 }
 _CliIssueCommand_instances = new WeakSet(), _CliIssueCommand_initTelemetry = function _CliIssueCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -81,5 +75,5 @@ CliIssueCommand.issueType = [
     'command',
     'sample'
 ];
-module.exports = new CliIssueCommand(open);
+module.exports = new CliIssueCommand();
 //# sourceMappingURL=cli-issue.js.map

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../cli/Cli");
 const config_1 = require("../../../config");
 const settingsNames_1 = require("../../../settingsNames");
+const browserUtil_1 = require("../../../utils/browserUtil");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
 class CliReconsentCommand extends AnonymousCommand_1.default {
@@ -29,15 +30,8 @@ class CliReconsentCommand extends AnonymousCommand_1.default {
                 return;
             }
             logger.log(`Opening the following page in your browser: ${url}`);
-            // _open is never set before hitting this line, but this check
-            // is implemented so that we can support lazy loading
-            // but also stub it for testing
-            /* c8 ignore next 3 */
-            if (!this._open) {
-                this._open = require('open');
-            }
             try {
-                yield this._open(url);
+                yield browserUtil_1.browserUtil.open(url);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

package/dist/m365/commands/docs.js

@@ -13,6 +13,7 @@ const AnonymousCommand_1 = require("../base/AnonymousCommand");
 const Cli_1 = require("../../cli/Cli");
 const commands_1 = require("./commands");
 const settingsNames_1 = require("../../settingsNames");
+const browserUtil_1 = require("../../utils/browserUtil");
 const packageJSON = require('../../../package.json');
 class DocsCommand extends AnonymousCommand_1.default {
     get name() {
@@ -27,14 +28,7 @@ class DocsCommand extends AnonymousCommand_1.default {
             if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
                 return;
             }
-            // _open is never set before hitting this line, but this check
-            // is implemented so that we can support lazy loading
-            // but also stub it for testing
-            /* c8 ignore next 3 */
-            if (!this._open) {
-                this._open = require('open');
-            }
-            yield this._open(packageJSON.homepage);
+            yield browserUtil_1.browserUtil.open(packageJSON.homepage);
         });
     }
 }

package/dist/m365/commands/setupPresets.js

@@ -4,6 +4,7 @@ exports.powerShellPreset = exports.scriptingPreset = exports.interactivePreset =
 exports.interactivePreset = {
     autoOpenLinksInBrowser: true,
     copyDeviceCodeToClipboard: true,
+    interactive: true,
     output: 'text',
     printErrorsAsPlainText: true,
     prompt: true,
@@ -13,6 +14,7 @@ exports.interactivePreset = {
 exports.scriptingPreset = {
     autoOpenLinksInBrowser: false,
     copyDeviceCodeToClipboard: false,
+    interactive: false,
     output: 'json',
     printErrorsAsPlainText: false,
     prompt: false,

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

@@ -38,21 +38,28 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows?api-version=2016-11-01`;
             try {
-                if (args.options.asAdmin || !args.options.sharingStatus || args.options.sharingStatus === 'ownedByMe') {
+                const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
+                if (sharingStatus === 'personal') {
+                    const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
                     yield this.getAllItems(url, logger, true);
                 }
-                else if (args.options.sharingStatus === 'personal') {
-                    yield this.getFilteredItems(url, logger, 'personal', true);
+                else if (sharingStatus === 'sharedWithMe') {
+                    const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
+                    yield this.getAllItems(url, logger, true);
                 }
-                else if (args.options.sharingStatus === 'sharedWithMe') {
-                    yield this.getFilteredItems(url, logger, 'team', true);
+                else if (sharingStatus === 'all') {
+                    let url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
+                    yield this.getAllItems(url, logger, true);
+                    url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
+                    yield this.getAllItems(url, logger, false);
                 }
                 else {
-                    yield this.getFilteredItems(url, logger, 'personal', true);
-                    yield this.getFilteredItems(url, logger, 'team', false);
+                    const url = this.getApiUrl(environmentName, asAdmin, includeSolutions);
+                    yield this.getAllItems(url, logger, true);
                 }
+                // Remove duplicates
+                this.items = this.items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
                 if (this.items.length > 0) {
                     this.items.forEach(i => {
                         i.displayName = i.properties.displayName;
@@ -70,16 +77,25 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
             }
         });
     }
-    getFilteredItems(url, logger, filter, firstRun) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.getAllItems(`${url}&$filter=search('${filter}')`, logger, firstRun);
-        });
+    getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
+        let url = `${this.resource}providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting_1.formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
+        if (filter === 'personal') {
+            url += `&$filter=search('personal')`;
+        }
+        else if (filter === 'team') {
+            url += `&$filter=search('team')`;
+        }
+        if (includeSolutionFlows) {
+            url += '&include=includeSolutionCloudFlows';
+        }
+        return url;
     }
 }
 _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = function _FlowListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             sharingStatus: typeof args.options.sharingStatus !== 'undefined',
+            includeSolutions: !!args.options.includeSolutions,
             asAdmin: !!args.options.asAdmin
         });
     });
@@ -89,6 +105,8 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     }, {
         option: '--sharingStatus [sharingStatus]',
         autocomplete: this.allowedSharingStatuses
+    }, {
+        option: '--includeSolutions'
     }, {
         option: '--asAdmin'
     });

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) {