@pnp/cli-microsoft365 6.0.0-beta.5637b93 → 6.0.0-beta.66b6874

package/dist/m365/planner/commands/task/task-set.js

@@ -17,7 +17,9 @@ var _PlannerTaskSetCommand_instances, _PlannerTaskSetCommand_initTelemetry, _Pla
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -38,41 +40,36 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates a Microsoft Planner Task';
     }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getBucketId(args.options)
-            .then(bucketId => {
-            this.bucketId = bucketId;
-            return this.generateUserAssignments(args.options);
-        })
-            .then(resultAssignments => {
-            this.assignments = resultAssignments;
-            return this.getTaskEtag(args.options.id);
-        })
-            .then(etag => {
-            const appliedCategories = this.generateAppliedCategories(args.options);
-            const data = this.mapRequestBody(args.options, appliedCategories);
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/tasks/${args.options.id}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none',
-                    'If-Match': etag,
-                    'Prefer': 'return=representation'
-                },
-                responseType: 'json',
-                data: data
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(newTask => this.updateTaskDetails(args.options, newTask))
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                this.bucketId = yield this.getBucketId(args.options);
+                this.assignments = yield this.generateUserAssignments(args.options);
+                const etag = yield this.getTaskEtag(args.options.id);
+                const appliedCategories = this.generateAppliedCategories(args.options);
+                const data = this.mapRequestBody(args.options, appliedCategories);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/tasks/${args.options.id}`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none',
+                        'If-Match': etag,
+                        'Prefer': 'return=representation'
+                    },
+                    responseType: 'json',
+                    data: data
+                };
+                const newTask = yield request_1.default.patch(requestOptions);
+                const result = yield this.updateTaskDetails(args.options, newTask);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     updateTaskDetails(options, newTask) {
         if (!options.description) {
@@ -157,7 +154,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         let userIds = [];
         const promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'accept ': 'application/json;odata.metadata=none'
                 },
@@ -299,13 +296,13 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
-        if (args.options.startDateTime && !utils_1.validation.isValidISODateTime(args.options.startDateTime)) {
+        if (args.options.startDateTime && !validation_1.validation.isValidISODateTime(args.options.startDateTime)) {
             return 'The startDateTime is not a valid ISO date string';
         }
-        if (args.options.dueDateTime && !utils_1.validation.isValidISODateTime(args.options.dueDateTime)) {
+        if (args.options.dueDateTime && !validation_1.validation.isValidISODateTime(args.options.dueDateTime)) {
             return 'The dueDateTime is not a valid ISO date string';
         }
         if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
@@ -314,7 +311,7 @@ _PlannerTaskSetCommand_instances = new WeakSet(), _PlannerTaskSetCommand_initTel
         if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
             return `percentComplete should be between 0 and 100`;
         }
-        if (args.options.assignedToUserIds && !utils_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+        if (args.options.assignedToUserIds && !validation_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
             return 'assignedToUserIds contains invalid GUID';
         }
         if (args.options.assignedToUserIds && args.options.assignedToUserNames) {

package/dist/m365/planner/commands/tenant/tenant-settings-list.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 });
 const request_1 = require("../../../../request");
 const PlannerCommand_1 = require("../../../base/PlannerCommand");
@@ -13,20 +22,23 @@ class PlannerTenantSettingsListCommand extends PlannerCommand_1.default {
     defaultProperties() {
         return ['isPlannerAllowed', 'allowCalendarSharing', 'allowTenantMoveWithDataLoss', 'allowTenantMoveWithDataMigration', 'allowRosterCreation', 'allowPlannerMobilePushNotifications'];
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((result) => {
-            logger.log(result);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const result = yield request_1.default.get(requestOptions);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new PlannerTenantSettingsListCommand();

package/dist/m365/planner/commands/tenant/tenant-settings-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerTenantSettingsSetCommand_instances, _PlannerTenantSettingsSetCommand_initTelemetry, _PlannerTenantSettingsSetCommand_initOptions, _PlannerTenantSettingsSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PlannerCommand_1 = require("../../../base/PlannerCommand");
 const commands_1 = require("../../commands");
 class PlannerTenantSettingsSetCommand extends PlannerCommand_1.default {
@@ -33,29 +33,32 @@ class PlannerTenantSettingsSetCommand extends PlannerCommand_1.default {
     get description() {
         return 'Sets Microsoft Planner configuration of the tenant';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                prefer: 'return=representation'
-            },
-            responseType: 'json',
-            data: {
-                isPlannerAllowed: args.options.isPlannerAllowed,
-                allowCalendarSharing: args.options.allowCalendarSharing,
-                allowTenantMoveWithDataLoss: args.options.allowTenantMoveWithDataLoss,
-                allowTenantMoveWithDataMigration: args.options.allowTenantMoveWithDataMigration,
-                allowRosterCreation: args.options.allowRosterCreation,
-                allowPlannerMobilePushNotifications: args.options.allowPlannerMobilePushNotifications
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    prefer: 'return=representation'
+                },
+                responseType: 'json',
+                data: {
+                    isPlannerAllowed: args.options.isPlannerAllowed,
+                    allowCalendarSharing: args.options.allowCalendarSharing,
+                    allowTenantMoveWithDataLoss: args.options.allowTenantMoveWithDataLoss,
+                    allowTenantMoveWithDataMigration: args.options.allowTenantMoveWithDataMigration,
+                    allowRosterCreation: args.options.allowRosterCreation,
+                    allowPlannerMobilePushNotifications: args.options.allowPlannerMobilePushNotifications
+                }
+            };
+            try {
+                const result = yield request_1.default.patch(requestOptions);
+                logger.log(result);
             }
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then((result) => {
-            logger.log(result);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _PlannerTenantSettingsSetCommand_instances = new WeakSet(), _PlannerTenantSettingsSetCommand_initTelemetry = function _PlannerTenantSettingsSetCommand_initTelemetry() {
@@ -99,7 +102,7 @@ _PlannerTenantSettingsSetCommand_instances = new WeakSet(), _PlannerTenantSettin
             return 'You must specify at least one option';
         }
         for (const option of optionsArray) {
-            if (typeof option !== 'undefined' && !utils_1.validation.isValidBoolean(option)) {
+            if (typeof option !== 'undefined' && !validation_1.validation.isValidBoolean(option)) {
                 return `Value '${option}' is not a valid boolean`;
             }
         }

package/dist/m365/pp/commands/dataverse/dataverse-table-list.js

@@ -0,0 +1,75 @@
+"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 _PpDataverseTableListCommand_instances, _PpDataverseTableListCommand_initTelemetry, _PpDataverseTableListCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const powerPlatform_1 = require("../../../../utils/powerPlatform");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpDataverseTableListCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpDataverseTableListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpDataverseTableListCommand_instances, "m", _PpDataverseTableListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpDataverseTableListCommand_instances, "m", _PpDataverseTableListCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.DATAVERSE_TABLE_LIST;
+    }
+    get description() {
+        return 'Lists dataverse tables in a given environment';
+    }
+    defaultProperties() {
+        return ['SchemaName', 'EntitySetName', 'IsManaged'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of tables for which the user is an admin...`);
+            }
+            const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+            const requestOptions = {
+                url: `${dynamicsApiUrl}/api/data/v9.0/EntityDefinitions?$select=MetadataId,IsCustomEntity,IsManaged,SchemaName,IconVectorName,LogicalName,EntitySetName,IsActivity,DataProviderId,IsRenameable,IsCustomizable,CanCreateForms,CanCreateViews,CanCreateCharts,CanCreateAttributes,CanChangeTrackingBeEnabled,CanModifyAdditionalSettings,CanChangeHierarchicalRelationship,CanEnableSyncToExternalSearchIndex&$filter=(IsIntersect eq false and IsLogicalEntity eq false and%0APrimaryNameAttribute ne null and PrimaryNameAttribute ne %27%27 and ObjectTypeCode gt 0 and%0AObjectTypeCode ne 4712 and ObjectTypeCode ne 4724 and ObjectTypeCode ne 9933 and ObjectTypeCode ne 9934 and%0AObjectTypeCode ne 9935 and ObjectTypeCode ne 9947 and ObjectTypeCode ne 9945 and ObjectTypeCode ne 9944 and%0AObjectTypeCode ne 9942 and ObjectTypeCode ne 9951 and ObjectTypeCode ne 2016 and ObjectTypeCode ne 9949 and%0AObjectTypeCode ne 9866 and ObjectTypeCode ne 9867 and ObjectTypeCode ne 9868) and (IsCustomizable/Value eq true or IsCustomEntity eq true or IsManaged eq false or IsMappable/Value eq true or IsRenameable/Value eq true)&api-version=9.1`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PpDataverseTableListCommand_instances = new WeakSet(), _PpDataverseTableListCommand_initTelemetry = function _PpDataverseTableListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PpDataverseTableListCommand_initOptions = function _PpDataverseTableListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-a, --asAdmin'
+    });
+};
+module.exports = new PpDataverseTableListCommand();
+//# sourceMappingURL=dataverse-table-list.js.map

package/dist/m365/pp/commands/environment/environment-list.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());
+    });
+};
 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");
@@ -25,35 +34,38 @@ class PpEnvironmentListCommand extends PowerPlatformCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of Microsoft Power Platform environments...`);
-        }
-        let url = '';
-        if (args.options.asAdmin) {
-            url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments`;
-        }
-        else {
-            url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments`;
-        }
-        const requestOptions = {
-            url: `${url}?api-version=2020-10-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value && res.value.length > 0) {
-                res.value.forEach(e => {
-                    e.displayName = e.properties.displayName;
-                });
-                logger.log(res.value);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of Microsoft Power Platform environments...`);
+            }
+            let url = '';
+            if (args.options.asAdmin) {
+                url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments`;
+            }
+            else {
+                url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments`;
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            const requestOptions = {
+                url: `${url}?api-version=2020-10-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value && res.value.length > 0) {
+                    res.value.forEach(e => {
+                        e.displayName = e.properties.displayName;
+                    });
+                    logger.log(res.value);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _PpEnvironmentListCommand_instances = new WeakSet(), _PpEnvironmentListCommand_initTelemetry = function _PpEnvironmentListCommand_initTelemetry() {
@@ -64,7 +76,7 @@ _PpEnvironmentListCommand_instances = new WeakSet(), _PpEnvironmentListCommand_i
     });
 }, _PpEnvironmentListCommand_initOptions = function _PpEnvironmentListCommand_initOptions() {
     this.options.unshift({
-        option: '-a, --asAdmin [teamId]'
+        option: '-a, --asAdmin'
     });
 };
 module.exports = new PpEnvironmentListCommand();

package/dist/m365/pp/commands/gateway/gateway-list.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 });
 const request_1 = require("../../../../request");
 const PowerBICommand_1 = require("../../../base/PowerBICommand");
@@ -13,23 +22,26 @@ class PpGatewayListCommand extends PowerBICommand_1.default {
     defaultProperties() {
         return ['id', 'name'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of gateways for which the user is an admin...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorg/gateways`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of gateways for which the user is an admin...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorg/gateways`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new PpGatewayListCommand();

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -13,10 +13,10 @@ 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 _PpManagementAppAddCommand_instances, _PpManagementAppAddCommand_initTelemetry, _PpManagementAppAddCommand_initOptions, _PpManagementAppAddCommand_initValidators;
+var _PpManagementAppAddCommand_instances, _PpManagementAppAddCommand_initTelemetry, _PpManagementAppAddCommand_initOptions, _PpManagementAppAddCommand_initValidators, _PpManagementAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
 class PpManagementAppAddCommand extends PowerPlatformCommand_1.default {
@@ -26,6 +26,7 @@ class PpManagementAppAddCommand extends PowerPlatformCommand_1.default {
         __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PpManagementAppAddCommand_instances, "m", _PpManagementAppAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.MANAGEMENTAPP_ADD;
@@ -33,24 +34,25 @@ class PpManagementAppAddCommand extends PowerPlatformCommand_1.default {
     get description() {
         return 'Register management application for Power Platform';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getAppId(args)
-            .then((appId) => {
-            const requestOptions = {
-                // This should be refactored once we implement a PowerPlatform base class as api.bap will differ between envs.
-                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications/${appId}?api-version=2020-06-01`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.put(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appId = yield this.getAppId(args);
+                const requestOptions = {
+                    // This should be refactored once we implement a PowerPlatform base class as api.bap will differ between envs.
+                    url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications/${appId}?api-version=2020-06-01`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.put(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppId(args) {
         if (args.options.appId) {
@@ -93,24 +95,16 @@ _PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' });
 }, _PpManagementAppAddCommand_initValidators = function _PpManagementAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.appId &&
-            !args.options.objectId &&
-            !args.options.name) {
-            return 'Specify either appId, objectId, or name';
-        }
-        if ((args.options.appId && args.options.objectId) ||
-            (args.options.appId && args.options.name) ||
-            (args.options.objectId && args.options.name)) {
-            return 'Specify either appId, objectId, or name but not both';
-        }
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     }));
+}, _PpManagementAppAddCommand_initOptionSets = function _PpManagementAppAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'objectId', 'name']);
 };
 module.exports = new PpManagementAppAddCommand();
 //# sourceMappingURL=managementapp-add.js.map

package/dist/m365/pp/commands/managementapp/managementapp-list.js

@@ -1,6 +1,15 @@
 "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 });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
 const commands_1 = require("../../commands");
 class PpManagementAppListCommand extends PowerPlatformCommand_1.default {
@@ -10,14 +19,17 @@ class PpManagementAppListCommand extends PowerPlatformCommand_1.default {
     get description() {
         return 'Lists management applications for Power Platform';
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications?api-version=2020-06-01`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((managementApps) => {
-            logger.log(managementApps);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/providers/Microsoft.BusinessAppPlatform/adminApplications?api-version=2020-06-01`;
+            try {
+                const managementApps = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(managementApps);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new PpManagementAppListCommand();

package/dist/m365/pp/commands/solution/Solution.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Solution.js.map