@pnp/cli-microsoft365 6.0.0-beta.38c66cf → 6.0.0-beta.42305df

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

@@ -1,37 +1,51 @@
 "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 _AadAppSetCommand_instances, _AadAppSetCommand_initTelemetry, _AadAppSetCommand_initOptions, _AadAppSetCommand_initValidators, _AadAppSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppSetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_SET;
     }
     get description() {
         return 'Updates Azure AD app registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.platform = typeof args.options.platform !== 'undefined';
-        telemetryProps.redirectUris = typeof args.options.redirectUris !== 'undefined';
-        telemetryProps.redirectUrisToRemove = typeof args.options.redirectUrisToRemove !== 'undefined';
-        telemetryProps.uri = typeof args.options.uri !== 'undefined';
-        telemetryProps.certificateFile = typeof args.options.certificateFile !== 'undefined';
-        telemetryProps.certificateBase64Encoded = typeof args.options.certificateBase64Encoded !== 'undefined';
-        telemetryProps.certificateDisplayName = typeof args.options.certificateDisplayName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        this
-            .getAppObjectId(args, logger)
-            .then(objectId => this.configureUri(args, objectId, logger))
-            .then(objectId => this.configureRedirectUris(args, objectId, logger))
-            .then(objectId => this.configureCertificate(args, objectId, logger))
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let objectId = yield this.getAppObjectId(args, logger);
+                objectId = yield this.configureUri(args, objectId, logger);
+                objectId = yield this.configureRedirectUris(args, objectId, logger);
+                yield this.configureCertificate(args, objectId, logger);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppObjectId(args, logger) {
         if (args.options.objectId) {
@@ -238,36 +252,29 @@ class AadAppSetCommand extends GraphCommand_1.default {
         };
         return request_1.default.patch(requestOptions);
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--objectId [objectId]' },
-            { option: '-n, --name [name]' },
-            { option: '-u, --uri [uri]' },
-            { option: '-r, --redirectUris [redirectUris]' },
-            { option: '--certificateFile [certificateFile]' },
-            { option: '--certificateBase64Encoded [certificateBase64Encoded]' },
-            { option: '--certificateDisplayName [certificateDisplayName]' },
-            {
-                option: '--platform [platform]',
-                autocomplete: AadAppSetCommand.aadApplicationPlatform
-            },
-            { option: '--redirectUrisToRemove [redirectUrisToRemove]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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';
-        }
+}
+_AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = function _AadAppSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            objectId: typeof args.options.objectId !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            platform: typeof args.options.platform !== 'undefined',
+            redirectUris: typeof args.options.redirectUris !== 'undefined',
+            redirectUrisToRemove: typeof args.options.redirectUrisToRemove !== 'undefined',
+            uri: typeof args.options.uri !== 'undefined',
+            certificateFile: typeof args.options.certificateFile !== 'undefined',
+            certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
+            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined'
+        });
+    });
+}, _AadAppSetCommand_initOptions = function _AadAppSetCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '-n, --name [name]' }, { option: '-u, --uri [uri]' }, { option: '-r, --redirectUris [redirectUris]' }, { option: '--certificateFile [certificateFile]' }, { option: '--certificateBase64Encoded [certificateBase64Encoded]' }, { option: '--certificateDisplayName [certificateDisplayName]' }, {
+        option: '--platform [platform]',
+        autocomplete: AadAppSetCommand.aadApplicationPlatform
+    }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' });
+}, _AadAppSetCommand_initValidators = function _AadAppSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.certificateFile && args.options.certificateBase64Encoded) {
             return 'Specify either certificateFile or certificateBase64Encoded but not both';
         }
@@ -285,8 +292,10 @@ class AadAppSetCommand extends GraphCommand_1.default {
             return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppSetCommand.aadApplicationPlatform.join(', ')}`;
         }
         return true;
-    }
-}
+    }));
+}, _AadAppSetCommand_initOptionSets = function _AadAppSetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'objectId', 'name']);
+};
 AadAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 module.exports = new AadAppSetCommand();
 //# sourceMappingURL=app-set.js.map

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

@@ -1,129 +1,141 @@
 "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 _AadAppRoleAssignmentAddCommand_instances, _AadAppRoleAssignmentAddCommand_initTelemetry, _AadAppRoleAssignmentAddCommand_initOptions, _AadAppRoleAssignmentAddCommand_initValidators, _AadAppRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APPROLEASSIGNMENT_ADD;
     }
     get description() {
         return 'Adds service principal permissions also known as scopes and app role assignments for specified Azure AD application registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
-        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let objectId = '';
-        let queryFilter = '';
-        if (args.options.appId) {
-            queryFilter = `$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
-        }
-        else if (args.options.objectId) {
-            queryFilter = `$filter=id eq '${encodeURIComponent(args.options.objectId)}'`;
-        }
-        else {
-            queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.displayName)}'`;
-        }
-        const getServicePrinciplesRequestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals?${queryFilter}`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(getServicePrinciplesRequestOptions)
-            .then((servicePrincipalResult) => {
-            if (servicePrincipalResult.value.length > 1) {
-                return Promise.reject('More than one service principal found. Please use the appId or objectId option to make sure the right service principal is specified.');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectId = '';
+            let queryFilter = '';
+            if (args.options.appId) {
+                queryFilter = `$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
             }
-            objectId = servicePrincipalResult.value[0].id;
-            let resource = encodeURIComponent(args.options.resource);
-            // try resolve aliases that the user might enter since these are seen in the Azure portal
-            switch (args.options.resource.toLocaleLowerCase()) {
-                case 'sharepoint':
-                    resource = 'Office 365 SharePoint Online';
-                    break;
-                case 'intune':
-                    resource = 'Microsoft Intune API';
-                    break;
-                case 'exchange':
-                    resource = 'Office 365 Exchange Online';
-                    break;
+            else if (args.options.appObjectId) {
+                queryFilter = `$filter=id eq '${encodeURIComponent(args.options.appObjectId)}'`;
             }
-            // will perform resource name, appId or objectId search
-            let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
-            if (utils_1.validation.isValidGuid(resource)) {
-                filter += ` or appId eq '${resource}' or id eq '${resource}'`;
+            else {
+                queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
             }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/servicePrincipals?${filter}`,
+            const getServicePrinciplesRequestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals?${queryFilter}`,
                 headers: {
-                    'accept': 'application/json'
+                    accept: 'application/json'
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            const result = [];
-            // flatten the app roles found
-            const appRolesFound = [];
-            for (const servicePrincipal of res.value) {
-                for (const role of servicePrincipal.appRoles) {
-                    appRolesFound.push({
-                        resourceId: servicePrincipal.id,
-                        objectId: role.id,
-                        value: role.value
+            try {
+                const servicePrincipalResult = yield request_1.default.get(getServicePrinciplesRequestOptions);
+                if (servicePrincipalResult.value.length > 1) {
+                    throw 'More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.';
+                }
+                objectId = servicePrincipalResult.value[0].id;
+                let resource = encodeURIComponent(args.options.resource);
+                // try resolve aliases that the user might enter since these are seen in the Azure portal
+                switch (args.options.resource.toLocaleLowerCase()) {
+                    case 'sharepoint':
+                        resource = 'Office 365 SharePoint Online';
+                        break;
+                    case 'intune':
+                        resource = 'Microsoft Intune API';
+                        break;
+                    case 'exchange':
+                        resource = 'Office 365 Exchange Online';
+                        break;
+                }
+                // will perform resource name, appId or objectId search
+                let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
+                if (validation_1.validation.isValidGuid(resource)) {
+                    filter += ` or appId eq '${resource}' or id eq '${resource}'`;
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/servicePrincipals?${filter}`,
+                    headers: {
+                        'accept': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                const appRoles = [];
+                // flatten the app roles found
+                const appRolesFound = [];
+                for (const servicePrincipal of res.value) {
+                    for (const role of servicePrincipal.appRoles) {
+                        appRolesFound.push({
+                            resourceId: servicePrincipal.id,
+                            objectId: role.id,
+                            value: role.value
+                        });
+                    }
+                }
+                if (!appRolesFound.length) {
+                    throw `The resource '${args.options.resource}' does not have any application permissions available.`;
+                }
+                // search for match between the found app roles and the specified scope option value
+                for (const scope of args.options.scope.split(',')) {
+                    const existingRoles = appRolesFound.filter((role) => {
+                        return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                     });
+                    if (!existingRoles.length) {
+                        // the role specified in the scope option does not belong to the found service principles
+                        // throw an error and show list with available roles (scopes)
+                        let availableRoles = '';
+                        appRolesFound.map((r) => availableRoles += `${os.EOL}${r.value}`);
+                        throw `The scope value '${scope}' you have specified does not exist for ${args.options.resource}. ${os.EOL}Available scopes (application permissions) are: ${availableRoles}`;
+                    }
+                    appRoles.push(existingRoles[0]);
                 }
-            }
-            if (!appRolesFound.length) {
-                return Promise.reject(`The resource '${args.options.resource}' does not have any application permissions available.`);
-            }
-            // search for match between the found app roles and the specified scope option value
-            for (const scope of args.options.scope.split(',')) {
-                const existingRoles = appRolesFound.filter((role) => {
-                    return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
-                });
-                if (!existingRoles.length) {
-                    // the role specified in the scope option does not belong to the found service principles
-                    // throw an error and show list with available roles (scopes)
-                    let availableRoles = '';
-                    appRolesFound.map((r) => availableRoles += `${os.EOL}${r.value}`);
-                    return Promise.reject(`The scope value '${scope}' you have specified does not exist for ${args.options.resource}. ${os.EOL}Available scopes (application permissions) are: ${availableRoles}`);
+                const tasks = [];
+                for (const appRole of appRoles) {
+                    tasks.push(this.addRoleToServicePrincipal(objectId, appRole));
+                }
+                const rolesAddedResponse = yield Promise.all(tasks);
+                if (args.options.output && args.options.output.toLowerCase() === 'json') {
+                    logger.log(rolesAddedResponse);
+                }
+                else {
+                    logger.log(rolesAddedResponse.map((result) => ({
+                        objectId: result.id,
+                        principalDisplayName: result.principalDisplayName,
+                        resourceDisplayName: result.resourceDisplayName
+                    })));
                 }
-                result.push(existingRoles[0]);
-            }
-            return Promise.resolve(result);
-        })
-            .then((appRoles) => {
-            const tasks = [];
-            for (const appRole of appRoles) {
-                tasks.push(this.addRoleToServicePrincipal(objectId, appRole));
-            }
-            return Promise.all(tasks);
-        })
-            .then((rolesAddedResponse) => {
-            if (args.options.output && args.options.output.toLowerCase() === 'json') {
-                logger.log(rolesAddedResponse);
             }
-            else {
-                logger.log(rolesAddedResponse.map((result) => ({
-                    objectId: result.id,
-                    principalDisplayName: result.principalDisplayName,
-                    resourceDisplayName: result.resourceDisplayName
-                })));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     addRoleToServicePrincipal(objectId, appRole) {
         const requestOptions = {
@@ -140,44 +152,40 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
         };
         return request_1.default.post(requestOptions);
     }
-    options() {
-        const options = [
-            {
-                option: '--appId [appId]'
-            },
-            {
-                option: '--objectId [objectId]'
-            },
-            {
-                option: '--displayName [displayName]'
-            },
-            {
-                option: '-r, --resource <resource>',
-                autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
-            },
-            {
-                option: '-s, --scope <scope>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, objectId or displayName';
-        }
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+}
+_AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignmentAddCommand_initTelemetry = function _AadAppRoleAssignmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined'
+        });
+    });
+}, _AadAppRoleAssignmentAddCommand_initOptions = function _AadAppRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--appId [appId]'
+    }, {
+        option: '--appObjectId [appObjectId]'
+    }, {
+        option: '--appDisplayName [appDisplayName]'
+    }, {
+        option: '-r, --resource <resource>',
+        autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
+    }, {
+        option: '-s, --scope <scope>'
+    });
+}, _AadAppRoleAssignmentAddCommand_initValidators = function _AadAppRoleAssignmentAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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)) {
-            return `${args.options.objectId} is not a valid GUID`;
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _AadAppRoleAssignmentAddCommand_initOptionSets = function _AadAppRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
+};
 module.exports = new AadAppRoleAssignmentAddCommand();
 //# sourceMappingURL=approleassignment-add.js.map