From ff48a0083831c4d86c0346ccdec3f4c0039eec2f Mon Sep 17 00:00:00 2001
From: Jan <jackermann@owncloud.com>
Date: Fri, 24 Jun 2022 10:50:57 +0200
Subject: [PATCH] User group assignments  (#7176)

Implement user group assignments
---
 ...ancement-user-management-group-assignments |   6 +
 .../src/components/Groups/GroupsList.vue      |  18 +-
 .../components/Users/SideBar/DetailsPanel.vue |  17 +-
 .../components/Users/SideBar/EditPanel.vue    |  15 +-
 .../Users/SideBar/GroupAssignmentsPanel.vue   | 107 ++++
 .../components/Users/SideBar/UserInfoBox.vue  |  27 +
 .../src/components/Users/UsersList.vue        |  26 +-
 .../src/views/Groups.vue                      |   5 +-
 .../src/views/Users.vue                       |  84 ++-
 .../tests/unit/views/Users.spec.js            |  68 ++-
 .../src/generated/.openapi-generator/VERSION  |   2 +-
 packages/web-client/src/generated/api.ts      | 576 +++++++-----------
 packages/web-client/src/generated/base.ts     |   2 +-
 packages/web-client/src/generated/common.ts   |   2 +-
 .../web-client/src/generated/configuration.ts |   2 +-
 packages/web-client/src/generated/index.ts    |   2 +-
 packages/web-client/src/index.ts              |  30 +-
 17 files changed, 576 insertions(+), 413 deletions(-)
 create mode 100644 changelog/unreleased/enhancement-user-management-group-assignments
 create mode 100644 packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue
 create mode 100644 packages/web-app-user-management/src/components/Users/SideBar/UserInfoBox.vue

diff --git a/changelog/unreleased/enhancement-user-management-group-assignments b/changelog/unreleased/enhancement-user-management-group-assignments
new file mode 100644
index 00000000000..a03ec9b11d2
--- /dev/null
+++ b/changelog/unreleased/enhancement-user-management-group-assignments
@@ -0,0 +1,6 @@
+Enhancement: Introduce group assignments
+
+We have added a new quick action in the user management where the user can be assigned to groups.
+
+https://github.com/owncloud/web/pull/7176
+https://github.com/owncloud/web/issues/6678
diff --git a/packages/web-app-user-management/src/components/Groups/GroupsList.vue b/packages/web-app-user-management/src/components/Groups/GroupsList.vue
index 8529c58233c..f0293c830d5 100644
--- a/packages/web-app-user-management/src/components/Groups/GroupsList.vue
+++ b/packages/web-app-user-management/src/components/Groups/GroupsList.vue
@@ -32,9 +32,17 @@
     <template #avatar="rowData">
       <avatar-image :width="32" :userid="rowData.item.id" :user-name="rowData.item.displayName" />
     </template>
+    <template #members="rowData">
+      {{ rowData.item.members.length }}
+    </template>
     <template #actions="{ item }">
-      <oc-button v-oc-tooltip="$gettext('Details')" @click="$emit('clickDetails', item)">
-        <oc-icon size="small" name="information" />
+      <oc-button
+        v-oc-tooltip="$gettext('Details')"
+        appearance="raw"
+        class="oc-mr-xs quick-action-button oc-p-xs"
+        @click="$emit('clickDetails', item)"
+      >
+        <oc-icon name="information" fill-type="line" />
       </oc-button>
       <!-- Editing groups is currently not supported by backend
       <oc-button v-oc-tooltip="$gettext('Edit')" class="oc-ml-s" @click="$emit('clickEdit', item)">
@@ -105,6 +113,12 @@ export default {
           title: this.$gettext('Group name'),
           sortable: true
         },
+        {
+          name: 'members',
+          title: this.$gettext('Members'),
+          type: 'slot',
+          sortable: true
+        },
         {
           name: 'actions',
           title: this.$gettext('Actions'),
diff --git a/packages/web-app-user-management/src/components/Users/SideBar/DetailsPanel.vue b/packages/web-app-user-management/src/components/Users/SideBar/DetailsPanel.vue
index cef34e620b0..3a17345d788 100644
--- a/packages/web-app-user-management/src/components/Users/SideBar/DetailsPanel.vue
+++ b/packages/web-app-user-management/src/components/Users/SideBar/DetailsPanel.vue
@@ -9,11 +9,7 @@
       <p>{{ multipleUsersSelectedText }}</p>
     </div>
     <div v-if="user">
-      <div class="oc-flex user-info oc-mb-l">
-        <avatar-image class="oc-mb-m" :width="80" :userid="user.id" :user-name="user.displayName" />
-        <span v-text="user.onPremisesSamAccountName"></span>
-        <span class="oc-text-muted user-info-display-name" v-text="user.displayName"></span>
-      </div>
+      <UserInfoBox :user="user" />
       <table
         class="details-table"
         :aria-label="$gettext('Overview of the information about the selected user')"
@@ -43,8 +39,12 @@
   </div>
 </template>
 <script>
+import UserInfoBox from './UserInfoBox.vue'
 export default {
   name: 'DetailsPanel',
+  components: {
+    UserInfoBox
+  },
   props: {
     users: {
       type: Array,
@@ -70,13 +70,6 @@ export default {
 }
 </script>
 <style lang="scss">
-.user-info {
-  align-items: center;
-  flex-direction: column;
-}
-.user-info-display-name {
-  font-size: 1.5rem;
-}
 .details-table {
   text-align: left;
 
diff --git a/packages/web-app-user-management/src/components/Users/SideBar/EditPanel.vue b/packages/web-app-user-management/src/components/Users/SideBar/EditPanel.vue
index fd55bdaaf98..94c98da5ca5 100644
--- a/packages/web-app-user-management/src/components/Users/SideBar/EditPanel.vue
+++ b/packages/web-app-user-management/src/components/Users/SideBar/EditPanel.vue
@@ -1,10 +1,6 @@
 <template>
   <div v-if="user" class="oc-mt-xl">
-    <div class="oc-flex group-info oc-mb-l">
-      <avatar-image class="oc-mb-m" :width="80" :userid="user.id" :user-name="user.displayName" />
-      <span v-text="user.onPremisesSamAccountName"></span>
-      <span class="oc-text-muted group-info-display-name" v-text="user.displayName"></span>
-    </div>
+    <UserInfoBox :user="user" />
     <div v-if="editUser" class="oc-background-highlight oc-p-m">
       <oc-text-input
         v-model="editUser.displayName"
@@ -51,11 +47,13 @@
 </template>
 <script>
 import * as EmailValidator from 'email-validator'
+import UserInfoBox from './UserInfoBox.vue'
 import CompareSaveDialog from '../../CompareSaveDialog.vue'
 
 export default {
   name: 'EditPanel',
   components: {
+    UserInfoBox,
     CompareSaveDialog
   },
   props: {
@@ -156,11 +154,4 @@ export default {
   bottom: 0;
   left: 0;
 }
-.user-info {
-  align-items: center;
-  flex-direction: column;
-}
-.user-info-display-name {
-  font-size: 1.5rem;
-}
 </style>
diff --git a/packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue b/packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue
new file mode 100644
index 00000000000..48467081cf8
--- /dev/null
+++ b/packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue
@@ -0,0 +1,107 @@
+<template>
+  <div v-if="user" class="oc-mt-xl">
+    <UserInfoBox :user="user" />
+    <div v-if="editUser" class="oc-background-highlight oc-p-m">
+      <oc-select
+        v-model="editUser.memberOf"
+        multiple
+        :options="groups"
+        option-label="displayName"
+        :label="$gettext('Add or remove groups')"
+        :fix-message-line="true"
+      >
+        <template #selected-option="{ displayName, id }">
+          <span class="oc-flex oc-flex-center">
+            <avatar-image
+              class="oc-flex oc-align-self-center oc-mr-s"
+              :width="16.8"
+              :userid="id"
+              :user-name="displayName"
+            />
+            <span>{{ displayName }}</span>
+          </span>
+        </template>
+        <template #option="{ displayName, id }">
+          <div class="oc-flex">
+            <span class="oc-flex oc-flex-center">
+              <avatar-image
+                class="oc-flex oc-align-self-center oc-mr-s"
+                :width="16.8"
+                :userid="id"
+                :user-name="displayName"
+              />
+              <span>{{ displayName }}</span>
+            </span>
+          </div>
+        </template>
+      </oc-select>
+    </div>
+    <compare-save-dialog
+      class="edit-compare-save-dialog"
+      :original-object="originalObjectUser"
+      :compare-object="compareObjectUser"
+      @revert="revertChanges"
+      @confirm="$emit('confirm', editUser)"
+    ></compare-save-dialog>
+  </div>
+</template>
+<script>
+import UserInfoBox from './UserInfoBox.vue'
+import CompareSaveDialog from '../../CompareSaveDialog.vue'
+
+export default {
+  name: 'GroupAssignmentsPanel',
+  components: {
+    UserInfoBox,
+    CompareSaveDialog
+  },
+  props: {
+    users: {
+      type: Array,
+      required: true
+    },
+    groups: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      editUser: {}
+    }
+  },
+  computed: {
+    user() {
+      return this.users.length === 1 ? this.users[0] : null
+    },
+
+    originalObjectUser() {
+      return { user: { ...this.user } }
+    },
+    compareObjectUser() {
+      return { user: { ...this.editUser } }
+    }
+  },
+  watch: {
+    user: {
+      handler: function () {
+        this.editUser = { ...this.user }
+      },
+      deep: true,
+      immediate: true
+    }
+  },
+  methods: {
+    revertChanges() {
+      this.editUser = { ...this.user }
+    }
+  }
+}
+</script>
+<style lang="scss">
+.edit-compare-save-dialog {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+}
+</style>
diff --git a/packages/web-app-user-management/src/components/Users/SideBar/UserInfoBox.vue b/packages/web-app-user-management/src/components/Users/SideBar/UserInfoBox.vue
new file mode 100644
index 00000000000..a7a7c59776a
--- /dev/null
+++ b/packages/web-app-user-management/src/components/Users/SideBar/UserInfoBox.vue
@@ -0,0 +1,27 @@
+<template>
+  <div class="oc-flex user-info oc-mb-l">
+    <avatar-image class="oc-mb-m" :width="80" :userid="user.id" :user-name="user.displayName" />
+    <span v-text="user.onPremisesSamAccountName"></span>
+    <span class="oc-text-muted user-info-display-name" v-text="user.displayName"></span>
+  </div>
+</template>
+<script>
+export default {
+  name: 'UserInfoBox',
+  props: {
+    user: {
+      type: Object,
+      required: true
+    }
+  }
+}
+</script>
+<style lang="scss">
+.user-info {
+  align-items: center;
+  flex-direction: column;
+}
+.user-info-display-name {
+  font-size: 1.5rem;
+}
+</style>
diff --git a/packages/web-app-user-management/src/components/Users/UsersList.vue b/packages/web-app-user-management/src/components/Users/UsersList.vue
index 45819063bc7..74293b30e22 100644
--- a/packages/web-app-user-management/src/components/Users/UsersList.vue
+++ b/packages/web-app-user-management/src/components/Users/UsersList.vue
@@ -34,11 +34,29 @@
     </template>
     <template #role="{ item }"> {{ item.role.displayName }} </template>
     <template #actions="{ item }">
-      <oc-button v-oc-tooltip="$gettext('Details')" @click="$emit('clickDetails', item)">
-        <oc-icon size="small" name="information" />
+      <oc-button
+        v-oc-tooltip="$gettext('Details')"
+        appearance="raw"
+        class="oc-mr-xs quick-action-button oc-p-xs"
+        @click="$emit('clickDetails', item)"
+      >
+        <oc-icon name="information" fill-type="line" />
       </oc-button>
-      <oc-button v-oc-tooltip="$gettext('Edit')" class="oc-ml-s" @click="$emit('clickEdit', item)">
-        <oc-icon size="small" name="pencil" />
+      <oc-button
+        v-oc-tooltip="$gettext('Group assignments')"
+        appearance="raw"
+        class="oc-mr-xs quick-action-button oc-p-xs"
+        @click="$emit('clickGroupAssignments', item)"
+      >
+        <oc-icon name="group-2" fill-type="line" />
+      </oc-button>
+      <oc-button
+        v-oc-tooltip="$gettext('Edit')"
+        appearance="raw"
+        class="oc-mr-xs quick-action-button oc-p-xs"
+        @click="$emit('clickEdit', item)"
+      >
+        <oc-icon name="pencil" fill-type="line" />
       </oc-button>
     </template>
     <template #footer>
diff --git a/packages/web-app-user-management/src/views/Groups.vue b/packages/web-app-user-management/src/views/Groups.vue
index 5da1bce0e6b..4f986164d41 100644
--- a/packages/web-app-user-management/src/views/Groups.vue
+++ b/packages/web-app-user-management/src/views/Groups.vue
@@ -142,6 +142,9 @@ export default {
     const loadResourcesTask = useTask(function* (signal, ref) {
       const response = yield graphClient.groups.listGroups('displayName')
       groups.value = response.data.value || []
+      groups.value.forEach((group) => {
+        group.members = group.members || []
+      })
     })
 
     return {
@@ -340,7 +343,7 @@ export default {
         this.showMessage({
           title: this.$gettext('Group was created successfully')
         })
-        this.groups.push(response?.data)
+        this.groups.push({ ...response?.data, members: [] })
       } catch (error) {
         console.error(error)
         this.showMessage({
diff --git a/packages/web-app-user-management/src/views/Users.vue b/packages/web-app-user-management/src/views/Users.vue
index 0391c801456..ed54ecaad95 100644
--- a/packages/web-app-user-management/src/views/Users.vue
+++ b/packages/web-app-user-management/src/views/Users.vue
@@ -76,6 +76,7 @@
               @toggleSelectUser="toggleSelectUser"
               @toggleSelectAllUsers="toggleSelectAllUsers"
               @clickDetails="showDetailsSideBarPanel"
+              @clickGroupAssignments="showGroupAssignmentsPanel"
               @clickEdit="showEditSideBarPanel"
             />
           </div>
@@ -97,6 +98,13 @@
               :roles="roles"
               @confirm="editUser"
             />
+            <GroupAssignmentsPanel
+              v-if="activePanel === 'GroupAssignmentsPanel'"
+              :users="selectedUsers"
+              :roles="roles"
+              :groups="groups"
+              @confirm="editUserGroupAssignments"
+            />
           </template>
         </side-bar>
       </template>
@@ -110,6 +118,7 @@ import CreateUserModal from '../components/Users/CreateUserModal.vue'
 import DeleteUserModal from '../components/Users/DeleteUserModal.vue'
 import DetailsPanel from '../components/Users/SideBar/DetailsPanel.vue'
 import EditPanel from '../components/Users/SideBar/EditPanel.vue'
+import GroupAssignmentsPanel from '../components/Users/SideBar/GroupAssignmentsPanel.vue'
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import SideBar from 'web-pkg/src/components/sidebar/SideBar.vue'
@@ -126,6 +135,7 @@ export default {
   components: {
     EditPanel,
     DetailsPanel,
+    GroupAssignmentsPanel,
     UsersList,
     AppLoadingSpinner,
     NoContentMessage,
@@ -136,6 +146,7 @@ export default {
   setup() {
     const store = useStore()
     const users = ref([])
+    const groups = ref([])
     const roles = ref([])
     const userAssignments = ref({})
     const graphClient = clientService.graphAuthenticated(
@@ -190,10 +201,20 @@ export default {
       userAssignments.value[ref.user?.id] = userAssignmentResponse.data?.assignments
     })
 
+    const loadGroupsTask = useTask(function* (signal, ref) {
+      const groupsResponse = yield graphClient.groups.listGroups()
+      groups.value = groupsResponse.data.value
+    })
+
     const loadResourcesTask = useTask(function* (signal, ref) {
       const usersResponse = yield graphClient.users.listUsers('displayName')
       users.value = usersResponse.data.value || []
 
+      users.value.forEach((user) => {
+        user.memberOf = user.memberOf || []
+      })
+
+      yield loadGroupsTask.perform()
       yield loadRolesTask.perform()
 
       for (const user of users.value) {
@@ -204,6 +225,7 @@ export default {
     return {
       users,
       roles,
+      groups,
       loadResourcesTask,
       graphClient
     }
@@ -218,7 +240,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['getToken']),
+    ...mapGetters(['getToken', 'configuration']),
     selectedUsersText() {
       const translated = this.$gettext('%{ userCount } selected')
 
@@ -255,6 +277,14 @@ export default {
           component: EditPanel,
           default: false,
           enabled: this.selectedUsers.length === 1
+        },
+        {
+          app: 'GroupAssignmentsPanel',
+          icon: 'group-2',
+          title: $gettext('Group assignments'),
+          component: GroupAssignmentsPanel,
+          default: false,
+          enabled: this.selectedUsers.length === 1
         }
       ]
     },
@@ -345,6 +375,12 @@ export default {
       this.sideBarOpen = true
     },
 
+    showGroupAssignmentsPanel(user) {
+      this.selectedUsers = user ? [user] : []
+      this.activePanel = 'GroupAssignmentsPanel'
+      this.sideBarOpen = true
+    },
+
     async deleteUsers(users) {
       const promises = users.map((user) => this.graphClient.users.deleteUser(user.id))
 
@@ -396,7 +432,10 @@ export default {
         this.showMessage({
           title: this.$gettext('User was created successfully')
         })
-        this.users.push(response?.data)
+        this.users.push({
+          ...response?.data,
+          ...{ memberOf: [], role: this.roles.find((role) => role.name === 'user') }
+        })
       } catch (error) {
         console.error(error)
         this.showMessage({
@@ -444,6 +483,47 @@ export default {
           status: 'danger'
         })
       }
+    },
+
+    async editUserGroupAssignments(editUser) {
+      try {
+        const user = this.users.find((user) => user.id === editUser.id)
+
+        const groupsToAdd = editUser.memberOf.filter((editUserGroup) => {
+          return !user.memberOf.includes(editUserGroup)
+        })
+        const groupsToDelete = user.memberOf.filter((editUserGroup) => {
+          return !editUser.memberOf.includes(editUserGroup)
+        })
+
+        for (const groupToAdd of groupsToAdd) {
+          await this.graphClient.groups.addMember(groupToAdd.id, user.id, this.configuration.server)
+        }
+
+        for (const groupToDelete of groupsToDelete) {
+          await this.graphClient.groups.deleteMember(groupToDelete.id, user.id)
+        }
+
+        this.$set(
+          this.users,
+          this.users.findIndex((user) => user.id === editUser.id),
+          editUser
+        )
+        /**
+         * The user object gets actually exchanged, therefore we update the selected users
+         */
+        this.selectedUsers = [editUser]
+
+        this.showMessage({
+          title: this.$gettext('Group assignments were edited successfully')
+        })
+      } catch (error) {
+        console.error(error)
+        this.showMessage({
+          title: this.$gettext('Failed to edit group assignments'),
+          status: 'danger'
+        })
+      }
     }
   }
 }
diff --git a/packages/web-app-user-management/tests/unit/views/Users.spec.js b/packages/web-app-user-management/tests/unit/views/Users.spec.js
index 29fc4d2aadc..dcbb53848b2 100644
--- a/packages/web-app-user-management/tests/unit/views/Users.spec.js
+++ b/packages/web-app-user-management/tests/unit/views/Users.spec.js
@@ -74,6 +74,60 @@ describe('Users view', () => {
     })
   })
 
+  describe('method "editUserGroupAssignments"', () => {
+    it('should show message on success', async () => {
+      const editUser = {
+        id: '1',
+        memberOf: [
+          {
+            displayName: 'group',
+            id: '04114ac6-f050-41d2-98db-6f016abccf2c'
+          }
+        ]
+      }
+
+      const wrapper = getMountedWrapper({
+        mocks: {
+          users: [
+            {
+              id: '1',
+              memberOf: []
+            }
+          ]
+        }
+      })
+      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const setStub = jest.spyOn(wrapper.vm, '$set')
+
+      await wrapper.vm.editUserGroupAssignments(editUser)
+
+      expect(wrapper.vm.selectedUsers[0]).toEqual(editUser)
+      expect(showMessageStub).toHaveBeenCalled()
+      expect(setStub).toHaveBeenCalled()
+    })
+
+    it('should show message on error', async () => {
+      const editUser = {
+        id: '1',
+        memberOf: [
+          {
+            displayName: 'group',
+            id: '04114ac6-f050-41d2-98db-6f016abccf2c'
+          }
+        ]
+      }
+      mockAxios.post.mockImplementationOnce(() => {
+        return Promise.resolve({})
+      })
+      jest.spyOn(console, 'error').mockImplementation(() => {})
+      const wrapper = getMountedWrapper({ resolveAddMember: false })
+      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      await wrapper.vm.editUserGroupAssignments(editUser)
+
+      expect(showMessageStub).toHaveBeenCalled()
+    })
+  })
+
   describe('method "deleteUsers"', () => {
     it('should hide the modal and show message on success', async () => {
       const wrapper = getMountedWrapper()
@@ -156,7 +210,8 @@ function getMountedWrapper({
   mocks = {},
   resolveCreateUser = true,
   resolveEditUser = true,
-  resolveDeleteUser = true
+  resolveDeleteUser = true,
+  resolveAddMember = true
 } = {}) {
   return shallowMount(Users, {
     localVue,
@@ -165,7 +220,10 @@ function getMountedWrapper({
         showMessage: jest.fn()
       },
       getters: {
-        getToken: () => 'token'
+        getToken: () => 'token',
+        configuration: () => ({
+          server: 'https://example.com/'
+        })
       }
     }),
     mocks: {
@@ -181,6 +239,9 @@ function getMountedWrapper({
           createUser: () => (resolveCreateUser ? Promise.resolve() : Promise.reject(new Error(''))),
           editUser: () => (resolveEditUser ? Promise.resolve() : Promise.reject(new Error(''))),
           deleteUser: () => (resolveDeleteUser ? Promise.resolve() : Promise.reject(new Error('')))
+        },
+        groups: {
+          addMember: () => (resolveAddMember ? Promise.resolve() : Promise.reject(new Error('')))
         }
       },
       users: [
@@ -196,7 +257,8 @@ function getMountedWrapper({
       return {
         selectedUsers: [
           {
-            id: 1
+            id: 1,
+            memberOf: []
           }
         ],
         ...data
diff --git a/packages/web-client/src/generated/.openapi-generator/VERSION b/packages/web-client/src/generated/.openapi-generator/VERSION
index 0984c4c1ad2..89648de3311 100644
--- a/packages/web-client/src/generated/.openapi-generator/VERSION
+++ b/packages/web-client/src/generated/.openapi-generator/VERSION
@@ -1 +1 @@
-5.4.0-SNAPSHOT
\ No newline at end of file
+6.0.1-SNAPSHOT
\ No newline at end of file
diff --git a/packages/web-client/src/generated/api.ts b/packages/web-client/src/generated/api.ts
index ea24055fa7c..a96b7362ba5 100644
--- a/packages/web-client/src/generated/api.ts
+++ b/packages/web-client/src/generated/api.ts
@@ -4,7 +4,7 @@
  * Libre Graph API
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: v0.13.2
+ * The version of the OpenAPI document: v0.14.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -500,18 +500,6 @@ export interface Group {
      * @memberof Group
      */
     'id'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof Group
-     */
-    'deletedDateTime'?: string;
-    /**
-     * Timestamp of when the group was created. The value cannot be modified and is automatically populated when the group is created. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Returned by default. Supports $filter (eq, ne, not, ge, le, in). Read-only.
-     * @type {string}
-     * @memberof Group
-     */
-    'createdDateTime'?: string;
     /**
      * An optional description for the group. Returned by default. Supports $filter (eq, ne, not, ge, le, startsWith) and $search.
      * @type {string}
@@ -524,108 +512,12 @@ export interface Group {
      * @memberof Group
      */
     'displayName'?: string;
-    /**
-     * Timestamp of when the group is set to expire. The value cannot be modified and is automatically populated when the group is created. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Returned by default. Supports $filter (eq, ne, not, ge, le, in). Read-only.
-     * @type {string}
-     * @memberof Group
-     */
-    'expirationDateTime'?: string;
-    /**
-     * The SMTP address for the group, for example, \'serviceadmins@owncloud.com\'. Returned by default. Read-only. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values).
-     * @type {string}
-     * @memberof Group
-     */
-    'mail'?: string;
-    /**
-     * Contains the on-premises domain FQDN, also called dnsDomainName synchronized from the on-premises directory.
-     * @type {string}
-     * @memberof Group
-     */
-    'onPremisesDomainName'?: string;
-    /**
-     * Indicates the last time at which the group was synced with the on-premises directory.The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Returned by default. Read-only. Supports $filter (eq, ne, not, ge, le, in).
-     * @type {string}
-     * @memberof Group
-     */
-    'onPremisesLastSyncDateTime'?: string;
-    /**
-     * Contains the on-premises SAM account name synchronized from the on-premises directory. The property is only populated for customers who are synchronizing their on-premises directory to Azure Active Directory via Azure AD Connect.Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith). Read-only.
-     * @type {string}
-     * @memberof Group
-     */
-    'onPremisesSamAccountName'?: string;
-    /**
-     * true if this group is synced from an on-premises directory; false if this group was originally synced from an on-premises directory but is no longer synced; null if this object has never been synced from an on-premises directory (default). Returned by default. Read-only. Supports $filter (eq, ne, not, in, and eq on null values).
-     * @type {boolean}
-     * @memberof Group
-     */
-    'onPremisesSyncEnabled'?: boolean;
-    /**
-     * The preferred language for a group. Should follow ISO 639-1 Code; for example en-US. Returned by default. Supports $filter (eq, ne, not, ge, le, in, startsWith, and eq on null values).
-     * @type {string}
-     * @memberof Group
-     */
-    'preferredLanguage'?: string;
-    /**
-     * Specifies whether the group is a security group. Required. Returned by default. Supports $filter (eq, ne, not, in).
-     * @type {boolean}
-     * @memberof Group
-     */
-    'securityEnabled'?: boolean;
-    /**
-     * Security identifier of the group, used in Windows scenarios. Returned by default.
-     * @type {string}
-     * @memberof Group
-     */
-    'securityIdentifier'?: string;
-    /**
-     * Specifies the group join policy and group content visibility for groups. Possible values are: Private, Public, or Hiddenmembership. It can\'t be updated later. Other values of visibility can be updated after group creation. Groups assignable to roles are always Private. See group visibility options to learn more. Returned by default. Nullable.
-     * @type {string}
-     * @memberof Group
-     */
-    'visibility'?: string;
-    /**
-     * 
-     * @type {DirectoryObject}
-     * @memberof Group
-     */
-    'createdOnBehalfOf'?: DirectoryObject;
-    /**
-     * Groups that this group is a member of. HTTP Methods: GET (supported for all groups). Read-only. Nullable. Supports $expand.
-     * @type {Array<DirectoryObject>}
-     * @memberof Group
-     */
-    'memberOf'?: Array<DirectoryObject>;
     /**
      * Users and groups that are members of this group. HTTP Methods: GET (supported for all groups), Nullable. Supports $expand.
-     * @type {Array<DirectoryObject>}
-     * @memberof Group
-     */
-    'members'?: Array<DirectoryObject>;
-    /**
-     * The owners of the group. The owners are a set of non-admin users who are allowed to modify this object. Limited to 100 owners. Nullable. Supports $expand.
-     * @type {Array<DirectoryObject>}
-     * @memberof Group
-     */
-    'owners'?: Array<DirectoryObject>;
-    /**
-     * 
-     * @type {Drive}
-     * @memberof Group
-     */
-    'drive'?: Drive;
-    /**
-     * The group\'s drives. Read-only.
-     * @type {Array<Drive>}
-     * @memberof Group
-     */
-    'drives'?: Array<Drive>;
-    /**
-     * 
-     * @type {boolean}
+     * @type {Array<User>}
      * @memberof Group
      */
-    'isArchived'?: boolean;
+    'members'?: Array<User>;
     /**
      * A list of member references to the members to be added. Up to 20 members can be added with a single request
      * @type {Set<string>}
@@ -883,6 +775,25 @@ export interface OpenGraphFile {
      */
     'processingMetadata'?: boolean;
 }
+/**
+ * 
+ * @export
+ * @interface PasswordChange
+ */
+export interface PasswordChange {
+    /**
+     * 
+     * @type {string}
+     * @memberof PasswordChange
+     */
+    'currentPassword'?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof PasswordChange
+     */
+    'newPassword'?: string;
+}
 /**
  * Password Profile associated with a user
  * @export
@@ -1148,84 +1059,12 @@ export interface User {
      * @memberof User
      */
     'id'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof User
-     */
-    'deletedDateTime'?: string;
-    /**
-     * true if the account is enabled; otherwise, false. This property is required when a user is created. Returned only on $select. Supports $filter.
-     * @type {boolean}
-     * @memberof User
-     */
-    'accountEnabled'?: boolean;
-    /**
-     * The telephone numbers for the user. Only one number can be set for this property. Returned by default. Read-only for users synced from on-premises directory.
-     * @type {Array<string>}
-     * @memberof User
-     */
-    'businessPhones'?: Array<string>;
-    /**
-     * The city in which the user is located. Returned only on $select. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'city'?: string;
-    /**
-     * The company name which the user is associated. This property can be useful for describing the company that an external user comes from. The maximum length of the company name is 64 characters.Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'companyName'?: string;
-    /**
-     * The country/region in which the user is located; for example, \'US\' or \'UK\'. Returned only on $select. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'country'?: string;
-    /**
-     * The date and time the user was created. The value cannot be modified and is automatically populated when the entity is created. The DateTimeOffset type represents date and time information using ISO 8601 format and is always in UTC time. Property is nullable. A null value indicates that an accurate creation time couldn\'t be determined for the user. Returned only on $select. Read-only. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'createdDateTime'?: string;
-    /**
-     * The name for the department in which the user works. Returned only on $select. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'department'?: string;
     /**
      * The name displayed in the address book for the user. This value is usually the combination of the user\'s first name, middle initial, and last name. This property is required when a user is created and it cannot be cleared during updates. Returned by default. Supports $filter and $orderby.
      * @type {string}
      * @memberof User
      */
     'displayName'?: string;
-    /**
-     * The fax number of the user. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'faxNumber'?: string;
-    /**
-     * The given name (first name) of the user. Returned by default. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'givenName'?: string;
-    /**
-     * The time when this user last changed their password. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z Returned only on $select. Read-only.
-     * @type {string}
-     * @memberof User
-     */
-    'lastPasswordChangeDateTime'?: string;
-    /**
-     * Used by enterprise applications to determine the legal age group of the user. This property is read-only and calculated based on ageGroup and consentProvidedForMinor properties. Allowed values: null, minorWithOutParentalConsent, minorWithParentalConsent, minorNoParentalConsentRequired, notAdult and adult. Refer to the legal age group property definitions for further information. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'legalAgeGroupClassification'?: string;
     /**
      * The SMTP address for the user, for example, \'jeff@contoso.onowncloud.com\'. Returned by default. Supports $filter and endsWith.
      * @type {string}
@@ -1233,149 +1072,23 @@ export interface User {
      */
     'mail'?: string;
     /**
-     * The mail alias for the user. This property must be specified when a user is created. Returned only on $select. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'mailNickname'?: string;
-    /**
-     * The primary cellular telephone number for the user. Returned by default. Read-only for users synced from on-premises directory.
-     * @type {string}
-     * @memberof User
-     */
-    'mobilePhone'?: string;
-    /**
-     * Contains the on-premises Active Directory distinguished name or DN. The property is only populated for customers who are synchronizing their on-premises directory to Azure Active Directory via Azure AD Connect. Read-only. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'onPremisesDistinguishedName'?: string;
-    /**
-     * Contains the on-premises domainFQDN, also called dnsDomainName synchronized from the on-premises directory. The property is only populated for customers who are synchronizing their on-premises directory to Azure Active Directory via Azure AD Connect. Read-only. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'onPremisesDomainName'?: string;
-    /**
-     * This property is used to associate an on-premises Active Directory user account to their Azure AD user object. This property must be specified when creating a new user account in the Graph if you are using a federated domain for the user\'s userPrincipalName (UPN) property. NOTE: The $ and _ characters cannot be used when specifying this property. Returned only on $select. Supports $filter (eq, ne, not, ge, le, in)..
-     * @type {string}
-     * @memberof User
-     */
-    'onPremisesImmutableId'?: string;
-    /**
-     * true if this object is synced from an on-premises directory; false if this object was originally synced from an on-premises directory but is no longer synced; null if this object has never been synced from an on-premises directory (default). Read-only. Returned only on $select. Supports $filter (eq, ne, not, in, and eq on null values).
-     * @type {boolean}
-     * @memberof User
-     */
-    'onPremisesSyncEnabled'?: boolean;
-    /**
-     * Indicates the last time at which the object was synced with the on-premises directory; for example: 2013-02-16T03:04:54Z. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z. Read-only. Returned only on $select. Supports $filter (eq, ne, not, ge, le, in).
-     * @type {string}
+     * Groups that this user is a member of. HTTP Methods: GET (supported for all groups). Read-only. Nullable. Supports $expand.
+     * @type {Array<Group>}
      * @memberof User
      */
-    'onPremisesLastSyncDateTime'?: string;
+    'memberOf'?: Array<Group>;
     /**
      * Contains the on-premises SAM account name synchronized from the on-premises directory. Read-only.
      * @type {string}
      * @memberof User
      */
     'onPremisesSamAccountName'?: string;
-    /**
-     * Contains the on-premises userPrincipalName synchronized from the on-premises directory. The property is only populated for customers who are synchronizing their on-premises directory to Azure Active Directory via Azure AD Connect. Read-only. Returned only on $select. Supports $filter (eq, ne, not, ge, le, in, startsWith).
-     * @type {string}
-     * @memberof User
-     */
-    'onPremisesUserPrincipalName'?: string;
-    /**
-     * The office location in the user\'s place of business. Returned by default.
-     * @type {string}
-     * @memberof User
-     */
-    'officeLocation'?: string;
     /**
      * 
      * @type {PasswordProfile}
      * @memberof User
      */
     'passwordProfile'?: PasswordProfile;
-    /**
-     * The postal code for the user\'s postal address. The postal code is specific to the user\'s country/region. In the United States of America, this attribute contains the ZIP code. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'postalCode'?: string;
-    /**
-     * The preferred language for the user. Should follow ISO 639-1 Code; for example \'en-US\'. Returned by default.
-     * @type {string}
-     * @memberof User
-     */
-    'preferredLanguage'?: string;
-    /**
-     * The state or province in the user\'s address. Returned only on $select. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'state'?: string;
-    /**
-     * The street address of the user\'s place of business. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'streetAddress'?: string;
-    /**
-     * The user\'s surname (family name or last name). Returned by default. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'surname'?: string;
-    /**
-     * A two letter country code (ISO standard 3166). Required for users that will be assigned licenses due to legal requirement to check for availability of services in countries.  Examples include: \'US\', \'JP\', and \'GB\'. Not nullable. Returned only on $select. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'usageLocation'?: string;
-    /**
-     * The user principal name (UPN) of the user. The UPN is an Internet-style login name for the user based on the Internet standard RFC 822. By convention, this should map to the user\'s email name. The general format is alias@domain, where domain must be present in the tenant\'s collection of verified domains. This property is required when a user is created. The verified domains for the tenant can be accessed from the verifiedDomains property of organization. Returned by default. Supports $filter, $orderby, and endsWith.
-     * @type {string}
-     * @memberof User
-     */
-    'userPrincipalName'?: string;
-    /**
-     * A string value that can be used to classify user types in your directory, such as \'Member\' and \'Guest\'. Returned only on $select. Supports $filter.
-     * @type {string}
-     * @memberof User
-     */
-    'userType'?: string;
-    /**
-     * A freeform text entry field for the user to describe themselves. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'aboutMe'?: string;
-    /**
-     * The birthday of the user. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is 2014-01-01T00:00:00Z Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'birthday'?: string;
-    /**
-     * The preferred name for the user. Returned only on $select.
-     * @type {string}
-     * @memberof User
-     */
-    'preferredName'?: string;
-    /**
-     * 
-     * @type {Drive}
-     * @memberof User
-     */
-    'drive'?: Drive;
-    /**
-     * A collection of drives available for this user. Read-only.
-     * @type {Array<Drive>}
-     * @memberof User
-     */
-    'drives'?: Array<Drive>;
 }
 
 /**
@@ -1981,7 +1694,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * 
          * @summary Add a member to a group
          * @param {string} groupId key: id of group
-         * @param {MemberReference} memberReference 
+         * @param {MemberReference} memberReference Object to be added as member
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -2103,11 +1816,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * 
          * @summary Get entity from groups by key
          * @param {string} groupId key: id of group
-         * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+         * @param {Set<'members'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getGroup: async (groupId: string, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getGroup: async (groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'groupId' is not null or undefined
             assertParamExists('getGroup', 'groupId', groupId)
             const localVarPath = `/groups/{group-id}`
@@ -2127,6 +1841,10 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
                 localVarQueryParameter['$select'] = Array.from($select).join(COLLECTION_FORMATS.csv);
             }
 
+            if ($expand) {
+                localVarQueryParameter['$expand'] = Array.from($expand).join(COLLECTION_FORMATS.csv);
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -2192,7 +1910,7 @@ export const GroupApiFp = function(configuration?: Configuration) {
          * 
          * @summary Add a member to a group
          * @param {string} groupId key: id of group
-         * @param {MemberReference} memberReference 
+         * @param {MemberReference} memberReference Object to be added as member
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -2229,12 +1947,13 @@ export const GroupApiFp = function(configuration?: Configuration) {
          * 
          * @summary Get entity from groups by key
          * @param {string} groupId key: id of group
-         * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+         * @param {Set<'members'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getGroup(groupId: string, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Group>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getGroup(groupId, $select, options);
+        async getGroup(groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Group>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getGroup(groupId, $select, $expand, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
@@ -2263,7 +1982,7 @@ export const GroupApiFactory = function (configuration?: Configuration, basePath
          * 
          * @summary Add a member to a group
          * @param {string} groupId key: id of group
-         * @param {MemberReference} memberReference 
+         * @param {MemberReference} memberReference Object to be added as member
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
@@ -2297,12 +2016,13 @@ export const GroupApiFactory = function (configuration?: Configuration, basePath
          * 
          * @summary Get entity from groups by key
          * @param {string} groupId key: id of group
-         * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+         * @param {Set<'members'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getGroup(groupId: string, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options?: any): AxiosPromise<Group> {
-            return localVarFp.getGroup(groupId, $select, options).then((request) => request(axios, basePath));
+        getGroup(groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise<Group> {
+            return localVarFp.getGroup(groupId, $select, $expand, options).then((request) => request(axios, basePath));
         },
         /**
          * 
@@ -2329,7 +2049,7 @@ export class GroupApi extends BaseAPI {
      * 
      * @summary Add a member to a group
      * @param {string} groupId key: id of group
-     * @param {MemberReference} memberReference 
+     * @param {MemberReference} memberReference Object to be added as member
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof GroupApi
@@ -2369,13 +2089,14 @@ export class GroupApi extends BaseAPI {
      * 
      * @summary Get entity from groups by key
      * @param {string} groupId key: id of group
-     * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+     * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+     * @param {Set<'members'>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof GroupApi
      */
-    public getGroup(groupId: string, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options?: AxiosRequestConfig) {
-        return GroupApiFp(this.configuration).getGroup(groupId, $select, options).then((request) => request(this.axios, this.basePath));
+    public getGroup(groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) {
+        return GroupApiFp(this.configuration).getGroup(groupId, $select, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
@@ -2443,12 +2164,13 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter items by property values
          * @param {boolean} [$count] Include count of items
-         * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+         * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
+         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+         * @param {Set<'members'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listGroups: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listGroups: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/groups`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -2489,6 +2211,10 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio
                 localVarQueryParameter['$select'] = Array.from($select).join(COLLECTION_FORMATS.csv);
             }
 
+            if ($expand) {
+                localVarQueryParameter['$expand'] = Array.from($expand).join(COLLECTION_FORMATS.csv);
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -2529,13 +2255,14 @@ export const GroupsApiFp = function(configuration?: Configuration) {
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter items by property values
          * @param {boolean} [$count] Include count of items
-         * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+         * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
+         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+         * @param {Set<'members'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfGroup>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, options);
+        async listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfGroup>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
     }
@@ -2566,13 +2293,14 @@ export const GroupsApiFactory = function (configuration?: Configuration, basePat
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter items by property values
          * @param {boolean} [$count] Include count of items
-         * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+         * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
+         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+         * @param {Set<'members'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options?: any): AxiosPromise<CollectionOfGroup> {
-            return localVarFp.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, options).then((request) => request(axios, basePath));
+        listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise<CollectionOfGroup> {
+            return localVarFp.listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -2604,14 +2332,122 @@ export class GroupsApi extends BaseAPI {
      * @param {string} [$search] Search items by search phrases
      * @param {string} [$filter] Filter items by property values
      * @param {boolean} [$count] Include count of items
-     * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>} [$orderby] Order items by property values
-     * @param {Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>} [$select] Select properties to be returned
+     * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
+     * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
+     * @param {Set<'members'>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof GroupsApi
      */
-    public listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'createdDateTime' | 'createdDateTime desc' | 'description' | 'description desc' | 'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'securityEnabled' | 'securityEnabled desc' | 'securityIdentifier' | 'securityIdentifier desc' | 'visibility' | 'visibility desc' | 'isArchived' | 'isArchived desc'>, $select?: Set<'id' | 'deletedDateTime' | 'createdDateTime' | 'description' | 'displayName' | 'expirationDateTime' | 'mail' | 'onPremisesDomainName' | 'onPremisesLastSyncDateTime' | 'onPremisesNetBiosName' | 'onPremisesProvisioningErrors' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'preferredLanguage' | 'renewedDateTime' | 'securityEnabled' | 'securityIdentifier' | 'visibility' | 'isArchived' | 'createdOnBehalfOf' | 'memberOf' | 'members' | 'owners' | 'drive' | 'drives'>, options?: AxiosRequestConfig) {
-        return GroupsApiFp(this.configuration).listGroups($top, $skip, $search, $filter, $count, $orderby, $select, options).then((request) => request(this.axios, this.basePath));
+    public listGroups($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) {
+        return GroupsApiFp(this.configuration).listGroups($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath));
+    }
+}
+
+
+/**
+ * MeChangepasswordApi - axios parameter creator
+ * @export
+ */
+export const MeChangepasswordApiAxiosParamCreator = function (configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary Chanage your own password
+         * @param {PasswordChange} passwordChange Password change request
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        changeOwnPassword: async (passwordChange: PasswordChange, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'passwordChange' is not null or undefined
+            assertParamExists('changeOwnPassword', 'passwordChange', passwordChange)
+            const localVarPath = `/me/changePassword`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(passwordChange, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+    }
+};
+
+/**
+ * MeChangepasswordApi - functional programming interface
+ * @export
+ */
+export const MeChangepasswordApiFp = function(configuration?: Configuration) {
+    const localVarAxiosParamCreator = MeChangepasswordApiAxiosParamCreator(configuration)
+    return {
+        /**
+         * 
+         * @summary Chanage your own password
+         * @param {PasswordChange} passwordChange Password change request
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async changeOwnPassword(passwordChange: PasswordChange, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.changeOwnPassword(passwordChange, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
+    }
+};
+
+/**
+ * MeChangepasswordApi - factory interface
+ * @export
+ */
+export const MeChangepasswordApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    const localVarFp = MeChangepasswordApiFp(configuration)
+    return {
+        /**
+         * 
+         * @summary Chanage your own password
+         * @param {PasswordChange} passwordChange Password change request
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        changeOwnPassword(passwordChange: PasswordChange, options?: any): AxiosPromise<void> {
+            return localVarFp.changeOwnPassword(passwordChange, options).then((request) => request(axios, basePath));
+        },
+    };
+};
+
+/**
+ * MeChangepasswordApi - object-oriented interface
+ * @export
+ * @class MeChangepasswordApi
+ * @extends {BaseAPI}
+ */
+export class MeChangepasswordApi extends BaseAPI {
+    /**
+     * 
+     * @summary Chanage your own password
+     * @param {PasswordChange} passwordChange Password change request
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof MeChangepasswordApi
+     */
+    public changeOwnPassword(passwordChange: PasswordChange, options?: AxiosRequestConfig) {
+        return MeChangepasswordApiFp(this.configuration).changeOwnPassword(passwordChange, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
@@ -3207,12 +3043,12 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
          * 
          * @summary Get entity from users by key
          * @param {string} userId key: id of user
-         * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-         * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+         * @param {Set<'memberOf'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getUser: async (userId: string, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getUser: async (userId: string, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('getUser', 'userId', userId)
             const localVarPath = `/users/{user-id}`
@@ -3313,12 +3149,12 @@ export const UserApiFp = function(configuration?: Configuration) {
          * 
          * @summary Get entity from users by key
          * @param {string} userId key: id of user
-         * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-         * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+         * @param {Set<'memberOf'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getUser(userId: string, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
+        async getUser(userId: string, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getUser(userId, $select, $expand, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
@@ -3359,12 +3195,12 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
          * 
          * @summary Get entity from users by key
          * @param {string} userId key: id of user
-         * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-         * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+         * @param {Set<'memberOf'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getUser(userId: string, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options?: any): AxiosPromise<User> {
+        getUser(userId: string, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options?: any): AxiosPromise<User> {
             return localVarFp.getUser(userId, $select, $expand, options).then((request) => request(axios, basePath));
         },
         /**
@@ -3405,13 +3241,13 @@ export class UserApi extends BaseAPI {
      * 
      * @summary Get entity from users by key
      * @param {string} userId key: id of user
-     * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-     * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+     * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+     * @param {Set<'memberOf'>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof UserApi
      */
-    public getUser(userId: string, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options?: AxiosRequestConfig) {
+    public getUser(userId: string, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig) {
         return UserApiFp(this.configuration).getUser(userId, $select, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3480,13 +3316,13 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter items by property values
          * @param {boolean} [$count] Include count of items
-         * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-         * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
+         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+         * @param {Set<'memberOf'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUsers: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listUsers: async ($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/users`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -3571,13 +3407,13 @@ export const UsersApiFp = function(configuration?: Configuration) {
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter items by property values
          * @param {boolean} [$count] Include count of items
-         * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-         * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
+         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+         * @param {Set<'memberOf'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfUser>> {
+        async listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
@@ -3609,13 +3445,13 @@ export const UsersApiFactory = function (configuration?: Configuration, basePath
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter items by property values
          * @param {boolean} [$count] Include count of items
-         * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-         * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
+         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+         * @param {Set<'memberOf'>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options?: any): AxiosPromise<CollectionOfUser> {
+        listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options?: any): AxiosPromise<CollectionOfUser> {
             return localVarFp.listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(axios, basePath));
         },
     };
@@ -3648,14 +3484,14 @@ export class UsersApi extends BaseAPI {
      * @param {string} [$search] Search items by search phrases
      * @param {string} [$filter] Filter items by property values
      * @param {boolean} [$count] Include count of items
-     * @param {Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>} [$orderby] Order items by property values
-     * @param {Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>} [$select] Select properties to be returned
-     * @param {Set<'*' | 'drive' | 'drives'>} [$expand] Expand related entities
+     * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
+     * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>} [$select] Select properties to be returned
+     * @param {Set<'memberOf'>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof UsersApi
      */
-    public listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'id' | 'id desc' | 'deletedDateTime' | 'deletedDateTime desc' | 'accountEnabled' | 'accountEnabled desc' | 'businessPhones' | 'businessPhones desc' | 'city' | 'city desc' | 'companyName' | 'companyName desc' | 'country' | 'country desc' | 'createdDateTime' | 'createdDateTime desc' | 'department' | 'department desc' | 'displayName' | 'displayName desc' | 'faxNumber' | 'faxNumber desc' | 'givenName' | 'givenName desc' | 'lastPasswordChangeDateTime' | 'lastPasswordChangeDateTime desc' | 'legalAgeGroupClassification' | 'legalAgeGroupClassification desc' | 'mail' | 'mail desc' | 'mailNickname' | 'mailNickname desc' | 'mobilePhone' | 'mobilePhone desc' | 'officeLocation' | 'officeLocation desc' | 'onPremisesDistinguishedName' | 'onPremisesDistinguishedName desc' | 'onPremisesDomainName' | 'onPremisesDomainName desc' | 'onPremisesImmutableId' | 'onPremisesImmutableId desc' | 'onPremisesLastSyncDateTime' | 'onPremisesLastSyncDateTime desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc' | 'onPremisesSyncEnabled' | 'onPremisesSyncEnabled desc' | 'onPremisesUserPrincipalName' | 'onPremisesUserPrincipalName desc' | 'postalCode' | 'postalCode desc' | 'preferredLanguage' | 'preferredLanguage desc' | 'state' | 'state desc' | 'streetAddress' | 'streetAddress desc' | 'surname' | 'surname desc' | 'usageLocation' | 'usageLocation desc' | 'userPrincipalName' | 'userPrincipalName desc' | 'userType' | 'userType desc' | 'aboutMe' | 'aboutMe desc' | 'birthday' | 'birthday desc' | 'preferredName' | 'preferredName desc'>, $select?: Set<'id' | 'deletedDateTime' | 'accountEnabled' | 'businessPhones' | 'city' | 'companyName' | 'country' | 'createdDateTime' | 'creationType' | 'department' | 'displayName' | 'faxNumber' | 'givenName' | 'lastPasswordChangeDateTime' | 'legalAgeGroupClassification' | 'licenseAssignmentStates' | 'mail' | 'mailNickname' | 'mobilePhone' | 'officeLocation' | 'onPremisesDistinguishedName' | 'onPremisesDomainName' | 'onPremisesImmutableId' | 'onPremisesLastSyncDateTime' | 'onPremisesSamAccountName' | 'onPremisesSyncEnabled' | 'onPremisesUserPrincipalName' | 'postalCode' | 'preferredLanguage' | 'state' | 'streetAddress' | 'surname' | 'usageLocation' | 'userPrincipalName' | 'userType' | 'aboutMe' | 'birthday' | 'preferredName' | 'drive' | 'drives'>, $expand?: Set<'*' | 'drive' | 'drives'>, options?: AxiosRequestConfig) {
+    public listUsers($top?: number, $skip?: number, $search?: string, $filter?: string, $count?: boolean, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName'>, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig) {
         return UsersApiFp(this.configuration).listUsers($top, $skip, $search, $filter, $count, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 }
diff --git a/packages/web-client/src/generated/base.ts b/packages/web-client/src/generated/base.ts
index 55a27a61b3b..7f9a33571cf 100644
--- a/packages/web-client/src/generated/base.ts
+++ b/packages/web-client/src/generated/base.ts
@@ -4,7 +4,7 @@
  * Libre Graph API
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: v0.13.2
+ * The version of the OpenAPI document: v0.14.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/packages/web-client/src/generated/common.ts b/packages/web-client/src/generated/common.ts
index 4dcf7fd76d2..ed54e5cd7a0 100644
--- a/packages/web-client/src/generated/common.ts
+++ b/packages/web-client/src/generated/common.ts
@@ -4,7 +4,7 @@
  * Libre Graph API
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: v0.13.2
+ * The version of the OpenAPI document: v0.14.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/packages/web-client/src/generated/configuration.ts b/packages/web-client/src/generated/configuration.ts
index bbdeaa930ef..7402891f4b1 100644
--- a/packages/web-client/src/generated/configuration.ts
+++ b/packages/web-client/src/generated/configuration.ts
@@ -4,7 +4,7 @@
  * Libre Graph API
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: v0.13.2
+ * The version of the OpenAPI document: v0.14.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/packages/web-client/src/generated/index.ts b/packages/web-client/src/generated/index.ts
index 1e9628caa39..ab21f31696d 100644
--- a/packages/web-client/src/generated/index.ts
+++ b/packages/web-client/src/generated/index.ts
@@ -4,7 +4,7 @@
  * Libre Graph API
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
- * The version of the OpenAPI document: v0.13.2
+ * The version of the OpenAPI document: v0.14.3
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
diff --git a/packages/web-client/src/index.ts b/packages/web-client/src/index.ts
index 5a304b5530c..816a9f32a66 100644
--- a/packages/web-client/src/index.ts
+++ b/packages/web-client/src/index.ts
@@ -37,6 +37,8 @@ export interface Graph {
     createGroup: (group: Group) => AxiosPromise<Group>
     editGroup: (groupId: string, group: Group) => AxiosPromise<void>
     deleteGroup: (groupId: string) => AxiosPromise<void>
+    addMember: (groupId: string, userId: string, server: string) => AxiosPromise<void>
+    deleteMember: (groupId: string, userId: string) => AxiosPromise<void>
   }
 }
 
@@ -73,14 +75,38 @@ const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
       editUser: (userId: string, user: User) => userApiFactory.updateUser(userId, user),
       deleteUser: (userId: string) => userApiFactory.deleteUser(userId),
       listUsers: (orderBy?: any) =>
-        usersApiFactory.listUsers(0, 0, '', '', false, new Set<any>([orderBy]))
+        usersApiFactory.listUsers(
+          0,
+          0,
+          '',
+          '',
+          false,
+          new Set<any>([orderBy]),
+          new Set<any>([]),
+          new Set<any>(['memberOf'])
+        )
     },
     groups: {
       createGroup: (group: Group) => groupsApiFactory.createGroup(group),
       editGroup: (groupId: string, group: Group) => groupApiFactory.updateGroup(groupId, group),
       deleteGroup: (groupId: string) => groupApiFactory.deleteGroup(groupId),
       listGroups: (orderBy?: any) =>
-        groupsApiFactory.listGroups(0, 0, '', '', false, new Set<any>([orderBy]))
+        groupsApiFactory.listGroups(
+          0,
+          0,
+          '',
+          '',
+          false,
+          new Set<any>([orderBy]),
+          new Set<any>([]),
+          new Set<any>(['members'])
+        ),
+      addMember: (groupId: string, userId: string, server: string) => {
+        groupApiFactory.addMember(groupId, { '@odata.id': `${server}graph/v1.0/users/${userId}` })
+      },
+      deleteMember: (groupId: string, userId: string) => {
+        groupApiFactory.deleteMember(groupId, userId)
+      }
     }
   }
 }