@pnp/cli-microsoft365 5.2.0 → 5.3.0-beta.4033f50

package/.eslintrc.js

@@ -29,6 +29,7 @@ const dictionary = [
   'home',
   'hub',
   'in',
+  'inheritance',
   'init',
   'install',
   'installed',

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

@@ -325,7 +325,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
             logger.logToStderr('Resolving requested APIs...');
         }
         return utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=servicePrincipalNames,appId,oauth2PermissionScopes,appRoles`, logger)
+            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=servicePrincipalNames,appId,oauth2PermissionScopes,appRoles`)
             .then(servicePrincipals => {
             try {
                 const resolvedApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisDelegated, 'Scope', logger);

package/dist/m365/aad/commands/app/app-role-list.js

@@ -24,7 +24,7 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
     commandAction(logger, args, cb) {
         this
             .getAppObjectId(args, logger)
-            .then(objectId => utils_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`, logger))
+            .then(objectId => utils_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`))
             .then(appRoles => {
             logger.log(appRoles);
             cb();

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

@@ -22,29 +22,14 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
         return ['resourceDisplayName', 'roleName'];
     }
     commandAction(logger, args, cb) {
-        let sp;
-        // get the service principal associated with the appId
-        let spMatchQuery = '';
-        if (args.options.appId) {
-            spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
-        }
-        else if (args.options.objectId) {
-            spMatchQuery = `id eq '${encodeURIComponent(args.options.objectId)}'`;
-        }
-        else {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
-        }
-        this
-            .getServicePrincipalForApp(spMatchQuery)
-            .then((resp) => {
-            if (!resp.value.length) {
-                return Promise.reject('app registration not found');
-            }
-            sp = resp.value[0];
+        let spAppRoleAssignments;
+        this.getAppRoleAssignments(args.options)
+            .then((appRoleAssignments) => {
+            spAppRoleAssignments = appRoleAssignments;
             // the role assignment has an appRoleId but no name. To get the name,
             // we need to get all the roles from the resource. the resource is
             // a service principal. Multiple roles may have same resource id.
-            const resourceIds = sp.appRoleAssignments.map((item) => item.resourceId);
+            const resourceIds = appRoleAssignments.map((item) => item.resourceId);
             const tasks = [];
             for (let i = 0; i < resourceIds.length; i++) {
                 tasks.push(this.getServicePrincipal(resourceIds[i]));
@@ -55,7 +40,7 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
             // loop through all appRoleAssignments for the servicePrincipal
             // and lookup the appRole.Id in the resources[resourceId].appRoles array...
             const results = [];
-            sp.appRoleAssignments.map((appRoleAssignment) => {
+            spAppRoleAssignments.map((appRoleAssignment) => {
                 const resource = resources.find((r) => r.id === appRoleAssignment.resourceId);
                 if (resource) {
                     const appRole = resource.appRoles.find((r) => r.id === appRoleAssignment.appRoleId);
@@ -65,7 +50,9 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
                             resourceDisplayName: appRoleAssignment.resourceDisplayName,
                             resourceId: appRoleAssignment.resourceId,
                             roleId: appRole.id,
-                            roleName: appRole.value
+                            roleName: appRole.value,
+                            created: appRoleAssignment.createdDateTime,
+                            deleted: appRoleAssignment.deletedDateTime
                         });
                     }
                 }
@@ -74,6 +61,52 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    getAppRoleAssignments(argOptions) {
+        return new Promise((resolve, reject) => {
+            if (argOptions.objectId) {
+                this.getSPAppRoleAssignments(argOptions.objectId)
+                    .then((spAppRoleAssignments) => {
+                    if (!spAppRoleAssignments.value.length) {
+                        reject('no app role assignments found');
+                    }
+                    resolve(spAppRoleAssignments.value);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+            else {
+                // Use existing way to get service principal object
+                let spMatchQuery = '';
+                if (argOptions.appId) {
+                    spMatchQuery = `appId eq '${encodeURIComponent(argOptions.appId)}'`;
+                }
+                else {
+                    spMatchQuery = `displayName eq '${encodeURIComponent(argOptions.displayName)}'`;
+                }
+                this.getServicePrincipalForApp(spMatchQuery)
+                    .then((resp) => {
+                    if (!resp.value.length) {
+                        reject('app registration not found');
+                    }
+                    resolve(resp.value[0].appRoleAssignments);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+        });
+    }
+    getSPAppRoleAssignments(spId) {
+        const spRequestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals/${spId}/appRoleAssignments`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(spRequestOptions);
+    }
     getServicePrincipalForApp(filterParam) {
         const spRequestOptions = {
             url: `${this.resource}/v1.0/servicePrincipals?$expand=appRoleAssignments&$filter=${filterParam}`,

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

@@ -21,7 +21,7 @@ class AadGroupListCommand extends GraphCommand_1.default {
     commandAction(logger, args, cb) {
         const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
         utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/${endpoint}`, logger)
+            .getAllItems(`${this.resource}/v1.0/${endpoint}`)
             .then((groups) => {
             if (args.options.output === 'text') {
                 groups.forEach((group) => {

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

@@ -15,7 +15,7 @@ class AadGroupSettingListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groupSettings`, logger)
+            .getAllItems(`${this.resource}/v1.0/groupSettings`)
             .then((groupSettings) => {
             logger.log(groupSettings);
             cb();

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-get.js

@@ -19,7 +19,7 @@ class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`, logger)
+            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`)
             .then((templates) => {
             const groupSettingTemplate = templates.filter(t => args.options.id ? t.id === args.options.id : t.displayName === args.options.displayName);
             if (groupSettingTemplate && groupSettingTemplate.length > 0) {

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

@@ -15,7 +15,7 @@ class AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`, logger)
+            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`)
             .then((templates) => {
             logger.log(templates);
             cb();

package/dist/m365/aad/commands/o365group/o365group-conversation-list.js

@@ -15,7 +15,7 @@ class AadO365GroupConversationListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`, logger)
+            .getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`)
             .then((conversations) => {
             logger.log(conversations);
             cb();

package/dist/m365/aad/commands/o365group/o365group-conversation-post-list.js

@@ -24,7 +24,7 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
         this
             .getGroupId(args)
             .then((retrievedgroupId) => {
-            return utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`, logger);
+            return utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
         })
             .then((posts) => {
             logger.log(posts);

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

@@ -35,7 +35,7 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
         }
         let groups = [];
         utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then((_groups) => {
             groups = _groups;
             if (args.options.orphaned) {

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

@@ -19,7 +19,7 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const clearO365GroupRecycleBinItems = () => {
-            this.processRecycleBinItemsClear(logger).then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            this.processRecycleBinItemsClear().then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
         };
         if (args.options.confirm) {
             clearO365GroupRecycleBinItems();
@@ -40,12 +40,12 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
             });
         }
     }
-    processRecycleBinItemsClear(logger) {
+    processRecycleBinItemsClear() {
         const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${topCount}`;
         return utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then((recycleBinItems) => {
             if (recycleBinItems.length === 0) {
                 return Promise.resolve();

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

@@ -26,7 +26,7 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
         utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then((recycleBinItems) => {
             logger.log(recycleBinItems);
             cb();

package/dist/m365/aad/commands/o365group/o365group-user-list.js

@@ -38,7 +38,7 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
         return utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then(users => {
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
@@ -50,7 +50,7 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint, logger);
+        return utils_1.odata.getAllItems(endpoint);
     }
     options() {
         const options = [

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

@@ -92,7 +92,7 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
         return utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then(users => {
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
@@ -104,7 +104,7 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint, logger);
+        return utils_1.odata.getAllItems(endpoint);
     }
     options() {
         const options = [

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

@@ -27,7 +27,7 @@ class AadUserListCommand extends GraphCommand_1.default {
         const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
         const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
         utils_1.odata
-            .getAllItems(url, logger)
+            .getAllItems(url)
             .then((users) => {
             logger.log(users);
             cb();

package/dist/m365/aad/commands/user/user-signin-list.js

@@ -37,7 +37,7 @@ class AadUserSigninListCommand extends GraphCommand_1.default {
         }
         endpoint += filter;
         utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then((signins) => {
             logger.log(signins);
             cb();

package/dist/m365/aad/commands.js

@@ -6,11 +6,11 @@ exports.default = {
     APP_DELETE: `${prefix} app delete`,
     APP_GET: `${prefix} app get`,
     APP_REMOVE: `${prefix} app remove`,
-    APP_SET: `${prefix} app set`,
     APP_ROLE_ADD: `${prefix} app role add`,
     APP_ROLE_DELETE: `${prefix} app role delete`,
     APP_ROLE_LIST: `${prefix} app role list`,
     APP_ROLE_REMOVE: `${prefix} app role remove`,
+    APP_SET: `${prefix} app set`,
     APPROLEASSIGNMENT_ADD: `${prefix} approleassignment add`,
     APPROLEASSIGNMENT_LIST: `${prefix} approleassignment list`,
     APPROLEASSIGNMENT_REMOVE: `${prefix} approleassignment remove`,

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

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../cli");
+const validation_1 = require("../../../utils/validation");
+const settingsNames_1 = require("../../../settingsNames");
+const AppCommand_1 = require("../../base/AppCommand");
+const commands_1 = require("../commands");
+class AppOpenCommand extends AppCommand_1.default {
+    get name() {
+        return commands_1.default.OPEN;
+    }
+    get description() {
+        return 'Opens Azure AD app in the Azure AD portal';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.appId = typeof args.options.appId !== 'undefined';
+        telemetryProps.preview = typeof args.options.preview !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this.logOrOpenUrl(args, logger)
+            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    }
+    logOrOpenUrl(args, logger) {
+        return new Promise((resolve, reject) => {
+            const previewPrefix = args.options.preview === true ? "preview." : "";
+            const url = `https://${previewPrefix}portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/${this.appId}/isMSAApp/`;
+            if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
+                logger.log(`Use a web browser to open the page ${url}`);
+                return resolve();
+            }
+            logger.log(`Opening the following page in your browser: ${url}`);
+            // 'open' is required here so we can lazy load the dependency.
+            // _open is never set before hitting this line, but this check
+            // is implemented so that we can stub it when testing.
+            /* c8 ignore next 3 */
+            if (!this._open) {
+                this._open = require('open');
+            }
+            this._open(url).then(() => {
+                resolve();
+            }, (error) => {
+                reject(error);
+            });
+        });
+    }
+    options() {
+        const options = [
+            { option: '--appId [appId]' },
+            { option: '--preview' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AppOpenCommand();
+//# sourceMappingURL=app-open.js.map

package/dist/m365/app/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'app';
 exports.default = {
     GET: `${prefix} get`,
+    OPEN: `${prefix} open`,
     PERMISSION_LIST: `${prefix} permission list`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -156,7 +156,7 @@ class FileListCommand extends GraphCommand_1.default {
             .all(folderIds.map((folderId) => 
         // get items from folder. Because we can't filter out folders here
         // we need to get all items from the folder and filter them out later
-        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`, logger)))
+        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
             .then(res => {
             // flatten data from all promises
             files = files.concat(...res);

package/dist/m365/outlook/commands/message/message-list.js

@@ -27,7 +27,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
             .getFolderId(args)
             .then((folderId) => {
             const url = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';
-            return utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`, logger);
+            return utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
         })
             .then((messages) => {
             logger.log(messages);

package/dist/m365/outlook/commands/room/room-list.js

@@ -24,7 +24,7 @@ class OutlookRoomListCommand extends GraphCommand_1.default {
             endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
         }
         utils_1.odata
-            .getAllItems(endpoint, logger)
+            .getAllItems(endpoint)
             .then((rooms) => {
             logger.log(rooms);
             cb();

package/dist/m365/outlook/commands/roomlist/roomlist-list.js

@@ -15,7 +15,7 @@ class OutlookRoomListListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`, logger)
+            .getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`)
             .then((roomLists) => {
             logger.log(roomLists);
             cb();

package/dist/m365/planner/commands/bucket/bucket-add.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerBucketAddCommand extends GraphCommand_1.default {
@@ -24,6 +26,10 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         return ['id', 'name', 'planId', 'orderHint'];
     }
     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
             .getPlanId(args)
             .then((planId) => {
@@ -52,22 +58,8 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         }
         return this
             .getGroupId(args)
-            .then((groupId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        }).then((response) => {
-            const plan = response.value.find(val => val.title === args.options.planName);
-            if (!plan) {
-                return Promise.reject(`The specified plan does not exist`);
-            }
-            return Promise.resolve(plan.id);
-        });
+            .then(groupId => planner_1.planner.getPlanByName(args.options.planName, groupId))
+            .then(plan => plan.id);
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {