@pnp/cli-microsoft365 6.9.0-beta.bb31388 → 6.9.0-beta.d0c3c93

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

@@ -49,78 +49,77 @@ class AadAppSetCommand extends GraphCommand_1.default {
         });
     }
     getAppObjectId(args, logger) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
-        }
-        const { appId, name } = args.options;
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
-        }
-        const filter = appId ?
-            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting_1.formatting.encodeQueryParameter(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) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.objectId) {
+                return args.options.objectId;
+            }
+            const { appId, name } = args.options;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
+            }
+            const filter = appId ?
+                `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+                `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return 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`);
+                throw `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(', ')}`);
+            throw `Multiple Azure AD application registration with name ${name} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
         });
     }
     configureUri(args, objectId, logger) {
-        if (!args.options.uri) {
-            return Promise.resolve(objectId);
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Configuring Azure AD application ID URI...`);
-        }
-        const identifierUris = args.options.uri
-            .split(',')
-            .map(u => u.trim());
-        const applicationInfo = {
-            identifierUris: identifierUris
-        };
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
-            headers: {
-                'content-type': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: applicationInfo
-        };
-        return request_1.default
-            .patch(requestOptions)
-            .then(_ => Promise.resolve(objectId));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.uri) {
+                return objectId;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Configuring Azure AD application ID URI...`);
+            }
+            const identifierUris = args.options.uri
+                .split(',')
+                .map(u => u.trim());
+            const applicationInfo = {
+                identifierUris: identifierUris
+            };
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: applicationInfo
+            };
+            yield request_1.default.patch(requestOptions);
+            return 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) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.redirectUris && !args.options.redirectUrisToRemove) {
+                return 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'
+            };
+            const application = yield request_1.default.get(getAppRequestOptions);
             const publicClientRedirectUris = application.publicClient.redirectUris;
             const spaRedirectUris = application.spa.redirectUris;
             const webRedirectUris = application.web.redirectUris;
@@ -175,21 +174,20 @@ class AadAppSetCommand extends GraphCommand_1.default {
                 responseType: 'json',
                 data: applicationPatch
             };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => Promise.resolve(objectId));
+            yield request_1.default.patch(requestOptions);
+            return objectId;
+        });
     }
     configureCertificate(args, objectId, logger) {
-        if (!args.options.certificateFile && !args.options.certificateBase64Encoded) {
-            return Promise.resolve();
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Setting certificate for Azure AD app...`);
-        }
-        const certificateBase64Encoded = this.getCertificateBase64Encoded(args, logger);
-        return this
-            .getCurrentKeyCredentialsList(args, objectId, certificateBase64Encoded, logger)
-            .then(currentKeyCredentials => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.certificateFile && !args.options.certificateBase64Encoded) {
+                return;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Setting certificate for Azure AD app...`);
+            }
+            const certificateBase64Encoded = this.getCertificateBase64Encoded(args, logger);
+            const currentKeyCredentials = yield this.getCurrentKeyCredentialsList(args, objectId, certificateBase64Encoded, logger);
             if (this.verbose) {
                 logger.logToStderr(`Adding new keyCredential to list`);
             }
@@ -203,9 +201,8 @@ class AadAppSetCommand extends GraphCommand_1.default {
                 key: certificateBase64Encoded
             };
             keyCredentials.push(newKeyCredential);
-            return Promise.resolve(keyCredentials);
-        })
-            .then(keyCredentials => this.updateKeyCredentials(objectId, keyCredentials, logger));
+            return this.updateKeyCredentials(objectId, keyCredentials, logger);
+        });
     }
     getCertificateBase64Encoded(args, logger) {
         if (args.options.certificateBase64Encoded) {
@@ -223,35 +220,38 @@ class AadAppSetCommand extends GraphCommand_1.default {
     }
     // We first retrieve existing certificates because we need to specify the full list of certificates when updating the app.
     getCurrentKeyCredentialsList(args, objectId, certificateBase64Encoded, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving current keyCredentials list for app`);
-        }
-        const getAppRequestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${objectId}?$select=keyCredentials`,
-            headers: {
-                'content-type': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(getAppRequestOptions).then((application) => {
-            return Promise.resolve(application.keyCredentials || []);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving current keyCredentials list for app`);
+            }
+            const getAppRequestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${objectId}?$select=keyCredentials`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const application = yield request_1.default.get(getAppRequestOptions);
+            return application.keyCredentials || [];
         });
     }
     updateKeyCredentials(objectId, keyCredentials, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Updating keyCredentials in AAD app`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
-            headers: {
-                'content-type': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                keyCredentials: keyCredentials
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Updating keyCredentials in AAD app`);
             }
-        };
-        return request_1.default.patch(requestOptions);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    keyCredentials: keyCredentials
+                }
+            };
+            return request_1.default.patch(requestOptions);
+        });
     }
 }
 _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = function _AadAppSetCommand_initTelemetry() {

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

@@ -59,7 +59,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
             try {
                 const servicePrincipalResult = yield request_1.default.get(getServicePrinciplesRequestOptions);
                 if (servicePrincipalResult.value.length === 0) {
-                    return Promise.reject(`The specified service principal doesn't exist`);
+                    throw `The specified service principal doesn't exist`;
                 }
                 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.';
@@ -142,19 +142,21 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
         });
     }
     addRoleToServicePrincipal(objectId, appRole) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals/${objectId}/appRoleAssignments`,
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            responseType: 'json',
-            data: {
-                appRoleId: appRole.objectId,
-                principalId: objectId,
-                resourceId: appRole.resourceId
-            }
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals/${objectId}/appRoleAssignments`,
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    appRoleId: appRole.objectId,
+                    principalId: objectId,
+                    resourceId: appRole.resourceId
+                }
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
 }
 _AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignmentAddCommand_initTelemetry = function _AadAppRoleAssignmentAddCommand_initTelemetry() {

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

@@ -79,70 +79,61 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
         });
     }
     getAppRoleAssignments(argOptions) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (argOptions.appObjectId) {
-                this.getSPAppRoleAssignments(argOptions.appObjectId)
-                    .then((spAppRoleAssignments) => {
-                    if (!spAppRoleAssignments.value.length) {
-                        reject('no app role assignments found');
-                    }
-                    resolve(spAppRoleAssignments.value);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                const spAppRoleAssignments = yield this.getSPAppRoleAssignments(argOptions.appObjectId);
+                if (!spAppRoleAssignments.value.length) {
+                    throw 'no app role assignments found';
+                }
+                return spAppRoleAssignments.value;
             }
             else {
-                // Use existing way to get service principal object
-                let spMatchQuery = '';
-                if (argOptions.appId) {
-                    spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appId)}'`;
+                const spMatchQuery = argOptions.appId
+                    ? `appId eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appId)}'`
+                    : `displayName eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appDisplayName)}'`;
+                const resp = yield this.getServicePrincipalForApp(spMatchQuery);
+                if (!resp.value.length) {
+                    throw 'app registration not found';
                 }
-                else {
-                    spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appDisplayName)}'`;
-                }
-                this.getServicePrincipalForApp(spMatchQuery)
-                    .then((resp) => {
-                    if (!resp.value.length) {
-                        reject('app registration not found');
-                    }
-                    resolve(resp.value[0].appRoleAssignments);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                return resp.value[0].appRoleAssignments;
             }
         });
     }
     getSPAppRoleAssignments(spId) {
-        const spRequestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals/${spId}/appRoleAssignments`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(spRequestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            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}`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(spRequestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const spRequestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals?$expand=appRoleAssignments&$filter=${filterParam}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(spRequestOptions);
+        });
     }
     getServicePrincipal(spId) {
-        const spRequestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals/${spId}`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(spRequestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const spRequestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals/${spId}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(spRequestOptions);
+        });
     }
 }
 _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmentListCommand_initTelemetry = function _AadAppRoleAssignmentListCommand_initTelemetry() {

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

@@ -136,24 +136,28 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
         });
     }
     getServicePrincipalForApp(filterParam) {
-        const spRequestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals?$expand=appRoleAssignments&$filter=${filterParam}`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(spRequestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const spRequestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals?$expand=appRoleAssignments&$filter=${filterParam}`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(spRequestOptions);
+        });
     }
     removeAppRoleAssignmentForServicePrincipal(spId, appRoleAssignmentId) {
-        const spRequestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals/${spId}/appRoleAssignments/${appRoleAssignmentId}`,
-            headers: {
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.delete(spRequestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const spRequestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals/${spId}/appRoleAssignments/${appRoleAssignmentId}`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.delete(spRequestOptions);
+        });
     }
 }
 _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignmentRemoveCommand_initTelemetry = function _AadAppRoleAssignmentRemoveCommand_initTelemetry() {

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

@@ -21,6 +21,7 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const promises_1 = require("timers/promises");
 class AadO365GroupAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_ADD;
@@ -31,6 +32,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
     constructor() {
         super();
         _AadO365GroupAddCommand_instances.add(this);
+        this.pollingInterval = 500;
         __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initTypes).call(this);
@@ -97,9 +99,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                         },
                         data: fs.readFileSync(fullPath)
                     };
-                    yield new Promise((resolve, reject) => {
-                        this.setGroupLogo(requestOptionsPhoto, AadO365GroupAddCommand.numRepeat, resolve, reject, logger);
-                    });
+                    yield this.setGroupLogo(requestOptionsPhoto, AadO365GroupAddCommand.numRepeat, logger);
                 }
                 if (ownerIds.length !== 0) {
                     yield Promise.all(ownerIds.map(ownerId => request_1.default.post({
@@ -133,51 +133,54 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
         });
     }
     getUserIds(logger, users) {
-        if (!users) {
-            if (this.debug) {
-                logger.logToStderr('No users to validate, skipping.');
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!users) {
+                if (this.debug) {
+                    logger.logToStderr('No users to validate, skipping.');
+                }
+                return [];
             }
-            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 '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        });
-        return Promise.all(promises).then((usersRes) => {
+            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 '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                    headers: {
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.get(requestOptions);
+            });
+            const usersRes = yield Promise.all(promises);
             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(',')}`);
+                throw `Cannot proceed with group creation. The following users provided are invalid : ${invalidUsers.join(',')}`;
             }
-            return Promise.resolve(userIds);
+            return userIds;
         });
     }
-    setGroupLogo(requestOptions, retryLeft, resolve, reject, logger) {
-        request_1.default
-            .put(requestOptions)
-            .then(() => resolve(), (err) => {
-            if (--retryLeft > 0) {
-                setTimeout(() => {
-                    this.setGroupLogo(requestOptions, retryLeft, resolve, reject, logger);
-                }, 500 * (AadO365GroupAddCommand.numRepeat - retryLeft));
+    setGroupLogo(requestOptions, retryLeft, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield request_1.default.put(requestOptions);
             }
-            else {
-                reject(err);
+            catch (err) {
+                if (--retryLeft > 0) {
+                    yield (0, promises_1.setTimeout)(this.pollingInterval * (AadO365GroupAddCommand.numRepeat - retryLeft));
+                    yield this.setGroupLogo(requestOptions, retryLeft, logger);
+                }
+                else {
+                    throw err;
+                }
             }
         });
     }

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

@@ -52,12 +52,13 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
         });
     }
     getGroupId(args) {
-        if (args.options.groupId) {
-            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.groupId));
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.groupDisplayName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.groupId) {
+                return formatting_1.formatting.encodeQueryParameter(args.options.groupId);
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.groupDisplayName);
+            return group.id;
+        });
     }
 }
 _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365GroupConversationPostListCommand_initTelemetry = function _AadO365GroupConversationPostListCommand_initTelemetry() {

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

@@ -80,7 +80,7 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
         });
     }
     getGroupSiteUrl(groupId) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${groupId}/drive?$select=webUrl`,
                 headers: {
@@ -88,16 +88,11 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                resolve({
-                    id: groupId,
-                    url: res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : ''
-                });
-            }, (err) => {
-                reject(err);
-            });
+            const res = yield request_1.default.get(requestOptions);
+            return {
+                id: groupId,
+                url: res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : ''
+            };
         });
     }
 }