@pnp/cli-microsoft365 5.0.0-beta.fe151d6 → 5.1.0-beta.c8f5fd7

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.validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.objectId && !utils_1.validation.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-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/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/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

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadGroupListCommand extends GraphCommand_1.default {
+    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';
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/${endpoint}`, logger)
+            .then((groups) => {
+            if (args.options.output === 'text') {
+                groups.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(groups);
+            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/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/{spo/commands/site/SpoOperation.js → aad/commands/o365group/GroupExtended.js}

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