@pnp/cli-microsoft365 5.9.0-beta.60e454b → 5.9.0-beta.77d7f6b

package/dist/Command.js

@@ -61,6 +61,9 @@ class Command {
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initOptions).call(this);
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initValidators).call(this);
     }
+    get allowedOutputs() {
+        return ['csv', 'json', 'text'];
+    }
     validateUnknownOptions(args, command) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.allowUnknownOptions()) {
@@ -135,6 +138,17 @@ class Command {
             return true;
         });
     }
+    validateOutput(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.output &&
+                this.allowedOutputs.indexOf(args.options.output) < 0) {
+                return `'${args.options.output}' is not a valid output type. Allowed output types are ${this.allowedOutputs.join(', ')}`;
+            }
+            else {
+                return true;
+            }
+        });
+    }
     alias() {
         return;
     }
@@ -417,9 +431,9 @@ _Command_instances = new WeakSet(), _Command_initTelemetry = function _Command_i
 }, _Command_initOptions = function _Command_initOptions() {
     this.options.unshift({ option: '--query [query]' }, {
         option: '-o, --output [output]',
-        autocomplete: ['csv', 'json', 'text']
+        autocomplete: this.allowedOutputs
     }, { option: '--verbose' }, { option: '--debug' });
 }, _Command_initValidators = function _Command_initValidators() {
-    this.validators.push((args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), (args, command) => this.validateOptionSets(args, command));
+    this.validators.push((args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), args => this.validateOutput(args), (args, command) => this.validateOptionSets(args, command));
 };
 //# sourceMappingURL=Command.js.map

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

@@ -209,8 +209,6 @@ class AadAppAddCommand extends GraphCommand_1.default {
         delete v2Manifest.appId;
         delete v2Manifest.publisherDomain;
         // extract secrets from the manifest. Store them in a separate variable
-        // and remove them from the manifest because we need to create them
-        // separately
         const secrets = this.getSecretsFromManifest(v2Manifest);
         // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
         if (args.options.apisApplication || args.options.apisDelegated) {
@@ -218,6 +216,33 @@ class AadAppAddCommand extends GraphCommand_1.default {
             // otherwise, they will be skipped in the app update
             v2Manifest.requiredResourceAccess = appInfo.requiredResourceAccess;
         }
+        if (args.options.redirectUris) {
+            // take submitted redirectUris/platform as options
+            // otherwise, they will be removed from the app
+            v2Manifest.replyUrlsWithType = args.options.redirectUris.split(',').map(u => {
+                return {
+                    url: u.trim(),
+                    type: this.translatePlatformToType(args.options.platform)
+                };
+            });
+        }
+        if (args.options.multitenant) {
+            // override manifest setting when using multitenant flag
+            v2Manifest.signInAudience = 'AzureADMultipleOrgs';
+        }
+        if (args.options.implicitFlow) {
+            // remove manifest settings when using implicitFlow flag
+            delete v2Manifest.oauth2AllowIdTokenImplicitFlow;
+            delete v2Manifest.oauth2AllowImplicitFlow;
+        }
+        if (args.options.scopeName) {
+            // override manifest setting when using options.
+            delete v2Manifest.oauth2Permissions;
+        }
+        if (args.options.certificateFile || args.options.certificateBase64Encoded) {
+            // override manifest setting when using options.
+            delete v2Manifest.keyCredentials;
+        }
         const graphManifest = this.transformManifest(v2Manifest);
         const updateAppRequestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
@@ -428,7 +453,6 @@ class AadAppAddCommand extends GraphCommand_1.default {
         return odata_1.odata
             .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`)
             .then(servicePrincipals => {
-            var _a;
             let resolvedApis = [];
             try {
                 if (args.options.apisDelegated || args.options.apisApplication) {
@@ -451,17 +475,10 @@ class AadAppAddCommand extends GraphCommand_1.default {
                         }
                     });
                 }
-                if (typeof ((_a = this.manifest) === null || _a === void 0 ? void 0 : _a.requiredResourceAccess) !== 'undefined' && this.manifest.requiredResourceAccess.length > 0) {
+                else {
                     const manifestApis = this.manifest.requiredResourceAccess;
                     manifestApis.forEach(manifestApi => {
-                        const requiredResource = resolvedApis.find(api => api.resourceAppId === manifestApi.resourceAppId);
-                        if (requiredResource) {
-                            // exclude if any duplicate required resources in both manifest and submitted options
-                            requiredResource.resourceAccess.push(...manifestApi.resourceAccess.filter(manRes => !requiredResource.resourceAccess.some(res => res.id === manRes.id)));
-                        }
-                        else {
-                            resolvedApis.push(manifestApi);
-                        }
+                        resolvedApis.push(manifestApi);
                         const app = servicePrincipals.find(servicePrincipals => servicePrincipals.appId === manifestApi.resourceAppId);
                         if (app) {
                             manifestApi.resourceAccess.forEach((res => {
@@ -550,7 +567,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
     }
     configureSecret(args, appInfo, logger) {
-        if (!args.options.withSecret) {
+        if (!args.options.withSecret || (appInfo.secrets && appInfo.secrets.length > 0)) {
             return Promise.resolve(appInfo);
         }
         if (this.verbose) {
@@ -560,6 +577,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
             .createSecret({ appObjectId: appInfo.id })
             .then(secret => {
             appInfo.secret = secret.value;
+            appInfo.secrets = [{ displayName: secret.displayName, value: secret.value }];
             return Promise.resolve(appInfo);
         });
     }
@@ -643,6 +661,12 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
         return Promise.resolve(appInfo);
     }
+    translatePlatformToType(platform) {
+        if (platform === 'publicClient') {
+            return 'InstalledClient';
+        }
+        return platform.charAt(0).toUpperCase() + platform.substring(1);
+    }
 }
 _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = function _AadAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/commands/status.js

@@ -37,12 +37,17 @@ class StatusCommand extends Command_1.default {
                     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,
                         accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
                     });
                 }
                 else {
                     logger.log({
-                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                        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
                     });
                 }
             }

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -15,10 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const validation_1 = require("../../../../utils/validation");
 class OutlookMailSendCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -37,7 +40,6 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return [commands_1.default.SENDMAIL];
     }
     commandAction(logger, args) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -51,28 +53,8 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
                         'content-type': 'application/json'
                     },
                     responseType: 'json',
-                    data: {
-                        message: {
-                            subject: args.options.subject,
-                            body: {
-                                contentType: args.options.bodyContentType || 'Text',
-                                content: args.options.bodyContents
-                            },
-                            toRecipients: this.mapEmailAddressesToRecipients(args.options.to.split(',')),
-                            ccRecipients: this.mapEmailAddressesToRecipients((_a = args.options.cc) === null || _a === void 0 ? void 0 : _a.split(',')),
-                            bccRecipients: this.mapEmailAddressesToRecipients((_b = args.options.bcc) === null || _b === void 0 ? void 0 : _b.split(',')),
-                            importance: args.options.importance
-                        },
-                        saveToSentItems: args.options.saveToSentItems
-                    }
+                    data: this.getRequestBody(args.options)
                 };
-                if (args.options.mailbox) {
-                    requestOptions.data.message.from = {
-                        emailAddress: {
-                            address: args.options.mailbox
-                        }
-                    };
-                }
                 yield request_1.default.post(requestOptions);
             }
             catch (err) {
@@ -80,15 +62,40 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
             }
         });
     }
-    mapEmailAddressesToRecipients(emailAddresses) {
-        if (!emailAddresses) {
-            return emailAddresses;
+    mapEmailAddressToRecipient(email) {
+        if (!email) {
+            return undefined;
         }
-        return emailAddresses.map(email => ({
+        return {
             emailAddress: {
                 address: email.trim()
             }
+        };
+    }
+    getRequestBody(options) {
+        var _a, _b;
+        const attachments = typeof options.attachment === 'string' ? [options.attachment] : options.attachment;
+        const attachmentContents = attachments === null || attachments === void 0 ? void 0 : attachments.map(a => ({
+            '@odata.type': '#microsoft.graph.fileAttachment',
+            name: path.basename(a),
+            contentBytes: fs.readFileSync(a, { encoding: 'base64' })
         }));
+        return ({
+            message: {
+                subject: options.subject,
+                body: {
+                    contentType: options.bodyContentType || 'Text',
+                    content: options.bodyContents
+                },
+                from: this.mapEmailAddressToRecipient(options.mailbox),
+                toRecipients: options.to.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                ccRecipients: (_a = options.cc) === null || _a === void 0 ? void 0 : _a.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                bccRecipients: (_b = options.bcc) === null || _b === void 0 ? void 0 : _b.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                importance: options.importance,
+                attachments: attachmentContents
+            },
+            saveToSentItems: options.saveToSentItems
+        });
     }
 }
 _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
@@ -100,7 +107,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             saveToSentItems: args.options.saveToSentItems,
             importance: args.options.importance,
             mailbox: typeof args.options.mailbox !== 'undefined',
-            sender: typeof args.options.sender !== 'undefined'
+            sender: typeof args.options.sender !== 'undefined',
+            attachment: typeof args.options.attachment !== 'undefined'
         });
     });
 }, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
@@ -124,6 +132,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
     }, {
         option: '--importance [importance]',
         autocomplete: ['low', 'normal', 'high']
+    }, {
+        option: '--attachment [attachment]'
     }, {
         option: '--saveToSentItems [saveToSentItems]'
     });
@@ -134,14 +144,28 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             args.options.bodyContentType !== 'HTML') {
             return `${args.options.bodyContentType} is not a valid value for the bodyContentType option. Allowed values are Text|HTML`;
         }
-        if (args.options.saveToSentItems &&
-            args.options.saveToSentItems !== 'true' &&
-            args.options.saveToSentItems !== 'false') {
+        if (args.options.saveToSentItems && !validation_1.validation.isValidBoolean(args.options.saveToSentItems)) {
             return `${args.options.saveToSentItems} is not a valid value for the saveToSentItems option. Allowed values are true|false`;
         }
         if (args.options.importance && ['low', 'normal', 'high'].indexOf(args.options.importance) === -1) {
             return `'${args.options.importance}' is not a valid value for the importance option. Allowed values are low|normal|high`;
         }
+        if (args.options.attachment) {
+            const attachments = typeof args.options.attachment === 'string' ? [args.options.attachment] : args.options.attachment;
+            for (const attachment of attachments) {
+                if (!fs.existsSync(attachment)) {
+                    return `File with path '${attachment}' was not found.`;
+                }
+                if (!fs.lstatSync(attachment).isFile()) {
+                    return `'${attachment}' is not a file.`;
+                }
+            }
+            const requestBody = this.getRequestBody(args.options);
+            // The max body size of the request is 4 194 304 chars before getting a 413 response
+            if (JSON.stringify(requestBody).length > 4194304) {
+                return 'Exceeded the max total size of attachments which is 3MB.';
+            }
+        }
         return true;
     }));
 };

package/dist/m365/pp/commands/card/card-get.js

@@ -0,0 +1,110 @@
+"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 _PpCardGetCommand_instances, _PpCardGetCommand_initTelemetry, _PpCardGetCommand_initOptions, _PpCardGetCommand_initOptionSets, _PpCardGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+class PpCardGetCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpCardGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpCardGetCommand_instances, "m", _PpCardGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpCardGetCommand_instances, "m", _PpCardGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpCardGetCommand_instances, "m", _PpCardGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpCardGetCommand_instances, "m", _PpCardGetCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.CARD_GET;
+    }
+    get description() {
+        return 'Get specific Microsoft Power Platform card in the specified Power Platform environment.';
+    }
+    defaultProperties() {
+        return ['name', 'cardid', 'publishdate', 'createdon', 'modifiedon'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving a card '${args.options.id || args.options.name}'...`);
+            }
+            try {
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const res = yield this.getCard(dynamicsApiUrl, args.options);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getCard(dynamicsApiUrl, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            if (options.id) {
+                requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/cards(${options.id})`;
+                const result = yield request_1.default.get(requestOptions);
+                return result;
+            }
+            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/cards?$filter=name eq '${options.name}'`;
+            const result = yield request_1.default.get(requestOptions);
+            if (result.value.length === 0) {
+                throw `The specified card '${options.name}' does not exist.`;
+            }
+            if (result.value.length > 1) {
+                throw `Multiple cards with name '${options.name}' found: ${result.value.map(x => x.cardid).join(',')}`;
+            }
+            return result.value[0];
+        });
+    }
+}
+_PpCardGetCommand_instances = new WeakSet(), _PpCardGetCommand_initTelemetry = function _PpCardGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PpCardGetCommand_initOptions = function _PpCardGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-a, --asAdmin'
+    });
+}, _PpCardGetCommand_initOptionSets = function _PpCardGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+}, _PpCardGetCommand_initValidators = function _PpCardGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new PpCardGetCommand();
+//# sourceMappingURL=card-get.js.map

package/dist/m365/pp/commands/gateway/gateway-get.js

@@ -0,0 +1,70 @@
+"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 _PpGatewayGetCommand_instances, _PpGatewayGetCommand_initOptions, _PpGatewayGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const PowerBICommand_1 = require("../../../base/PowerBICommand");
+const commands_1 = require("../../commands");
+class PpGatewayGetCommand extends PowerBICommand_1.default {
+    constructor() {
+        super();
+        _PpGatewayGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpGatewayGetCommand_instances, "m", _PpGatewayGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpGatewayGetCommand_instances, "m", _PpGatewayGetCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.GATEWAY_GET;
+    }
+    get description() {
+        return "Get information about the specified gateway.";
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const gateway = yield this.getGateway(args.options.id);
+                logger.log(gateway);
+            }
+            catch (error) {
+                this.handleRejectedODataJsonPromise(error);
+            }
+        });
+    }
+    getGateway(gatewayId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorg/gateways/${encodeURIComponent(gatewayId)}`,
+            headers: {
+                accept: "application/json;odata.metadata=none"
+            },
+            responseType: "json"
+        };
+        return request_1.default.get(requestOptions);
+    }
+}
+_PpGatewayGetCommand_instances = new WeakSet(), _PpGatewayGetCommand_initOptions = function _PpGatewayGetCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --id <id>"
+    });
+}, _PpGatewayGetCommand_initValidators = function _PpGatewayGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new PpGatewayGetCommand();
+//# sourceMappingURL=gateway-get.js.map

package/dist/m365/pp/commands/solution/solution-get.js

@@ -0,0 +1,117 @@
+"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 _PpSolutionGetCommand_instances, _PpSolutionGetCommand_initTelemetry, _PpSolutionGetCommand_initOptions, _PpSolutionGetCommand_initOptionSets, _PpSolutionGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const validation_1 = require("../../../../utils/validation");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpSolutionGetCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpSolutionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpSolutionGetCommand_instances, "m", _PpSolutionGetCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.SOLUTION_GET;
+    }
+    get description() {
+        return 'Gets a specific solution in a given environment.';
+    }
+    defaultProperties() {
+        return ['uniquename', 'version', 'publisher'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving a specific solution '${args.options.id || args.options.name}'...`);
+            }
+            try {
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const res = yield this.getSolution(dynamicsApiUrl, args.options);
+                if (!args.options.output || args.options.output === 'json') {
+                    logger.log(res);
+                }
+                else {
+                    // Converted to text friendly output
+                    logger.log({
+                        uniquename: res.uniquename,
+                        version: res.version,
+                        publisher: res.publisherid.friendlyname
+                    });
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getSolution(dynamicsApiUrl, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            if (options.id) {
+                requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
+                const result = yield request_1.default.get(requestOptions);
+                return result;
+            }
+            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true and uniquename eq \'${options.name}\'&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
+            const result = yield request_1.default.get(requestOptions);
+            if (result.value.length === 0) {
+                throw `The specified solution '${options.name}' does not exist.`;
+            }
+            return result.value[0];
+        });
+    }
+}
+_PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelemetry = function _PpSolutionGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PpSolutionGetCommand_initOptions = function _PpSolutionGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-a, --asAdmin'
+    });
+}, _PpSolutionGetCommand_initOptionSets = function _PpSolutionGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+}, _PpSolutionGetCommand_initValidators = function _PpSolutionGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new PpSolutionGetCommand();
+//# sourceMappingURL=solution-get.js.map

package/dist/m365/pp/commands.js

@@ -2,13 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pp';
 exports.default = {
+    CARD_GET: `${prefix} card get`,
     CARD_LIST: `${prefix} card list`,
     DATAVERSE_TABLE_LIST: `${prefix} dataverse table list`,
     ENVIRONMENT_GET: `${prefix} environment get`,
     ENVIRONMENT_LIST: `${prefix} environment list`,
+    GATEWAY_GET: `${prefix} gateway get`,
     GATEWAY_LIST: `${prefix} gateway list`,
     MANAGEMENTAPP_ADD: `${prefix} managementapp add`,
     MANAGEMENTAPP_LIST: `${prefix} managementapp list`,
+    SOLUTION_GET: `${prefix} solution get`,
     SOLUTION_LIST: `${prefix} solution list`,
     TENANT_SETTINGS_LIST: `${prefix} tenant settings list`
 };

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -68,6 +68,9 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initValidators).call(this);
     }
+    get allowedOutputs() {
+        return ['json', 'text', 'md', 'tour'];
+    }
     get name() {
         return commands_1.default.PROJECT_DOCTOR;
     }
@@ -333,7 +336,7 @@ _SpfxProjectDoctorCommand_instances = new WeakSet(), _SpfxProjectDoctorCommand_i
 }, _SpfxProjectDoctorCommand_initOptions = function _SpfxProjectDoctorCommand_initOptions() {
     this.options.forEach(o => {
         if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = ['json', 'text', 'md', 'tour'];
+            o.autocomplete = this.allowedOutputs;
         }
     });
     this.options.unshift({

package/dist/m365/spfx/commands/project/project-externalize.js

@@ -53,6 +53,9 @@ class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCo
         this.allEditSuggestions = [];
         __classPrivateFieldGet(this, _SpfxProjectExternalizeCommand_instances, "m", _SpfxProjectExternalizeCommand_initOptions).call(this);
     }
+    get allowedOutputs() {
+        return ['json', 'text', 'md'];
+    }
     get name() {
         return commands_1.default.PROJECT_EXTERNALIZE;
     }
@@ -185,7 +188,7 @@ class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCo
 _SpfxProjectExternalizeCommand_instances = new WeakSet(), _SpfxProjectExternalizeCommand_initOptions = function _SpfxProjectExternalizeCommand_initOptions() {
     this.options.forEach(o => {
         if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = ['json', 'text', 'md'];
+            o.autocomplete = this.allowedOutputs;
         }
     });
 };