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

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

@@ -60,14 +60,13 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
         });
     }
     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 odata_1.odata
-            .getAllItems(endpoint)
-            .then((recycleBinItems) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            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}`;
+            const recycleBinItems = yield odata_1.odata.getAllItems(endpoint);
             if (recycleBinItems.length === 0) {
-                return Promise.resolve();
+                return;
             }
             const deletePromises = [];
             // Logic to delete a group from recycle bin items.
@@ -79,7 +78,7 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
                     }
                 }));
             });
-            return Promise.all(deletePromises);
+            yield Promise.all(deletePromises);
         });
     }
 }

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

@@ -36,27 +36,26 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initOptionSets).call(this);
     }
     getGroupId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting_1.formatting.encodeQueryParameter(args.options.mailNickname)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting_1.formatting.encodeQueryParameter(args.options.mailNickname)}'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             const groupItem = response.value[0];
             if (!groupItem) {
-                return Promise.reject(`The specified Microsoft 365 Group does not exist`);
+                throw `The specified Microsoft 365 Group does not exist`;
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Microsoft 365 Groups with name ${args.options.mailNickname} found: ${response.value.map(x => x.id)}`);
+                throw `Multiple Microsoft 365 Groups with name ${args.options.mailNickname} found: ${response.value.map(x => x.id)}`;
             }
-            return Promise.resolve(groupItem.id);
+            return groupItem.id;
         });
     }
     commandAction(logger, args) {

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

@@ -36,9 +36,9 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                let users = yield this.getOwners(logger, args.options.groupId);
+                let users = yield this.getOwners(args.options.groupId, logger);
                 if (args.options.role !== 'Owner') {
-                    const membersAndGuests = yield this.getMembersAndGuests(logger, args.options.groupId);
+                    const membersAndGuests = yield this.getMembersAndGuests(args.options.groupId, logger);
                     users = users.concat(membersAndGuests);
                 }
                 if (args.options.role) {
@@ -51,11 +51,13 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
             }
         });
     }
-    getOwners(logger, groupId) {
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return odata_1.odata
-            .getAllItems(endpoint)
-            .then(users => {
+    getOwners(groupId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving owners of the group with id ${groupId}`);
+            }
+            const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
+            const users = yield odata_1.odata.getAllItems(endpoint);
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
             users.forEach(user => {
@@ -64,9 +66,14 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
             return users;
         });
     }
-    getMembersAndGuests(logger, groupId) {
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return odata_1.odata.getAllItems(endpoint);
+    getMembersAndGuests(groupId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving members of the group with id ${groupId}`);
+            }
+            const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
+            return yield odata_1.odata.getAllItems(endpoint);
+        });
     }
 }
 _AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCommand_initTelemetry = function _AadO365GroupUserListCommand_initTelemetry() {

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

@@ -43,8 +43,8 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-                let users = yield this.getOwners(logger, groupId);
-                const membersAndGuests = yield this.getMembersAndGuests(logger, groupId);
+                let users = yield this.getOwners(groupId, logger);
+                const membersAndGuests = yield this.getMembersAndGuests(groupId, logger);
                 users = users.concat(membersAndGuests);
                 // Filter out duplicate added values for owners (as they are returned as members as well)
                 users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
@@ -105,11 +105,13 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
             }
         });
     }
-    getOwners(logger, groupId) {
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return odata_1.odata
-            .getAllItems(endpoint)
-            .then(users => {
+    getOwners(groupId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving owners of the group with id ${groupId}`);
+            }
+            const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
+            const users = yield odata_1.odata.getAllItems(endpoint);
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
             users.forEach(user => {
@@ -118,9 +120,14 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
             return users;
         });
     }
-    getMembersAndGuests(logger, groupId) {
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return odata_1.odata.getAllItems(endpoint);
+    getMembersAndGuests(groupId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving members of the group with id ${groupId}`);
+            }
+            const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
+            return yield odata_1.odata.getAllItems(endpoint);
+        });
     }
 }
 _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetCommand_initTelemetry = function _AadO365GroupUserSetCommand_initTelemetry() {

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

@@ -68,23 +68,22 @@ class AadPolicyListCommand extends GraphCommand_1.default {
         });
     }
     getPolicies(policyType) {
-        const endpoint = policyEndPoints[policyType];
-        const requestOptions = {
-            url: `${this.resource}/v1.0/policies/${endpoint}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = policyEndPoints[policyType];
+            const requestOptions = {
+                url: `${this.resource}/v1.0/policies/${endpoint}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             if (endpoint === policyEndPoints.authorization ||
                 endpoint === policyEndPoints.identitysecuritydefaultsenforcement) {
-                return Promise.resolve(response);
+                return response;
             }
             else {
-                return Promise.resolve(response.value);
+                return response.value;
             }
         });
     }

package/dist/m365/aad/commands/siteclassification/siteclassification-enable.js

@@ -18,7 +18,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const DirectorySetting_1 = require("./DirectorySetting");
 class AadSiteClassificationEnableCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.SITECLASSIFICATION_ENABLE;
@@ -50,8 +49,7 @@ class AadSiteClassificationEnableCommand extends GraphCommand_1.default {
                     unifiedGroupSetting.length === 0) {
                     throw "Missing DirectorySettingTemplate for \"Group.Unified\"";
                 }
-                const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
-                updatedDirSettings.templateId = unifiedGroupSetting[0].id;
+                const updatedDirSettings = { values: [], templateId: unifiedGroupSetting[0].id };
                 unifiedGroupSetting[0].values.forEach((directorySetting) => {
                     switch (directorySetting.name) {
                         case "ClassificationList":

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

@@ -18,7 +18,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const DirectorySetting_1 = require("./DirectorySetting");
 class AadSiteClassificationSetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.SITECLASSIFICATION_SET;
@@ -51,69 +50,69 @@ class AadSiteClassificationSetCommand extends GraphCommand_1.default {
                     unifiedGroupSetting.length === 0) {
                     throw "There is no previous defined site classification which can updated.";
                 }
-                const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
+                const updatedDirSettings = { values: [] };
                 unifiedGroupSetting[0].values.forEach((directorySetting) => {
                     switch (directorySetting.name) {
                         case "ClassificationList":
                             if (args.options.classifications) {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": args.options.classifications
+                                    name: directorySetting.name,
+                                    value: args.options.classifications
                                 });
                             }
                             else {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": directorySetting.value
+                                    name: directorySetting.name,
+                                    value: directorySetting.value
                                 });
                             }
                             break;
                         case "DefaultClassification":
                             if (args.options.defaultClassification) {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": args.options.defaultClassification
+                                    name: directorySetting.name,
+                                    value: args.options.defaultClassification
                                 });
                             }
                             else {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": directorySetting.value
+                                    name: directorySetting.name,
+                                    value: directorySetting.value
                                 });
                             }
                             break;
                         case "UsageGuidelinesUrl":
                             if (args.options.usageGuidelinesUrl) {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": args.options.usageGuidelinesUrl
+                                    name: directorySetting.name,
+                                    value: args.options.usageGuidelinesUrl
                                 });
                             }
                             else {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": directorySetting.value
+                                    name: directorySetting.name,
+                                    value: directorySetting.value
                                 });
                             }
                             break;
                         case "GuestUsageGuidelinesUrl":
                             if (args.options.guestUsageGuidelinesUrl) {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": args.options.guestUsageGuidelinesUrl
+                                    name: directorySetting.name,
+                                    value: args.options.guestUsageGuidelinesUrl
                                 });
                             }
                             else {
                                 updatedDirSettings.values.push({
-                                    "name": directorySetting.name,
-                                    "value": directorySetting.value
+                                    name: directorySetting.name,
+                                    value: directorySetting.value
                                 });
                             }
                             break;
                         default:
                             updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": directorySetting.value
+                                name: directorySetting.name,
+                                value: directorySetting.value
                             });
                             break;
                     }

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

@@ -36,34 +36,33 @@ class AadSpAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpAddCommand_instances, "m", _AadSpAddCommand_initOptionSets).call(this);
     }
     getAppId(args) {
-        if (args.options.appId) {
-            return Promise.resolve(args.options.appId);
-        }
-        let spMatchQuery = '';
-        if (args.options.appName) {
-            spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appName)}'`;
-        }
-        else if (args.options.objectId) {
-            spMatchQuery = `id eq '${formatting_1.formatting.encodeQueryParameter(args.options.objectId)}'`;
-        }
-        const appIdRequestOptions = {
-            url: `${this.resource}/v1.0/applications?$filter=${spMatchQuery}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(appIdRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appId) {
+                return args.options.appId;
+            }
+            let spMatchQuery = '';
+            if (args.options.appName) {
+                spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appName)}'`;
+            }
+            else if (args.options.objectId) {
+                spMatchQuery = `id eq '${formatting_1.formatting.encodeQueryParameter(args.options.objectId)}'`;
+            }
+            const appIdRequestOptions = {
+                url: `${this.resource}/v1.0/applications?$filter=${spMatchQuery}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(appIdRequestOptions);
             const spItem = response.value[0];
             if (!spItem) {
-                return Promise.reject(`The specified Azure AD app doesn't exist`);
+                throw `The specified Azure AD app doesn't exist`;
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appName} found: ${response.value.map(x => x.appId)}`);
+                throw `Multiple Azure AD apps with name ${args.options.appName} found: ${response.value.map(x => x.appId)}`;
             }
-            return Promise.resolve(spItem.appId);
+            return spItem.appId;
         });
     }
     commandAction(logger, args) {

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

@@ -36,34 +36,33 @@ class AadSpGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadSpGetCommand_instances, "m", _AadSpGetCommand_initOptionSets).call(this);
     }
     getSpId(args) {
-        if (args.options.appObjectId) {
-            return Promise.resolve(args.options.appObjectId);
-        }
-        let spMatchQuery = '';
-        if (args.options.appDisplayName) {
-            spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
-        }
-        else if (args.options.appId) {
-            spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
-        }
-        const idRequestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(idRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appObjectId) {
+                return args.options.appObjectId;
+            }
+            let spMatchQuery = '';
+            if (args.options.appDisplayName) {
+                spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+            }
+            else if (args.options.appId) {
+                spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
+            }
+            const idRequestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(idRequestOptions);
             const spItem = response.value[0];
             if (!spItem) {
-                return Promise.reject(`The specified Azure AD app does not exist`);
+                throw `The specified Azure AD app does not exist`;
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`);
+                throw `Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`;
             }
-            return Promise.resolve(spItem.id);
+            return spItem.id;
         });
     }
     commandAction(logger, args) {

package/dist/m365/cli/commands/config/config-set.js

@@ -43,6 +43,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                 case settingsNames_1.settingsNames.csvQuoted:
                 case settingsNames_1.settingsNames.csvQuotedEmpty:
                 case settingsNames_1.settingsNames.disableTelemetry:
+                case settingsNames_1.settingsNames.interactive:
                 case settingsNames_1.settingsNames.printErrorsAsPlainText:
                 case settingsNames_1.settingsNames.prompt:
                 case settingsNames_1.settingsNames.showHelpOnFailure:

package/dist/m365/commands/login.js

@@ -19,6 +19,7 @@ const fs = require("fs");
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
 const config_1 = require("../../config");
+const accessToken_1 = require("../../utils/accessToken");
 const misc_1 = require("../../utils/misc");
 const commands_1 = require("./commands");
 class LoginCommand extends Command_1.default {
@@ -90,6 +91,25 @@ class LoginCommand extends Command_1.default {
                     }
                     throw new Command_1.CommandError(error.message);
                 }
+                if (this.debug) {
+                    logger.logToStderr({
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
+                        accessToken: JSON.stringify(Auth_1.default.service.accessTokens, null, 2),
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
+                    });
+                }
+                else {
+                    logger.logToStderr({
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
+                        cloudType: Auth_1.CloudType[Auth_1.default.service.cloudType]
+                    });
+                }
             });
             try {
                 yield Auth_1.default.clearConnectionInfo();