@pnp/cli-microsoft365 5.0.0-beta.aff293c → 5.0.0-beta.c4100fe

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

@@ -0,0 +1,142 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadAppGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.APP_GET;
+    }
+    get description() {
+        return 'Gets an 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';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getAppObjectId(args)
+            .then(appObjectId => this.getAppInfo(appObjectId))
+            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getAppObjectId(args) {
+        if (args.options.objectId) {
+            return Promise.resolve(args.options.objectId);
+        }
+        const { appId, name } = args.options;
+        const filter = appId ?
+            `appId eq '${encodeURIComponent(appId)}'` :
+            `displayName eq '${encodeURIComponent(name)}'`;
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0].id);
+            }
+            if (res.value.length === 0) {
+                const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
+                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+            }
+            return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
+        });
+    }
+    getAppInfo(appObjectId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions);
+    }
+    saveAppInfo(args, appInfo, logger) {
+        if (!args.options.save) {
+            return Promise.resolve(appInfo);
+        }
+        const filePath = '.m365rc.json';
+        if (this.verbose) {
+            logger.logToStderr(`Saving Azure AD app registration information to the ${filePath} file...`);
+        }
+        let m365rc = {};
+        if (fs.existsSync(filePath)) {
+            if (this.debug) {
+                logger.logToStderr(`Reading existing ${filePath}...`);
+            }
+            try {
+                const fileContents = fs.readFileSync(filePath, 'utf8');
+                if (fileContents) {
+                    m365rc = JSON.parse(fileContents);
+                }
+            }
+            catch (e) {
+                logger.logToStderr(`Error reading ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
+                return Promise.resolve(appInfo);
+            }
+        }
+        if (!m365rc.apps) {
+            m365rc.apps = [];
+        }
+        if (!m365rc.apps.some(a => a.appId === appInfo.appId)) {
+            m365rc.apps.push({
+                appId: appInfo.appId,
+                name: appInfo.displayName
+            });
+            try {
+                fs.writeFileSync(filePath, JSON.stringify(m365rc, null, 2));
+            }
+            catch (e) {
+                logger.logToStderr(`Error writing ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
+            }
+        }
+        return Promise.resolve(appInfo);
+    }
+    options() {
+        const options = [
+            { option: '--appId [appId]' },
+            { option: '--objectId [objectId]' },
+            { option: '--name [name]' },
+            { option: '--save' }
+        ];
+        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';
+        }
+        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+            return `${args.options.objectId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadAppGetCommand();
+//# sourceMappingURL=app-get.js.map

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

@@ -15,6 +15,9 @@ class AadAppSetCommand extends GraphCommand_1.default {
         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';
         return telemetryProps;
     }
@@ -22,6 +25,7 @@ class AadAppSetCommand extends GraphCommand_1.default {
         this
             .getAppObjectId(args, logger)
             .then(objectId => this.configureUri(args, objectId, logger))
+            .then(objectId => this.configureRedirectUris(args, objectId, logger))
             .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
     getAppObjectId(args, logger) {
@@ -57,7 +61,7 @@ class AadAppSetCommand extends GraphCommand_1.default {
     }
     configureUri(args, objectId, logger) {
         if (!args.options.uri) {
-            return Promise.resolve();
+            return Promise.resolve(objectId);
         }
         if (this.verbose) {
             logger.logToStderr(`Configuring Azure AD application ID URI...`);
@@ -73,14 +77,97 @@ class AadAppSetCommand extends GraphCommand_1.default {
             responseType: 'json',
             data: applicationInfo
         };
-        return request_1.default.patch(requestOptions);
+        return request_1.default
+            .patch(requestOptions)
+            .then(_ => Promise.resolve(objectId));
+    }
+    configureRedirectUris(args, objectId, logger) {
+        if (!args.options.redirectUris && !args.options.redirectUrisToRemove) {
+            return Promise.resolve(objectId);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Configuring Azure AD application redirect URIs...`);
+        }
+        const getAppRequestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(getAppRequestOptions)
+            .then((application) => {
+            const publicClientRedirectUris = application.publicClient.redirectUris;
+            const spaRedirectUris = application.spa.redirectUris;
+            const webRedirectUris = application.web.redirectUris;
+            // start with existing redirect URIs
+            const applicationPatch = {
+                publicClient: {
+                    redirectUris: publicClientRedirectUris
+                },
+                spa: {
+                    redirectUris: spaRedirectUris
+                },
+                web: {
+                    redirectUris: webRedirectUris
+                }
+            };
+            if (args.options.redirectUrisToRemove) {
+                // remove redirect URIs from all platforms
+                const redirectUrisToRemove = args.options.redirectUrisToRemove
+                    .split(',')
+                    .map(u => u.trim());
+                applicationPatch.publicClient.redirectUris =
+                    publicClientRedirectUris.filter(u => !redirectUrisToRemove.includes(u));
+                applicationPatch.spa.redirectUris =
+                    spaRedirectUris.filter(u => !redirectUrisToRemove.includes(u));
+                applicationPatch.web.redirectUris =
+                    webRedirectUris.filter(u => !redirectUrisToRemove.includes(u));
+            }
+            if (args.options.redirectUris) {
+                const urlsToAdd = args.options.redirectUris
+                    .split(',')
+                    .map(u => u.trim());
+                // add new redirect URIs. If the URI is already present, it will be ignored
+                switch (args.options.platform) {
+                    case 'spa':
+                        applicationPatch.spa.redirectUris
+                            .push(...urlsToAdd.filter(u => !spaRedirectUris.includes(u)));
+                        break;
+                    case 'publicClient':
+                        applicationPatch.publicClient.redirectUris
+                            .push(...urlsToAdd.filter(u => !publicClientRedirectUris.includes(u)));
+                        break;
+                    case 'web':
+                        applicationPatch.web.redirectUris
+                            .push(...urlsToAdd.filter(u => !webRedirectUris.includes(u)));
+                }
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: applicationPatch
+            };
+            return request_1.default.patch(requestOptions);
+        })
+            .then(_ => Promise.resolve(objectId));
     }
     options() {
         const options = [
             { option: '--appId [appId]' },
             { option: '--objectId [objectId]' },
             { option: '-n, --name [name]' },
-            { option: '-u, --uri [uri]' }
+            { option: '-u, --uri [uri]' },
+            { option: '-r, --redirectUris [redirectUris]' },
+            {
+                option: '--platform [platform]',
+                autocomplete: AadAppSetCommand.aadApplicationPlatform
+            },
+            { option: '--redirectUrisToRemove [redirectUrisToRemove]' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
@@ -96,8 +183,16 @@ class AadAppSetCommand extends GraphCommand_1.default {
             (args.options.objectId && args.options.name)) {
             return 'Specify either appId, objectId or name but not both';
         }
+        if (args.options.redirectUris && !args.options.platform) {
+            return `When you specify redirectUris you also need to specify platform`;
+        }
+        if (args.options.platform &&
+            AadAppSetCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
+            return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppSetCommand.aadApplicationPlatform.join(', ')}`;
+        }
         return true;
     }
 }
+AadAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 module.exports = new AadAppSetCommand();
 //# sourceMappingURL=app-set.js.map

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

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class AadGroupListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.GROUP_LIST;
+    }
+    get description() {
+        return 'Lists all groups defined in Azure Active Directory.';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.deleted = args.options.deleted;
+        return telemetryProps;
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'groupType'];
+    }
+    commandAction(logger, args, cb) {
+        const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
+        this
+            .getAllItems(`${this.resource}/v1.0/${endpoint}`, logger, true)
+            .then(() => {
+            if (args.options.output === 'text') {
+                this.items.forEach((group) => {
+                    if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
+                        group.groupType = 'Microsoft 365';
+                    }
+                    else if (group.mailEnabled && group.securityEnabled) {
+                        group.groupType = 'Mail enabled security';
+                    }
+                    else if (group.securityEnabled) {
+                        group.groupType = 'Security';
+                    }
+                    else if (group.mailEnabled) {
+                        group.groupType = 'Distribution';
+                    }
+                });
+            }
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            { option: '-d, --deleted' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new AadGroupListCommand();
+//# sourceMappingURL=group-list.js.map

package/dist/m365/aad/commands/o365group/{GroupUser.js → GroupExtended.js}

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

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

@@ -5,6 +5,7 @@ const path = require("path");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const Utils_1 = require("../../../../Utils");
 class AadO365GroupAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_ADD;
@@ -14,6 +15,8 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let group;
+        let ownerIds = [];
+        let memberIds = [];
         if (this.verbose) {
             logger.logToStderr(`Creating Microsoft 365 Group...`);
         }
@@ -35,8 +38,16 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                 visibility: args.options.isPrivate === 'true' ? 'Private' : 'Public'
             }
         };
-        request_1.default
-            .post(requestOptions)
+        this
+            .getUserIds(logger, args.options.owners)
+            .then((ownerIdsRes) => {
+            ownerIds = ownerIdsRes;
+            return this.getUserIds(logger, args.options.members);
+        })
+            .then((memberIdsRes) => {
+            memberIds = memberIdsRes;
+            return request_1.default.post(requestOptions);
+        })
             .then((res) => {
             group = res;
             if (!args.options.logoPath) {
@@ -61,72 +72,32 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
             });
         })
             .then(() => {
-            if (!args.options.owners) {
-                if (this.debug) {
-                    logger.logToStderr('Owners not set. Skipping');
-                }
-                return Promise.resolve(undefined);
-            }
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group owners...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            if (ownerIds.length === 0) {
+                return Promise.resolve([]);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
+            return Promise.all(ownerIds.map(ownerId => request_1.default.post({
                 url: `${this.resource}/v1.0/groups/${group.id}/owners/$ref`,
                 headers: {
                     'content-type': 'application/json'
                 },
                 responseType: 'json',
                 data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${ownerId}`
                 }
             })));
         })
             .then(() => {
-            if (!args.options.members) {
-                if (this.debug) {
-                    logger.logToStderr('Members not set. Skipping');
-                }
-                return Promise.resolve(undefined);
-            }
-            const members = args.options.members.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group members...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            if (memberIds.length === 0) {
+                return Promise.resolve([]);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
+            return Promise.all(memberIds.map(memberId => request_1.default.post({
                 url: `${this.resource}/v1.0/groups/${group.id}/members/$ref`,
                 headers: {
                     'content-type': 'application/json'
                 },
                 responseType: 'json',
                 data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${memberId}`
                 }
             })));
         })
@@ -135,6 +106,41 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
+    getUserIds(logger, users) {
+        if (!users) {
+            if (this.debug) {
+                logger.logToStderr('No users to validate, skipping.');
+            }
+            return Promise.resolve([]);
+        }
+        if (this.verbose) {
+            logger.logToStderr('Retrieving user information.');
+        }
+        const userArr = users.split(',').map(o => o.trim());
+        let promises = [];
+        let userIds = [];
+        promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise.all(promises).then((usersRes) => {
+            let userUpns = [];
+            userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with group creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
     setGroupLogo(requestOptions, retryLeft, resolve, reject, logger) {
         request_1.default
             .put(requestOptions)

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

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Utils_1 = require("../../../../Utils");
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class AadO365GroupConversationListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.O365GROUP_CONVERSATION_LIST;
+    }
+    get description() {
+        return 'Lists conversations for the specified Microsoft 365 group';
+    }
+    defaultProperties() {
+        return ['topic', 'lastDeliveredDateTime', 'id'];
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --groupId <groupId>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!Utils_1.default.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadO365GroupConversationListCommand();
+//# sourceMappingURL=o365group-conversation-list.js.map

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

@@ -37,14 +37,14 @@ class AadO365GroupUserSetCommand extends GraphItemsListCommand_1.GraphItemsListC
                 logger.logToStderr(this.items);
                 logger.logToStderr('');
             }
-            if (this.items.filter(i => i.userPrincipalName.toLocaleLowerCase() === args.options.userName.toLocaleLowerCase()).length <= 0) {
+            if (this.items.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
                 const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
                     'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
                     'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
                 throw new Error(userNotInGroup);
             }
             if (args.options.role === "Owner") {
-                const foundMember = this.items.find(e => e.userPrincipalName.toLocaleLowerCase() === args.options.userName.toLocaleLowerCase() && e.userType === 'Member');
+                const foundMember = this.items.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
                 if (foundMember !== undefined) {
                     const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
                     const requestOptions = {
@@ -65,7 +65,7 @@ class AadO365GroupUserSetCommand extends GraphItemsListCommand_1.GraphItemsListC
                 }
             }
             else {
-                const foundOwner = this.items.find(e => e.userPrincipalName.toLocaleLowerCase() === args.options.userName.toLocaleLowerCase() && e.userType === 'Owner');
+                const foundOwner = this.items.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
                 if (foundOwner !== undefined) {
                     const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
                     const requestOptions = {

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
-const AadCommand_1 = require("../../../base/AadCommand");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadOAuth2GrantAddCommand extends AadCommand_1.default {
+class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.OAUTH2GRANT_ADD;
     }
@@ -16,20 +16,17 @@ class AadOAuth2GrantAddCommand extends AadCommand_1.default {
             logger.logToStderr(`Granting the service principal specified permissions...`);
         }
         const requestOptions = {
-            url: `${this.resource}/myorganization/oauth2PermissionGrants?api-version=1.6`,
+            url: `${this.resource}/v1.0/oauth2PermissionGrants`,
             headers: {
-                'content-type': 'application/json'
+                'content-type': 'application/json;odata.metadata=none'
             },
             responseType: 'json',
             data: {
-                "odata.type": "Microsoft.DirectoryServices.OAuth2PermissionGrant",
                 "clientId": args.options.clientId,
                 "consentType": "AllPrincipals",
                 "principalId": null,
                 "resourceId": args.options.resourceId,
-                "scope": args.options.scope,
-                "startTime": "0001-01-01T00:00:00",
-                "expiryTime": "9000-01-01T00:00:00"
+                "scope": args.options.scope
             }
         };
         request_1.default

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
-const AadCommand_1 = require("../../../base/AadCommand");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadOAuth2GrantListCommand extends AadCommand_1.default {
+class AadOAuth2GrantListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.OAUTH2GRANT_LIST;
     }
@@ -19,9 +19,9 @@ class AadOAuth2GrantListCommand extends AadCommand_1.default {
             logger.logToStderr(`Retrieving list of OAuth grants for the service principal...`);
         }
         const requestOptions = {
-            url: `${this.resource}/myorganization/oauth2PermissionGrants?api-version=1.6&$filter=clientId eq '${encodeURIComponent(args.options.clientId)}'`,
+            url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${encodeURIComponent(args.options.spObjectId)}'`,
             headers: {
-                accept: 'application/json;odata=nometadata'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
@@ -37,15 +37,15 @@ class AadOAuth2GrantListCommand extends AadCommand_1.default {
     options() {
         const options = [
             {
-                option: '-i, --clientId <clientId>'
+                option: '-i, --spObjectId <spObjectId>'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.clientId)) {
-            return `${args.options.clientId} is not a valid GUID`;
+        if (!Utils_1.default.isValidGuid(args.options.spObjectId)) {
+            return `${args.options.spObjectId} is not a valid GUID`;
         }
         return true;
     }