@pnp/cli-microsoft365 6.9.0-beta.f6054b4 → 6.10.0-beta.05cab2f

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/base/AzmgmtItemsListCommand.js

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzmgmtItemsListCommand = void 0;
 const url = require("url");
@@ -10,7 +19,7 @@ class AzmgmtItemsListCommand extends AzmgmtCommand_1.default {
         this.items = [];
     }
     getAllItems(_url, logger, firstRun) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
                 url: _url,
                 headers: {
@@ -18,39 +27,28 @@ class AzmgmtItemsListCommand extends AzmgmtCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                if (firstRun) {
-                    this.items = [];
+            const res = yield request_1.default.get(requestOptions);
+            if (firstRun) {
+                this.items = [];
+            }
+            this.items = this.items.concat(res.value);
+            if (res.nextLink) {
+                // when retrieving Flows as admin, the API returns nextLink
+                // pointing to https://emea.api.flow.microsoft.com:11777
+                // which leads to authentication exceptions because it's not an AAD
+                // resource for which we can retrieve an access token, so we need to
+                // rewrite it back to the API management URL
+                const nextLinkUrl = new url.URL(res.nextLink);
+                if (nextLinkUrl.host !== 'management.azure.com') {
+                    nextLinkUrl.host = 'management.azure.com';
+                    nextLinkUrl.port = '';
                 }
-                this.items = this.items.concat(res.value);
-                if (res.nextLink) {
-                    // when retrieving Flows as admin, the API returns nextLink
-                    // pointing to https://emea.api.flow.microsoft.com:11777
-                    // which leads to authentication exceptions because it's not an AAD
-                    // resource for which we can retrieve an access token, so we need to
-                    // rewrite it back to the API management URL
-                    const nextLinkUrl = new url.URL(res.nextLink);
-                    if (nextLinkUrl.host !== 'management.azure.com') {
-                        nextLinkUrl.host = 'management.azure.com';
-                        nextLinkUrl.port = '';
-                    }
-                    const nextLink = nextLinkUrl.href;
-                    this
-                        .getAllItems(nextLink, logger, false)
-                        .then(() => {
-                        resolve();
-                    }, (err) => {
-                        reject(err);
-                    });
-                }
-                else {
-                    resolve();
-                }
-            }, (err) => {
-                reject(err);
-            });
+                const nextLink = nextLinkUrl.href;
+                yield this.getAllItems(nextLink, logger, false);
+            }
+            else {
+                return;
+            }
         });
     }
 }

package/dist/m365/booking/commands/business/business-get.js

@@ -56,26 +56,25 @@ class BookingBusinessGetCommand extends GraphCommand_1.default {
         });
     }
     getBusinessId(options) {
-        if (options.id) {
-            return Promise.resolve(options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/solutions/bookingBusinesses`,
-            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* () {
+            if (options.id) {
+                return options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/solutions/bookingBusinesses`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             const name = options.name;
             const bookingBusinesses = response.value.filter(val => { var _a; return ((_a = val.displayName) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === name.toLocaleLowerCase(); });
             if (!bookingBusinesses.length) {
-                return Promise.reject(`The specified business with name ${options.name} does not exist.`);
+                throw `The specified business with name ${options.name} does not exist.`;
             }
             if (bookingBusinesses.length > 1) {
-                return Promise.reject(`Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`);
+                throw `Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`;
             }
             return bookingBusinesses[0].id;
         });

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/cli/commands/config/config-set.js

@@ -43,7 +43,6 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                 case settingsNames_1.settingsNames.csvQuoted:
                 case settingsNames_1.settingsNames.csvQuotedEmpty:
                 case settingsNames_1.settingsNames.disableTelemetry:
-                case settingsNames_1.settingsNames.interactive:
                 case settingsNames_1.settingsNames.printErrorsAsPlainText:
                 case settingsNames_1.settingsNames.prompt:
                 case settingsNames_1.settingsNames.showHelpOnFailure:
@@ -74,7 +73,7 @@ _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemet
         if (CliConfigSetCommand.optionNames.indexOf(args.options.key) < 0) {
             return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigSetCommand.optionNames.join(', ')}`;
         }
-        const allowedOutputs = ['text', 'json', 'csv', 'md'];
+        const allowedOutputs = ['text', 'json', 'csv', 'md', 'none'];
         if (args.options.key === settingsNames_1.settingsNames.output &&
             allowedOutputs.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedOutputs.join(', ')}`;

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/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 accessToken_1 = require("../../utils/accessToken");
 const misc_1 = require("../../utils/misc");
 const commands_1 = require("./commands");
 class LoginCommand extends Command_1.default {
@@ -90,6 +91,25 @@ class LoginCommand extends Command_1.default {
                     }
                     throw new Command_1.CommandError(error.message);
                 }
+                if (this.debug) {
+                    logger.logToStderr({
+                        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,
+                        accessToken: JSON.stringify(Auth_1.default.service.accessTokens, null, 2),
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
+                    });
+                }
+                else {
+                    logger.logToStderr({
+                        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,
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
+                    });
+                }
             });
             try {
                 yield Auth_1.default.clearConnectionInfo();