@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.55e5dfb

package/dist/cli/Cli.js

@@ -19,7 +19,7 @@ const Command_1 = require("../Command");
 const config_1 = require("../config");
 const request_1 = require("../request");
 const settingsNames_1 = require("../settingsNames");
-const Utils_1 = require("../Utils");
+const utils_1 = require("../utils");
 const packageJSON = require('../../package.json');
 class Cli {
     // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -121,12 +121,27 @@ class Cli {
                     }
                 }
             }
-            // validate options
-            // validate required options
+            const shouldPrompt = this.getSettingWithDefaultValue(settingsNames_1.settingsNames.prompt, false);
+            let inquirer;
             for (let i = 0; i < this.commandToExecute.options.length; i++) {
                 if (this.commandToExecute.options[i].required &&
                     typeof this.optionsFromArgs.options[this.commandToExecute.options[i].name] === 'undefined') {
-                    return this.closeWithError(`Required option ${this.commandToExecute.options[i].name} not specified`, this.optionsFromArgs, true);
+                    if (!shouldPrompt) {
+                        return this.closeWithError(`Required option ${this.commandToExecute.options[i].name} not specified`, this.optionsFromArgs, true);
+                    }
+                    if (i === 0) {
+                        Cli.log('Provide values for the following parameters:');
+                    }
+                    if (!inquirer) {
+                        inquirer = require('inquirer');
+                    }
+                    const missingRequireOptionValue = yield inquirer
+                        .prompt({
+                        name: 'missingRequireOptionValue',
+                        message: `${this.commandToExecute.options[i].name}: `
+                    })
+                        .then(result => result.missingRequireOptionValue);
+                    this.optionsFromArgs.options[this.commandToExecute.options[i].name] = missingRequireOptionValue;
                 }
             }
             const optionsWithoutShorts = Cli.removeShortOptions(this.optionsFromArgs);
@@ -248,7 +263,7 @@ class Cli {
         });
     }
     loadAllCommands() {
-        const files = Utils_1.default.readdirR(this.commandsFolder);
+        const files = utils_1.fsUtil.readdirR(this.commandsFolder);
         files.forEach(file => {
             if (file.indexOf(`${path.sep}commands${path.sep}`) > -1 &&
                 file.indexOf(`${path.sep}assets${path.sep}`) < 0 &&
@@ -456,7 +471,7 @@ class Cli {
                         Array.isArray(logStatement[0].value)) {
                         logStatement = logStatement[0].value;
                     }
-                    logStatement = logStatement.map((s) => Utils_1.default.filterObject(s, currentCommand.defaultProperties));
+                    logStatement = logStatement.map((s) => utils_1.formatting.filterObject(s, currentCommand.defaultProperties));
                 }
             }
         }

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

@@ -4,10 +4,10 @@ const fs = require("fs");
 const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadAppAddCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
         this.appName = '';
@@ -42,7 +42,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             // directory. If we in the future extend the command with allowing
             // users to create AAD app in a different directory, we'll need to
             // adjust this
-            appInfo.tenantId = Utils_1.default.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+            appInfo.tenantId = utils_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
             return Promise.resolve(appInfo);
         })
             .then(appInfo => this.updateAppFromManifest(args, appInfo))
@@ -278,15 +278,15 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         if (this.verbose) {
             logger.logToStderr('Resolving requested APIs...');
         }
-        return this
-            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=servicePrincipalNames,appId,oauth2PermissionScopes,appRoles`, logger, true)
-            .then(_ => {
+        return utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=servicePrincipalNames,appId,oauth2PermissionScopes,appRoles`, logger)
+            .then(servicePrincipals => {
             try {
-                const resolvedApis = this.getRequiredResourceAccessForApis(args.options.apisDelegated, 'Scope', logger);
+                const resolvedApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisDelegated, 'Scope', logger);
                 if (this.debug) {
                     logger.logToStderr(`Resolved delegated permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
                 }
-                const resolvedApplicationApis = this.getRequiredResourceAccessForApis(args.options.apisApplication, 'Role', logger);
+                const resolvedApplicationApis = this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisApplication, 'Role', logger);
                 if (this.debug) {
                     logger.logToStderr(`Resolved application permissions: ${JSON.stringify(resolvedApplicationApis, null, 2)}`);
                 }
@@ -310,7 +310,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             }
         });
     }
-    getRequiredResourceAccessForApis(apis, scopeType, logger) {
+    getRequiredResourceAccessForApis(servicePrincipals, apis, scopeType, logger) {
         if (!apis) {
             return [];
         }
@@ -325,7 +325,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
                 logger.logToStderr(`Permission name: ${permissionName}`);
                 logger.logToStderr(`Service principal name: ${servicePrincipalName}`);
             }
-            const servicePrincipal = this.items.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
+            const servicePrincipal = servicePrincipals.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
                 sp.servicePrincipalNames.indexOf(`${servicePrincipalName}/`) > -1));
             if (!servicePrincipal) {
                 throw `Service principal ${servicePrincipalName} not found`;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppDeleteCommand extends GraphCommand_1.default {
@@ -110,10 +110,10 @@ class AadAppDeleteCommand extends GraphCommand_1.default {
             (args.options.objectId && args.options.name)) {
             return 'Specify either appId, objectId, or name';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppGetCommand extends GraphCommand_1.default {
@@ -129,10 +129,10 @@ class AadAppGetCommand extends GraphCommand_1.default {
             (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)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleDeleteCommand extends GraphCommand_1.default {
@@ -194,7 +194,7 @@ class AadAppRoleDeleteCommand extends GraphCommand_1.default {
             return `Specify either name, claim or id of the role`;
         }
         if (args.options.id) {
-            if (!Utils_1.default.isValidGuid(args.options.id)) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadAppRoleListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadAppRoleListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.APP_ROLE_LIST;
     }
@@ -23,9 +24,9 @@ class AadAppRoleListCommand extends GraphItemsListCommand_1.GraphItemsListComman
     commandAction(logger, args, cb) {
         this
             .getAppObjectId(args, logger)
-            .then(objectId => this.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`, logger, true))
-            .then(_ => {
-            logger.log(this.items);
+            .then(objectId => utils_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`, logger))
+            .then(appRoles => {
+            logger.log(appRoles);
             cb();
         }, rawRes => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
@@ -60,7 +60,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
             }
             // will perform resource name, appId or objectId search
             let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
-            if (Utils_1.default.isValidGuid(resource)) {
+            if (utils_1.validation.isValidGuid(resource)) {
                 filter += ` or appId eq '${resource}' or id eq '${resource}'`;
             }
             const requestOptions = {
@@ -170,10 +170,10 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
         if (optionsSpecified !== 1) {
             return 'Specify either appId, objectId or displayName';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
@@ -113,10 +113,10 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
         if (!args.options.appId && !args.options.displayName && !args.options.objectId) {
             return 'Specify either appId, objectId or displayName';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         let optionsSpecified = 0;

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
@@ -57,7 +57,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                 }
                 // will perform resource name, appId or objectId search
                 let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
-                if (Utils_1.default.isValidGuid(resource)) {
+                if (utils_1.validation.isValidGuid(resource)) {
                     filter += ` or appId eq '${resource}' or id eq '${resource}'`;
                 }
                 const requestOptions = {
@@ -174,10 +174,10 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
         if (optionsSpecified !== 1) {
             return 'Specify either appId, objectId or displayName';
         }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadGroupListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadGroupListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.GROUP_LIST;
     }
@@ -19,11 +20,11 @@ class AadGroupListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
     }
     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(() => {
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/${endpoint}`, logger)
+            .then((groups) => {
             if (args.options.output === 'text') {
-                this.items.forEach((group) => {
+                groups.forEach((group) => {
                     if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
                         group.groupType = 'Microsoft 365';
                     }
@@ -38,7 +39,7 @@ class AadGroupListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
                     }
                 });
             }
-            logger.log(this.items);
+            logger.log(groups);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingAddCommand extends GraphCommand_1.default {
@@ -88,7 +88,7 @@ class AadGroupSettingAddCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.templateId)) {
+        if (!utils_1.validation.isValidGuid(args.options.templateId)) {
             return `${args.options.templateId} is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingGetCommand extends GraphCommand_1.default {
@@ -36,7 +36,7 @@ class AadGroupSettingGetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadGroupSettingListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadGroupSettingListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.GROUPSETTING_LIST;
     }
@@ -13,10 +14,10 @@ class AadGroupSettingListCommand extends GraphItemsListCommand_1.GraphItemsListC
         return ['id', 'displayName'];
     }
     commandAction(logger, args, cb) {
-        this
-            .getAllItems(`${this.resource}/v1.0/groupSettings`, logger, true)
-            .then(() => {
-            logger.log(this.items);
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/groupSettings`, logger)
+            .then((groupSettings) => {
+            logger.log(groupSettings);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingRemoveCommand extends GraphCommand_1.default {
@@ -64,7 +64,7 @@ class AadGroupSettingRemoveCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingSetCommand extends GraphCommand_1.default {
@@ -81,7 +81,7 @@ class AadGroupSettingSetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadGroupSettingTemplateGetCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.GROUPSETTINGTEMPLATE_GET;
     }
@@ -18,10 +18,10 @@ class AadGroupSettingTemplateGetCommand extends GraphItemsListCommand_1.GraphIte
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this
-            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`, logger, true)
-            .then(() => {
-            const groupSettingTemplate = this.items.filter(t => args.options.id ? t.id === args.options.id : t.displayName === args.options.displayName);
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`, logger)
+            .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) {
                 logger.log(groupSettingTemplate.pop());
             }
@@ -52,7 +52,7 @@ class AadGroupSettingTemplateGetCommand extends GraphItemsListCommand_1.GraphIte
             return 'Specify either id or displayName but not both';
         }
         if (args.options.id &&
-            !Utils_1.default.isValidGuid(args.options.id)) {
+            !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadGroupSettingTemplateListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.GROUPSETTINGTEMPLATE_LIST;
     }
@@ -13,10 +14,10 @@ class AadGroupSettingTemplateListCommand extends GraphItemsListCommand_1.GraphIt
         return ['id', 'displayName'];
     }
     commandAction(logger, args, cb) {
-        this
-            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`, logger, true)
-            .then(() => {
-            logger.log(this.items);
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`, logger)
+            .then((templates) => {
+            logger.log(templates);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }

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

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 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;
@@ -121,7 +121,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
         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`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadO365GroupConversationListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadO365GroupConversationListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_CONVERSATION_LIST;
     }
@@ -14,10 +14,10 @@ class AadO365GroupConversationListCommand extends GraphItemsListCommand_1.GraphI
         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);
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`, logger)
+            .then((conversations) => {
+            logger.log(conversations);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
@@ -31,7 +31,7 @@ class AadO365GroupConversationListCommand extends GraphItemsListCommand_1.GraphI
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (!utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupGetCommand extends GraphCommand_1.default {
@@ -59,7 +59,7 @@ class AadO365GroupGetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;