diff --git a/changelog/unreleased/enhancement-add-action-drop-down-to-app-top-bar b/changelog/unreleased/enhancement-add-action-drop-down-to-app-top-bar
index 089218635cb..80b1fcb2dd4 100644
--- a/changelog/unreleased/enhancement-add-action-drop-down-to-app-top-bar
+++ b/changelog/unreleased/enhancement-add-action-drop-down-to-app-top-bar
@@ -1,4 +1,4 @@
-Enhancement: add action drop down top app top bar
+Enhancement: add action drop down to app top bar
 
 We've added an action drop down with various file actions to the app top bar,
 so the user can now call different actions like download, directly from the app.
diff --git a/changelog/unreleased/enhancement-add-activities-panel b/changelog/unreleased/enhancement-add-activities-panel
new file mode 100644
index 00000000000..1cffd53a33f
--- /dev/null
+++ b/changelog/unreleased/enhancement-add-activities-panel
@@ -0,0 +1,6 @@
+Enhancement: Activities sidebar app panel
+We have added a sidebar app panel to display activities performed on a resource.
+This provides a clear overview of actions taken on a resource.
+
+https://github.com/owncloud/web/pull/10996
+https://github.com/owncloud/web/issues/10800
diff --git a/packages/design-system/src/assets/fonts/inter.woff2 b/packages/design-system/src/assets/fonts/inter.woff2
index fd6553cec07..22a12b04e1a 100644
Binary files a/packages/design-system/src/assets/fonts/inter.woff2 and b/packages/design-system/src/assets/fonts/inter.woff2 differ
diff --git a/packages/web-app-files/src/components/SideBar/ActivitiesPanel.vue b/packages/web-app-files/src/components/SideBar/ActivitiesPanel.vue
new file mode 100644
index 00000000000..d732dc5ee97
--- /dev/null
+++ b/packages/web-app-files/src/components/SideBar/ActivitiesPanel.vue
@@ -0,0 +1,177 @@
+<template>
+  <div ref="rootElement">
+    <app-loading-spinner v-if="isLoading" />
+    <template v-else>
+      <p v-if="!activities.length" v-text="$gettext('No activities available for this resource')" />
+      <div v-else class="oc-ml-s">
+        <ul class="timeline">
+          <li v-for="activity in activities" :key="activity.id">
+            <span v-html="getHtmlFromActivity(activity)" />
+            <span
+              class="oc-text-muted oc-text-small oc-mt-s"
+              v-text="getTimeFromActivity(activity)"
+            />
+          </li>
+        </ul>
+        <p class="oc-text-muted oc-text-small" v-text="activitiesLimitText" />
+      </div>
+    </template>
+  </div>
+</template>
+
+<script lang="ts">
+import {
+  computed,
+  defineComponent,
+  inject,
+  onBeforeUnmount,
+  onMounted,
+  Ref,
+  ref,
+  unref,
+  watch
+} from 'vue'
+import { useGettext } from 'vue3-gettext'
+import {
+  AppLoadingSpinner,
+  formatDateFromDateTime,
+  useClientService,
+  VisibilityObserver
+} from '@ownclouders/web-pkg'
+import { useTask } from 'vue-concurrency'
+import { call, Resource } from '@ownclouders/web-client'
+import { DateTime } from 'luxon'
+import { Activity } from '@ownclouders/web-client/graph/generated'
+
+const visibilityObserver = new VisibilityObserver()
+export default defineComponent({
+  name: 'ActivitiesPanel',
+  components: { AppLoadingSpinner },
+  setup() {
+    const rootElement = ref<HTMLElement>()
+    const { $gettext, current: currentLanguage } = useGettext()
+    const clientService = useClientService()
+    const resource = inject<Ref<Resource>>('resource')
+    const activities = ref<Activity[]>([])
+    const activitiesLimit = 200
+
+    const activitiesLimitText = computed(() => {
+      return $gettext('(Showing latest %{activitiesLimit} activities)', {
+        activitiesLimit: activitiesLimit.toString()
+      })
+    })
+
+    const loadActivitiesTask = useTask(function* (signal) {
+      const {
+        data: { value: activitiesResponse }
+      } = yield* call(
+        clientService.graphAuthenticated.activities.listActivities(
+          `itemid:${unref(resource).id} AND limit:${activitiesLimit} AND sort:desc`
+        )
+      )
+
+      activities.value = activitiesResponse
+    }).restartable()
+
+    const isLoading = computed(() => {
+      return loadActivitiesTask.isRunning || !loadActivitiesTask.last
+    })
+
+    const getHtmlFromActivity = (activity: Activity) => {
+      let message = activity.template.message
+      for (const [key, value] of Object.entries(activity.template.variables)) {
+        message = message.replace(`{${key}}`, `<strong>${value.displayName || value.name}</strong>`)
+      }
+      return message
+    }
+
+    const getTimeFromActivity = (activity: Activity) => {
+      const dateTime = DateTime.fromISO(activity.times.recordedTime)
+      return formatDateFromDateTime(dateTime, currentLanguage)
+    }
+
+    const isVisible = ref(false)
+    watch(
+      [resource, isVisible],
+      () => {
+        if (!unref(isVisible)) {
+          return
+        }
+        loadActivitiesTask.perform()
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    )
+
+    onMounted(() => {
+      visibilityObserver.observe(unref(rootElement), {
+        onEnter: () => {
+          isVisible.value = true
+        },
+        onExit: () => {
+          isVisible.value = false
+        }
+      })
+    })
+
+    onBeforeUnmount(() => {
+      visibilityObserver.disconnect()
+    })
+
+    return {
+      rootElement,
+      activities,
+      activitiesLimit,
+      activitiesLimitText,
+      isLoading,
+      isVisible,
+      loadActivitiesTask,
+      getHtmlFromActivity,
+      getTimeFromActivity
+    }
+  }
+})
+</script>
+
+<style lang="scss">
+.timeline {
+  position: relative;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+
+  &::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    width: 1.5px;
+    background-color: var(--oc-color-border);
+  }
+
+  li {
+    display: flex;
+    flex-direction: column;
+    position: relative;
+    padding: 10px 20px 10px 30px;
+    width: 100%;
+    box-sizing: border-box;
+
+    &::before {
+      content: '';
+      width: 10px;
+      height: 10px;
+      background-color: var(--oc-color-border);
+      border-radius: 50%;
+      position: absolute;
+      left: -4px;
+      top: 50%;
+      transform: translateY(-50%);
+      z-index: 1;
+    }
+  }
+}
+</style>
diff --git a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
index 35e124a65ea..79ec3592470 100644
--- a/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/TagsSelect.vue
@@ -104,9 +104,6 @@ enum KeyCode {
 export default defineComponent({
   name: 'TagsSelect',
   props: {
-    /**
-     * The resource
-     */
     resource: {
       type: Object as PropType<Resource>,
       required: true
diff --git a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
index 52d3b3544af..1b4c680008d 100644
--- a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
+++ b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
@@ -48,7 +48,7 @@
       </li>
     </ul>
     <div v-else>
-      <p v-translate data-testid="file-versions-no-versions">No Versions available for this file</p>
+      <p v-translate data-testid="file-versions-no-versions">No versions available for this file</p>
     </div>
   </div>
 </template>
diff --git a/packages/web-app-files/src/composables/extensions/useFileSideBars.ts b/packages/web-app-files/src/composables/extensions/useFileSideBars.ts
index ccb76a666bc..652bb314f64 100644
--- a/packages/web-app-files/src/composables/extensions/useFileSideBars.ts
+++ b/packages/web-app-files/src/composables/extensions/useFileSideBars.ts
@@ -7,6 +7,7 @@ import SharesPanel from '../../components/SideBar/Shares/SharesPanel.vue'
 import NoSelection from '../../components/SideBar/NoSelection.vue'
 import TrashNoSelection from '../../components/SideBar/TrashNoSelection.vue'
 import SpaceActions from '../../components/SideBar/Actions/SpaceActions.vue'
+import ActivitiesPanel from '../../components/SideBar/ActivitiesPanel.vue'
 import {
   SpaceDetails,
   SpaceDetailsMultiple,
@@ -385,6 +386,26 @@ export const useSideBarPanels = (): SidebarPanelExtension<SpaceResource, Resourc
           return items?.length === 1 && isProjectSpaceResource(items[0])
         }
       }
+    },
+    {
+      id: 'com.github.owncloud.web.files.sidebar-panel.activities',
+      type: 'sidebarPanel',
+      extensionPointIds: [fileSideBarExtensionPoint.id],
+      panel: {
+        name: 'activities',
+        icon: 'pulse',
+        title: () => $gettext('Activities'),
+        component: ActivitiesPanel,
+        isVisible: ({ items, root }) => {
+          if (items?.length !== 1) {
+            return false
+          }
+          if (isLocationTrashActive(router, 'files-trash-generic')) {
+            return false
+          }
+          return true
+        }
+      }
     }
   ]
 }
diff --git a/packages/web-app-files/tests/unit/components/SideBar/ActivitiesPanel.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/ActivitiesPanel.spec.ts
new file mode 100644
index 00000000000..e128804e34b
--- /dev/null
+++ b/packages/web-app-files/tests/unit/components/SideBar/ActivitiesPanel.spec.ts
@@ -0,0 +1,131 @@
+import ActivitiesPanel from 'web-app-files/src/components/SideBar/ActivitiesPanel.vue'
+import { defaultComponentMocks, defaultPlugins, mount } from 'web-test-helpers'
+import { AxiosResponse } from 'axios'
+import { Resource } from '@ownclouders/web-client'
+import { mock } from 'vitest-mock-extended'
+import { nextTick } from 'vue'
+
+const defaultActivities = [
+  {
+    id: '5380e156-d65e-4024-9691-0f0c1f2796e4',
+    times: {
+      recordedTime: '2024-07-29T18:34:40Z'
+    },
+    template: {
+      message: '{user} created {resource}.',
+      variables: {
+        user: {
+          id: '71f9de60-8b24-4cfe-9378-87d47aef0d04',
+          displayName: 'Marie Curie'
+        },
+        resource: {
+          id: '7f92b0a9-06ad-49dc-890f-0e0a6eb4dea6$e9f01ca3-577f-4d1d-acd4-1cc44149ac25!5fb9f87c-a317-467b-9882-eb9f171564ac',
+          name: 'new folder'
+        }
+      }
+    }
+  },
+  {
+    id: '5380e156-d65e-4024-9691-0f0c1f2796e4',
+    times: {
+      recordedTime: '2023-07-29T18:34:40Z'
+    },
+    template: {
+      message: '{user} moved {resource}.',
+      variables: {
+        user: {
+          id: '71f9de60-8b24-4cfe-9378-87d47aef0d04',
+          displayName: 'Albert Einstein'
+        },
+        resource: {
+          id: '7f92b0a9-06ad-49dc-890f-0e0a6eb4dea6$e9f01ca3-577f-4d1d-acd4-1cc44149ac25!5fb9f87c-a317-467b-9882-eb9f171564ac',
+          name: 'textfile.txt'
+        }
+      }
+    }
+  },
+  {
+    id: '5380e156-d65e-4024-9691-0f0c1f2796e4',
+    times: {
+      recordedTime: '2022-07-29T18:34:40Z'
+    },
+    template: {
+      message: '{user} deleted {resource}.',
+      variables: {
+        user: {
+          id: '71f9de60-8b24-4cfe-9378-87d47aef0d04',
+          displayName: 'Robert Oppenheimer'
+        },
+        resource: {
+          id: '7f92b0a9-06ad-49dc-890f-0e0a6eb4dea6$e9f01ca3-577f-4d1d-acd4-1cc44149ac25!5fb9f87c-a317-467b-9882-eb9f171564ac',
+          name: 'atom plans.pdf'
+        }
+      }
+    }
+  },
+  {
+    id: '5380e156-d65e-4024-9691-0f0c1f2796e4',
+    times: {
+      recordedTime: '2021-07-29T18:34:40Z'
+    },
+    template: {
+      message: '{user} removed {resource}.',
+      variables: {
+        user: {
+          id: '71f9de60-8b24-4cfe-9378-87d47aef0d04',
+          displayName: 'Albert Schweitzer'
+        },
+        resource: {
+          id: '7f92b0a9-06ad-49dc-890f-0e0a6eb4dea6$e9f01ca3-577f-4d1d-acd4-1cc44149ac25!5fb9f87c-a317-467b-9882-eb9f171564ac',
+          name: 'Selfie.png'
+        }
+      }
+    }
+  }
+]
+describe('ActivitiesPanel', () => {
+  it('should show no activities message if there is no data', async () => {
+    const { wrapper } = getMountedWrapper({ activities: [] })
+    wrapper.vm.isVisible = true
+    await nextTick()
+    await wrapper.vm.loadActivitiesTask.last
+    expect(wrapper.html()).toContain('No activities available for this resource')
+  })
+  it('should show loading spinner when fetching data', async () => {
+    const { wrapper } = getMountedWrapper()
+    wrapper.vm.isVisible = true
+    await nextTick()
+    expect(wrapper.find('#app-loading-spinner').exists()).toBeTruthy()
+  })
+  it('should render a list of activities when data is present', async () => {
+    const { wrapper } = getMountedWrapper()
+    wrapper.vm.isVisible = true
+    await nextTick()
+    await wrapper.vm.loadActivitiesTask.last
+    expect(wrapper.html()).toMatchSnapshot()
+  })
+})
+
+function getMountedWrapper({
+  activities = defaultActivities
+}: {
+  activities?: any[]
+} = {}) {
+  const mocks = {
+    ...defaultComponentMocks()
+  }
+  mocks.$clientService.graphAuthenticated.activities.listActivities.mockResolvedValue({
+    data: { value: activities }
+  } as AxiosResponse<any>)
+
+  return {
+    wrapper: mount(ActivitiesPanel, {
+      global: {
+        mocks,
+        plugins: [...defaultPlugins()],
+        provide: { ...mocks, resource: mock<Resource> }
+      }
+    }),
+    mocks
+  }
+}
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts
index 4cdc0504e3b..6ccc1b7fae7 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.ts
@@ -48,7 +48,7 @@ describe('FileVersions', () => {
     const { wrapper } = getMountedWrapper({ mountType: shallowMount, versions: [] })
     const noVersionsMessageElement = wrapper.find(selectors.noVersionsMessage)
 
-    expect(noVersionsMessageElement.text()).toBe('No Versions available for this file')
+    expect(noVersionsMessageElement.text()).toBe('No versions available for this file')
   })
 
   describe('when the file has versions', () => {
diff --git a/packages/web-app-files/tests/unit/components/SideBar/__snapshots__/ActivitiesPanel.spec.ts.snap b/packages/web-app-files/tests/unit/components/SideBar/__snapshots__/ActivitiesPanel.spec.ts.snap
new file mode 100644
index 00000000000..89c4707072d
--- /dev/null
+++ b/packages/web-app-files/tests/unit/components/SideBar/__snapshots__/ActivitiesPanel.spec.ts.snap
@@ -0,0 +1,15 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`ActivitiesPanel > should render a list of activities when data is present 1`] = `
+"<div>
+  <div class="oc-ml-s">
+    <ul class="timeline">
+      <li><span><strong>Marie Curie</strong> created <strong>new folder</strong>.</span> <span class="oc-text-muted oc-text-small oc-mt-s">Jul 29, 2024, 6:34 PM</span></li>
+      <li><span><strong>Albert Einstein</strong> moved <strong>textfile.txt</strong>.</span> <span class="oc-text-muted oc-text-small oc-mt-s">Jul 29, 2023, 6:34 PM</span></li>
+      <li><span><strong>Robert Oppenheimer</strong> deleted <strong>atom plans.pdf</strong>.</span> <span class="oc-text-muted oc-text-small oc-mt-s">Jul 29, 2022, 6:34 PM</span></li>
+      <li><span><strong>Albert Schweitzer</strong> removed <strong>Selfie.png</strong>.</span> <span class="oc-text-muted oc-text-small oc-mt-s">Jul 29, 2021, 6:34 PM</span></li>
+    </ul>
+    <p class="oc-text-muted oc-text-small">(Showing latest 200 activities)</p>
+  </div>
+</div>"
+`;
diff --git a/packages/web-client/src/graph/generated/.openapi-generator/VERSION b/packages/web-client/src/graph/generated/.openapi-generator/VERSION
index 7f4d792ec2c..08bfd0643b8 100644
--- a/packages/web-client/src/graph/generated/.openapi-generator/VERSION
+++ b/packages/web-client/src/graph/generated/.openapi-generator/VERSION
@@ -1 +1 @@
-6.5.0-SNAPSHOT
\ No newline at end of file
+7.5.0-SNAPSHOT
diff --git a/packages/web-client/src/graph/generated/api.ts b/packages/web-client/src/graph/generated/api.ts
index fa5fb56226d..430ce541e20 100644
--- a/packages/web-client/src/graph/generated/api.ts
+++ b/packages/web-client/src/graph/generated/api.ts
@@ -14,15 +14,72 @@
 
 
 import type { Configuration } from './configuration';
-import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
+import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 // Some imports not used depending on template conditions
 // @ts-ignore
 import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common';
 import type { RequestArgs } from './base';
 // @ts-ignore
-import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError } from './base';
+import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from './base';
 
+/**
+ * Represents activity.
+ * @export
+ * @interface Activity
+ */
+export interface Activity {
+    /**
+     * Activity ID.
+     * @type {string}
+     * @memberof Activity
+     */
+    'id': string;
+    /**
+     * 
+     * @type {ActivityTimes}
+     * @memberof Activity
+     */
+    'times': ActivityTimes;
+    /**
+     * 
+     * @type {ActivityTemplate}
+     * @memberof Activity
+     */
+    'template': ActivityTemplate;
+}
+/**
+ * 
+ * @export
+ * @interface ActivityTemplate
+ */
+export interface ActivityTemplate {
+    /**
+     * Activity description.
+     * @type {string}
+     * @memberof ActivityTemplate
+     */
+    'message': string;
+    /**
+     * Activity description variables.
+     * @type {object}
+     * @memberof ActivityTemplate
+     */
+    'variables'?: object;
+}
+/**
+ * 
+ * @export
+ * @interface ActivityTimes
+ */
+export interface ActivityTimes {
+    /**
+     * Timestamp of the activity.
+     * @type {string}
+     * @memberof ActivityTimes
+     */
+    'recordedTime': string;
+}
 /**
  * 
  * @export
@@ -282,6 +339,19 @@ export interface ClassTeacherReference {
      */
     '@odata.id'?: string;
 }
+/**
+ * 
+ * @export
+ * @interface CollectionOfActivities
+ */
+export interface CollectionOfActivities {
+    /**
+     * 
+     * @type {Array<Activity>}
+     * @memberof CollectionOfActivities
+     */
+    'value'?: Array<Activity>;
+}
 /**
  * 
  * @export
@@ -942,6 +1012,115 @@ export interface DriveRecipient {
      */
     '@libre.graph.recipient.type'?: string;
 }
+/**
+ * The drive represents an update to a space on the storage.
+ * @export
+ * @interface DriveUpdate
+ */
+export interface DriveUpdate {
+    /**
+     * The unique idenfier for this drive.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'id'?: string;
+    /**
+     * 
+     * @type {IdentitySet}
+     * @memberof DriveUpdate
+     */
+    'createdBy'?: IdentitySet;
+    /**
+     * Date and time of item creation. Read-only.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'createdDateTime'?: string;
+    /**
+     * Provides a user-visible description of the item. Optional.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'description'?: string;
+    /**
+     * ETag for the item. Read-only.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'eTag'?: string;
+    /**
+     * 
+     * @type {IdentitySet}
+     * @memberof DriveUpdate
+     */
+    'lastModifiedBy'?: IdentitySet;
+    /**
+     * Date and time the item was last modified. Read-only.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'lastModifiedDateTime'?: string;
+    /**
+     * The name of the item. Read-write.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'name'?: string;
+    /**
+     * 
+     * @type {ItemReference}
+     * @memberof DriveUpdate
+     */
+    'parentReference'?: ItemReference;
+    /**
+     * URL that displays the resource in the browser. Read-only.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'webUrl'?: string;
+    /**
+     * Describes the type of drive represented by this resource. Values are \"personal\" for users home spaces, \"project\", \"virtual\" or \"share\". Read-only.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'driveType'?: string;
+    /**
+     * The drive alias can be used in clients to make the urls user friendly. Example: \'personal/einstein\'. This will be used to resolve to the correct driveID.
+     * @type {string}
+     * @memberof DriveUpdate
+     */
+    'driveAlias'?: string;
+    /**
+     * 
+     * @type {IdentitySet}
+     * @memberof DriveUpdate
+     */
+    'owner'?: IdentitySet;
+    /**
+     * 
+     * @type {Quota}
+     * @memberof DriveUpdate
+     */
+    'quota'?: Quota;
+    /**
+     * All items contained in the drive. Read-only. Nullable.
+     * @type {Array<DriveItem>}
+     * @memberof DriveUpdate
+     */
+    'items'?: Array<DriveItem>;
+    /**
+     * 
+     * @type {DriveItem}
+     * @memberof DriveUpdate
+     */
+    'root'?: DriveItem;
+    /**
+     * A collection of special drive resources.
+     * @type {Array<DriveItem>}
+     * @memberof DriveUpdate
+     */
+    'special'?: Array<DriveItem>;
+}
 /**
  * And extension of group representing a class or course
  * @export
@@ -2357,6 +2536,121 @@ export interface Video {
     'width'?: number;
 }
 
+/**
+ * ActivitiesApi - axios parameter creator
+ * @export
+ */
+export const ActivitiesApiAxiosParamCreator = function (configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary Get activities
+         * @param {string} [kql] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getActivities: async (kql?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/v1beta1/extensions/org.libregraph/activities`;
+            // 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: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
+            if (kql !== undefined) {
+                localVarQueryParameter['kql'] = kql;
+            }
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
+    }
+};
+
+/**
+ * ActivitiesApi - functional programming interface
+ * @export
+ */
+export const ActivitiesApiFp = function(configuration?: Configuration) {
+    const localVarAxiosParamCreator = ActivitiesApiAxiosParamCreator(configuration)
+    return {
+        /**
+         * 
+         * @summary Get activities
+         * @param {string} [kql] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async getActivities(kql?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfActivities>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getActivities(kql, options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['ActivitiesApi.getActivities']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
+        },
+    }
+};
+
+/**
+ * ActivitiesApi - factory interface
+ * @export
+ */
+export const ActivitiesApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    const localVarFp = ActivitiesApiFp(configuration)
+    return {
+        /**
+         * 
+         * @summary Get activities
+         * @param {string} [kql] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getActivities(kql?: string, options?: any): AxiosPromise<CollectionOfActivities> {
+            return localVarFp.getActivities(kql, options).then((request) => request(axios, basePath));
+        },
+    };
+};
+
+/**
+ * ActivitiesApi - object-oriented interface
+ * @export
+ * @class ActivitiesApi
+ * @extends {BaseAPI}
+ */
+export class ActivitiesApi extends BaseAPI {
+    /**
+     * 
+     * @summary Get activities
+     * @param {string} [kql] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ActivitiesApi
+     */
+    public getActivities(kql?: string, options?: RawAxiosRequestConfig) {
+        return ActivitiesApiFp(this.configuration).getActivities(kql, options).then((request) => request(this.axios, this.basePath));
+    }
+}
+
+
+
 /**
  * ApplicationsApi - axios parameter creator
  * @export
@@ -2370,7 +2664,7 @@ export const ApplicationsApiAxiosParamCreator = function (configuration?: Config
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getApplication: async (applicationId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getApplication: async (applicationId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'applicationId' is not null or undefined
             assertParamExists('getApplication', 'applicationId', applicationId)
             const localVarPath = `/v1.0/applications/{application-id}`
@@ -2386,6 +2680,12 @@ export const ApplicationsApiAxiosParamCreator = function (configuration?: Config
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -2403,7 +2703,7 @@ export const ApplicationsApiAxiosParamCreator = function (configuration?: Config
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listApplications: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listApplications: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/applications`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -2416,6 +2716,12 @@ export const ApplicationsApiAxiosParamCreator = function (configuration?: Config
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -2444,9 +2750,11 @@ export const ApplicationsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getApplication(applicationId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Application>> {
+        async getApplication(applicationId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Application>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getApplication(applicationId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['ApplicationsApi.getApplication']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -2454,9 +2762,11 @@ export const ApplicationsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listApplications(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfApplications>> {
+        async listApplications(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfApplications>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listApplications(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['ApplicationsApi.listApplications']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -2505,7 +2815,7 @@ export class ApplicationsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof ApplicationsApi
      */
-    public getApplication(applicationId: string, options?: AxiosRequestConfig) {
+    public getApplication(applicationId: string, options?: RawAxiosRequestConfig) {
         return ApplicationsApiFp(this.configuration).getApplication(applicationId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -2516,12 +2826,13 @@ export class ApplicationsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof ApplicationsApi
      */
-    public listApplications(options?: AxiosRequestConfig) {
+    public listApplications(options?: RawAxiosRequestConfig) {
         return ApplicationsApiFp(this.configuration).listApplications(options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * DriveItemApi - axios parameter creator
  * @export
@@ -2536,7 +2847,7 @@ export const DriveItemApiAxiosParamCreator = function (configuration?: Configura
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteDriveItem: async (driveId: string, itemId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteDriveItem: async (driveId: string, itemId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('deleteDriveItem', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -2555,6 +2866,12 @@ export const DriveItemApiAxiosParamCreator = function (configuration?: Configura
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -2574,7 +2891,7 @@ export const DriveItemApiAxiosParamCreator = function (configuration?: Configura
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getDriveItem: async (driveId: string, itemId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getDriveItem: async (driveId: string, itemId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('getDriveItem', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -2593,6 +2910,12 @@ export const DriveItemApiAxiosParamCreator = function (configuration?: Configura
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -2613,7 +2936,7 @@ export const DriveItemApiAxiosParamCreator = function (configuration?: Configura
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateDriveItem: async (driveId: string, itemId: string, driveItem: DriveItem, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateDriveItem: async (driveId: string, itemId: string, driveItem: DriveItem, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('updateDriveItem', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -2634,6 +2957,12 @@ export const DriveItemApiAxiosParamCreator = function (configuration?: Configura
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -2666,9 +2995,11 @@ export const DriveItemApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteDriveItem(driveId: string, itemId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteDriveItem(driveId: string, itemId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteDriveItem(driveId, itemId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DriveItemApi.deleteDriveItem']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Get a DriveItem by using its ID. 
@@ -2678,9 +3009,11 @@ export const DriveItemApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getDriveItem(driveId: string, itemId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
+        async getDriveItem(driveId: string, itemId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getDriveItem(driveId, itemId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DriveItemApi.getDriveItem']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Update a DriveItem.  The request body must include a JSON object with the properties to update. Only the properties that are provided will be updated.  Currently it supports updating the following properties:  * `@UI.Hidden` - Hides the item from the UI. 
@@ -2691,9 +3024,11 @@ export const DriveItemApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateDriveItem(driveId: string, itemId: string, driveItem: DriveItem, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
+        async updateDriveItem(driveId: string, itemId: string, driveItem: DriveItem, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateDriveItem(driveId, itemId, driveItem, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DriveItemApi.updateDriveItem']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -2758,7 +3093,7 @@ export class DriveItemApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DriveItemApi
      */
-    public deleteDriveItem(driveId: string, itemId: string, options?: AxiosRequestConfig) {
+    public deleteDriveItem(driveId: string, itemId: string, options?: RawAxiosRequestConfig) {
         return DriveItemApiFp(this.configuration).deleteDriveItem(driveId, itemId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -2771,7 +3106,7 @@ export class DriveItemApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DriveItemApi
      */
-    public getDriveItem(driveId: string, itemId: string, options?: AxiosRequestConfig) {
+    public getDriveItem(driveId: string, itemId: string, options?: RawAxiosRequestConfig) {
         return DriveItemApiFp(this.configuration).getDriveItem(driveId, itemId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -2785,12 +3120,13 @@ export class DriveItemApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DriveItemApi
      */
-    public updateDriveItem(driveId: string, itemId: string, driveItem: DriveItem, options?: AxiosRequestConfig) {
+    public updateDriveItem(driveId: string, itemId: string, driveItem: DriveItem, options?: RawAxiosRequestConfig) {
         return DriveItemApiFp(this.configuration).updateDriveItem(driveId, itemId, driveItem, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * DrivesApi - axios parameter creator
  * @export
@@ -2804,7 +3140,7 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createDrive: async (drive: Drive, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createDrive: async (drive: Drive, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'drive' is not null or undefined
             assertParamExists('createDrive', 'drive', drive)
             const localVarPath = `/v1.0/drives`;
@@ -2819,6 +3155,12 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -2841,7 +3183,7 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteDrive: async (driveId: string, ifMatch?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteDrive: async (driveId: string, ifMatch?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('deleteDrive', 'driveId', driveId)
             const localVarPath = `/v1.0/drives/{drive-id}`
@@ -2857,6 +3199,12 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if (ifMatch != null) {
                 localVarHeaderParameter['If-Match'] = String(ifMatch);
             }
@@ -2879,7 +3227,7 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getDrive: async (driveId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getDrive: async (driveId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('getDrive', 'driveId', driveId)
             const localVarPath = `/v1.0/drives/{drive-id}`
@@ -2895,6 +3243,12 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -2910,15 +3264,15 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
          * 
          * @summary Update the drive
          * @param {string} driveId key: id of drive
-         * @param {Drive} drive New space values
+         * @param {DriveUpdate} driveUpdate New space values
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateDrive: async (driveId: string, drive: Drive, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateDrive: async (driveId: string, driveUpdate: DriveUpdate, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('updateDrive', 'driveId', driveId)
-            // verify required parameter 'drive' is not null or undefined
-            assertParamExists('updateDrive', 'drive', drive)
+            // verify required parameter 'driveUpdate' is not null or undefined
+            assertParamExists('updateDrive', 'driveUpdate', driveUpdate)
             const localVarPath = `/v1.0/drives/{drive-id}`
                 .replace(`{${"drive-id"}}`, encodeURIComponent(String(driveId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
@@ -2932,6 +3286,12 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -2939,7 +3299,7 @@ export const DrivesApiAxiosParamCreator = function (configuration?: Configuratio
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(drive, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(driveUpdate, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -2963,9 +3323,11 @@ export const DrivesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createDrive(drive: Drive, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
+        async createDrive(drive: Drive, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createDrive(drive, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesApi.createDrive']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -2975,9 +3337,11 @@ export const DrivesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteDrive(driveId: string, ifMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteDrive(driveId: string, ifMatch?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteDrive(driveId, ifMatch, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesApi.deleteDrive']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -2986,21 +3350,25 @@ export const DrivesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getDrive(driveId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
+        async getDrive(driveId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getDrive(driveId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesApi.getDrive']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
          * @summary Update the drive
          * @param {string} driveId key: id of drive
-         * @param {Drive} drive New space values
+         * @param {DriveUpdate} driveUpdate New space values
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateDrive(driveId: string, drive: Drive, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateDrive(driveId, drive, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        async updateDrive(driveId: string, driveUpdate: DriveUpdate, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.updateDrive(driveId, driveUpdate, options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesApi.updateDrive']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -3047,12 +3415,12 @@ export const DrivesApiFactory = function (configuration?: Configuration, basePat
          * 
          * @summary Update the drive
          * @param {string} driveId key: id of drive
-         * @param {Drive} drive New space values
+         * @param {DriveUpdate} driveUpdate New space values
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateDrive(driveId: string, drive: Drive, options?: any): AxiosPromise<Drive> {
-            return localVarFp.updateDrive(driveId, drive, options).then((request) => request(axios, basePath));
+        updateDrive(driveId: string, driveUpdate: DriveUpdate, options?: any): AxiosPromise<Drive> {
+            return localVarFp.updateDrive(driveId, driveUpdate, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -3072,7 +3440,7 @@ export class DrivesApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesApi
      */
-    public createDrive(drive: Drive, options?: AxiosRequestConfig) {
+    public createDrive(drive: Drive, options?: RawAxiosRequestConfig) {
         return DrivesApiFp(this.configuration).createDrive(drive, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3085,7 +3453,7 @@ export class DrivesApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesApi
      */
-    public deleteDrive(driveId: string, ifMatch?: string, options?: AxiosRequestConfig) {
+    public deleteDrive(driveId: string, ifMatch?: string, options?: RawAxiosRequestConfig) {
         return DrivesApiFp(this.configuration).deleteDrive(driveId, ifMatch, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3097,7 +3465,7 @@ export class DrivesApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesApi
      */
-    public getDrive(driveId: string, options?: AxiosRequestConfig) {
+    public getDrive(driveId: string, options?: RawAxiosRequestConfig) {
         return DrivesApiFp(this.configuration).getDrive(driveId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3105,17 +3473,18 @@ export class DrivesApi extends BaseAPI {
      * 
      * @summary Update the drive
      * @param {string} driveId key: id of drive
-     * @param {Drive} drive New space values
+     * @param {DriveUpdate} driveUpdate New space values
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DrivesApi
      */
-    public updateDrive(driveId: string, drive: Drive, options?: AxiosRequestConfig) {
-        return DrivesApiFp(this.configuration).updateDrive(driveId, drive, options).then((request) => request(this.axios, this.basePath));
+    public updateDrive(driveId: string, driveUpdate: DriveUpdate, options?: RawAxiosRequestConfig) {
+        return DrivesApiFp(this.configuration).updateDrive(driveId, driveUpdate, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * DrivesGetDrivesApi - axios parameter creator
  * @export
@@ -3130,7 +3499,7 @@ export const DrivesGetDrivesApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listAllDrives: async ($orderby?: string, $filter?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listAllDrives: async ($orderby?: string, $filter?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/drives`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -3143,6 +3512,12 @@ export const DrivesGetDrivesApiAxiosParamCreator = function (configuration?: Con
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($orderby !== undefined) {
                 localVarQueryParameter['$orderby'] = $orderby;
             }
@@ -3170,7 +3545,7 @@ export const DrivesGetDrivesApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listAllDrivesBeta: async ($orderby?: string, $filter?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listAllDrivesBeta: async ($orderby?: string, $filter?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1beta1/drives`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -3183,6 +3558,12 @@ export const DrivesGetDrivesApiAxiosParamCreator = function (configuration?: Con
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($orderby !== undefined) {
                 localVarQueryParameter['$orderby'] = $orderby;
             }
@@ -3220,9 +3601,11 @@ export const DrivesGetDrivesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listAllDrives($orderby?: string, $filter?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives1>> {
+        async listAllDrives($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives1>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listAllDrives($orderby, $filter, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesGetDrivesApi.listAllDrives']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -3232,9 +3615,11 @@ export const DrivesGetDrivesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listAllDrivesBeta($orderby?: string, $filter?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives1>> {
+        async listAllDrivesBeta($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives1>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listAllDrivesBeta($orderby, $filter, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesGetDrivesApi.listAllDrivesBeta']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -3287,7 +3672,7 @@ export class DrivesGetDrivesApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesGetDrivesApi
      */
-    public listAllDrives($orderby?: string, $filter?: string, options?: AxiosRequestConfig) {
+    public listAllDrives($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig) {
         return DrivesGetDrivesApiFp(this.configuration).listAllDrives($orderby, $filter, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3300,12 +3685,13 @@ export class DrivesGetDrivesApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesGetDrivesApi
      */
-    public listAllDrivesBeta($orderby?: string, $filter?: string, options?: AxiosRequestConfig) {
+    public listAllDrivesBeta($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig) {
         return DrivesGetDrivesApiFp(this.configuration).listAllDrivesBeta($orderby, $filter, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * DrivesPermissionsApi - axios parameter creator
  * @export
@@ -3321,7 +3707,7 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createLink: async (driveId: string, itemId: string, driveItemCreateLink?: DriveItemCreateLink, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createLink: async (driveId: string, itemId: string, driveItemCreateLink?: DriveItemCreateLink, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('createLink', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -3340,6 +3726,12 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -3363,7 +3755,7 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deletePermission: async (driveId: string, itemId: string, permId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deletePermission: async (driveId: string, itemId: string, permId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('deletePermission', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -3385,6 +3777,12 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -3405,7 +3803,7 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getPermission: async (driveId: string, itemId: string, permId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getPermission: async (driveId: string, itemId: string, permId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('getPermission', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -3427,6 +3825,12 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -3447,7 +3851,7 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        invite: async (driveId: string, itemId: string, driveItemInvite?: DriveItemInvite, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        invite: async (driveId: string, itemId: string, driveItemInvite?: DriveItemInvite, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('invite', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -3466,6 +3870,12 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -3488,7 +3898,7 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listPermissions: async (driveId: string, itemId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listPermissions: async (driveId: string, itemId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('listPermissions', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -3507,6 +3917,12 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -3528,7 +3944,7 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        setPermissionPassword: async (driveId: string, itemId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        setPermissionPassword: async (driveId: string, itemId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('setPermissionPassword', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -3552,6 +3968,12 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -3576,7 +3998,7 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updatePermission: async (driveId: string, itemId: string, permId: string, permission: Permission, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updatePermission: async (driveId: string, itemId: string, permId: string, permission: Permission, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('updatePermission', 'driveId', driveId)
             // verify required parameter 'itemId' is not null or undefined
@@ -3600,6 +4022,12 @@ export const DrivesPermissionsApiAxiosParamCreator = function (configuration?: C
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -3633,9 +4061,11 @@ export const DrivesPermissionsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createLink(driveId: string, itemId: string, driveItemCreateLink?: DriveItemCreateLink, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async createLink(driveId: string, itemId: string, driveItemCreateLink?: DriveItemCreateLink, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createLink(driveId, itemId, driveItemCreateLink, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesPermissionsApi.createLink']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Remove access to a DriveItem.  Only sharing permissions that are not inherited can be deleted. The `inheritedFrom` property must be `null`. 
@@ -3646,9 +4076,11 @@ export const DrivesPermissionsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deletePermission(driveId: string, itemId: string, permId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deletePermission(driveId: string, itemId: string, permId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deletePermission(driveId, itemId, permId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesPermissionsApi.deletePermission']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Return the effective sharing permission for a particular permission resource. 
@@ -3659,9 +4091,11 @@ export const DrivesPermissionsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getPermission(driveId: string, itemId: string, permId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async getPermission(driveId: string, itemId: string, permId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getPermission(driveId, itemId, permId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesPermissionsApi.getPermission']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Sends a sharing invitation for a `driveItem`. A sharing invitation provides permissions to the recipients and optionally sends them an email with a sharing link.  The response will be a permission object with the grantedToV2 property containing the created grant details.  ## Roles property values For now, roles are only identified by a uuid. There are no hardcoded aliases like `read` or `write` because role actions can be completely customized. 
@@ -3672,9 +4106,11 @@ export const DrivesPermissionsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async invite(driveId: string, itemId: string, driveItemInvite?: DriveItemInvite, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissions>> {
+        async invite(driveId: string, itemId: string, driveItemInvite?: DriveItemInvite, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissions>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.invite(driveId, itemId, driveItemInvite, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesPermissionsApi.invite']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * The permissions collection includes potentially sensitive information and may not be available for every caller.  * For the owner of the item, all sharing permissions will be returned. This includes co-owners. * For a non-owner caller, only the sharing permissions that apply to the caller are returned. * Sharing permission properties that contain secrets (e.g. `webUrl`) are only returned for callers that are able to create the sharing permission.  All permission objects have an `id`. A permission representing * a link has the `link` facet filled with details. * a share has the `roles` property set and the `grantedToV2` property filled with the grant recipient details. 
@@ -3684,9 +4120,11 @@ export const DrivesPermissionsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listPermissions(driveId: string, itemId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissionsWithAllowedValues>> {
+        async listPermissions(driveId: string, itemId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissionsWithAllowedValues>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listPermissions(driveId, itemId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesPermissionsApi.listPermissions']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Set the password of a sharing permission.  Only the `password` property can be modified this way. 
@@ -3698,9 +4136,11 @@ export const DrivesPermissionsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async setPermissionPassword(driveId: string, itemId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async setPermissionPassword(driveId: string, itemId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.setPermissionPassword(driveId, itemId, permId, sharingLinkPassword, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesPermissionsApi.setPermissionPassword']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Update the properties of a sharing permission by patching the permission resource.  Only the `roles`, `expirationDateTime` and `password` properties can be modified this way. 
@@ -3712,9 +4152,11 @@ export const DrivesPermissionsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updatePermission(driveId: string, itemId: string, permId: string, permission: Permission, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async updatePermission(driveId: string, itemId: string, permId: string, permission: Permission, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updatePermission(driveId, itemId, permId, permission, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesPermissionsApi.updatePermission']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -3831,7 +4273,7 @@ export class DrivesPermissionsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesPermissionsApi
      */
-    public createLink(driveId: string, itemId: string, driveItemCreateLink?: DriveItemCreateLink, options?: AxiosRequestConfig) {
+    public createLink(driveId: string, itemId: string, driveItemCreateLink?: DriveItemCreateLink, options?: RawAxiosRequestConfig) {
         return DrivesPermissionsApiFp(this.configuration).createLink(driveId, itemId, driveItemCreateLink, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3845,7 +4287,7 @@ export class DrivesPermissionsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesPermissionsApi
      */
-    public deletePermission(driveId: string, itemId: string, permId: string, options?: AxiosRequestConfig) {
+    public deletePermission(driveId: string, itemId: string, permId: string, options?: RawAxiosRequestConfig) {
         return DrivesPermissionsApiFp(this.configuration).deletePermission(driveId, itemId, permId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3859,7 +4301,7 @@ export class DrivesPermissionsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesPermissionsApi
      */
-    public getPermission(driveId: string, itemId: string, permId: string, options?: AxiosRequestConfig) {
+    public getPermission(driveId: string, itemId: string, permId: string, options?: RawAxiosRequestConfig) {
         return DrivesPermissionsApiFp(this.configuration).getPermission(driveId, itemId, permId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3873,7 +4315,7 @@ export class DrivesPermissionsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesPermissionsApi
      */
-    public invite(driveId: string, itemId: string, driveItemInvite?: DriveItemInvite, options?: AxiosRequestConfig) {
+    public invite(driveId: string, itemId: string, driveItemInvite?: DriveItemInvite, options?: RawAxiosRequestConfig) {
         return DrivesPermissionsApiFp(this.configuration).invite(driveId, itemId, driveItemInvite, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3886,7 +4328,7 @@ export class DrivesPermissionsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesPermissionsApi
      */
-    public listPermissions(driveId: string, itemId: string, options?: AxiosRequestConfig) {
+    public listPermissions(driveId: string, itemId: string, options?: RawAxiosRequestConfig) {
         return DrivesPermissionsApiFp(this.configuration).listPermissions(driveId, itemId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3901,7 +4343,7 @@ export class DrivesPermissionsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesPermissionsApi
      */
-    public setPermissionPassword(driveId: string, itemId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: AxiosRequestConfig) {
+    public setPermissionPassword(driveId: string, itemId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: RawAxiosRequestConfig) {
         return DrivesPermissionsApiFp(this.configuration).setPermissionPassword(driveId, itemId, permId, sharingLinkPassword, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -3916,12 +4358,13 @@ export class DrivesPermissionsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesPermissionsApi
      */
-    public updatePermission(driveId: string, itemId: string, permId: string, permission: Permission, options?: AxiosRequestConfig) {
+    public updatePermission(driveId: string, itemId: string, permId: string, permission: Permission, options?: RawAxiosRequestConfig) {
         return DrivesPermissionsApiFp(this.configuration).updatePermission(driveId, itemId, permId, permission, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * DrivesRootApi - axios parameter creator
  * @export
@@ -3936,7 +4379,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createDriveItem: async (driveId: string, driveItem?: DriveItem, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createDriveItem: async (driveId: string, driveItem?: DriveItem, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('createDriveItem', 'driveId', driveId)
             const localVarPath = `/v1beta1/drives/{drive-id}/root/children`
@@ -3952,6 +4395,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -3974,7 +4423,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createLinkSpaceRoot: async (driveId: string, driveItemCreateLink?: DriveItemCreateLink, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createLinkSpaceRoot: async (driveId: string, driveItemCreateLink?: DriveItemCreateLink, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('createLinkSpaceRoot', 'driveId', driveId)
             const localVarPath = `/v1beta1/drives/{drive-id}/root/createLink`
@@ -3990,6 +4439,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -4012,7 +4467,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deletePermissionSpaceRoot: async (driveId: string, permId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deletePermissionSpaceRoot: async (driveId: string, permId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('deletePermissionSpaceRoot', 'driveId', driveId)
             // verify required parameter 'permId' is not null or undefined
@@ -4031,6 +4486,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -4050,7 +4511,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getPermissionSpaceRoot: async (driveId: string, permId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getPermissionSpaceRoot: async (driveId: string, permId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('getPermissionSpaceRoot', 'driveId', driveId)
             // verify required parameter 'permId' is not null or undefined
@@ -4069,6 +4530,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -4087,7 +4554,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getRoot: async (driveId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getRoot: async (driveId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('getRoot', 'driveId', driveId)
             const localVarPath = `/v1.0/drives/{drive-id}/root`
@@ -4103,6 +4570,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -4122,7 +4595,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        inviteSpaceRoot: async (driveId: string, driveItemInvite?: DriveItemInvite, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        inviteSpaceRoot: async (driveId: string, driveItemInvite?: DriveItemInvite, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('inviteSpaceRoot', 'driveId', driveId)
             const localVarPath = `/v1beta1/drives/{drive-id}/root/invite`
@@ -4138,6 +4611,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -4159,7 +4638,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listPermissionsSpaceRoot: async (driveId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listPermissionsSpaceRoot: async (driveId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('listPermissionsSpaceRoot', 'driveId', driveId)
             const localVarPath = `/v1beta1/drives/{drive-id}/root/permissions`
@@ -4175,6 +4654,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -4195,7 +4680,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        setPermissionPasswordSpaceRoot: async (driveId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        setPermissionPasswordSpaceRoot: async (driveId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('setPermissionPasswordSpaceRoot', 'driveId', driveId)
             // verify required parameter 'permId' is not null or undefined
@@ -4216,6 +4701,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -4239,7 +4730,7 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updatePermissionSpaceRoot: async (driveId: string, permId: string, permission: Permission, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updatePermissionSpaceRoot: async (driveId: string, permId: string, permission: Permission, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'driveId' is not null or undefined
             assertParamExists('updatePermissionSpaceRoot', 'driveId', driveId)
             // verify required parameter 'permId' is not null or undefined
@@ -4260,6 +4751,12 @@ export const DrivesRootApiAxiosParamCreator = function (configuration?: Configur
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -4292,9 +4789,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createDriveItem(driveId: string, driveItem?: DriveItem, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
+        async createDriveItem(driveId: string, driveItem?: DriveItem, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createDriveItem(driveId, driveItem, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.createDriveItem']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * You can use the createLink action to share a driveItem via a sharing link.  The response will be a permission object with the link facet containing the created link details.  ## Link types  For now, The following values are allowed for the type parameter.  | Value          | Display name      | Description                                                     | | -------------- | ----------------- | --------------------------------------------------------------- | | view           | View              | Creates a read-only link to the driveItem.                      | | upload         | Upload            | Creates a read-write link to the folder driveItem.              | | edit           | Edit              | Creates a read-write link to the driveItem.                     | | createOnly     | File Drop         | Creates an upload-only link to the folder driveItem.            | | blocksDownload | Secure View       | Creates a read-only link that blocks download to the driveItem. | 
@@ -4304,9 +4803,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createLinkSpaceRoot(driveId: string, driveItemCreateLink?: DriveItemCreateLink, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async createLinkSpaceRoot(driveId: string, driveItemCreateLink?: DriveItemCreateLink, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createLinkSpaceRoot(driveId, driveItemCreateLink, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.createLinkSpaceRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Remove access to the root item of a drive.  Only sharing permissions that are not inherited can be deleted. The `inheritedFrom` property must be `null`. 
@@ -4316,9 +4817,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deletePermissionSpaceRoot(driveId: string, permId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deletePermissionSpaceRoot(driveId: string, permId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deletePermissionSpaceRoot(driveId, permId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.deletePermissionSpaceRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Return the effective sharing permission for a particular permission resource. 
@@ -4328,9 +4831,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getPermissionSpaceRoot(driveId: string, permId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async getPermissionSpaceRoot(driveId: string, permId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getPermissionSpaceRoot(driveId, permId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.getPermissionSpaceRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -4339,9 +4844,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getRoot(driveId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
+        async getRoot(driveId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getRoot(driveId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.getRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Sends a sharing invitation for the root of a `drive`. A sharing invitation provides permissions to the recipients and optionally sends them an email with a sharing link.  The response will be a permission object with the grantedToV2 property containing the created grant details.  ## Roles property values For now, roles are only identified by a uuid. There are no hardcoded aliases like `read` or `write` because role actions can be completely customized. 
@@ -4351,9 +4858,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async inviteSpaceRoot(driveId: string, driveItemInvite?: DriveItemInvite, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissions>> {
+        async inviteSpaceRoot(driveId: string, driveItemInvite?: DriveItemInvite, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissions>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.inviteSpaceRoot(driveId, driveItemInvite, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.inviteSpaceRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * The permissions collection includes potentially sensitive information and may not be available for every caller.  * For the owner of the item, all sharing permissions will be returned. This includes co-owners. * For a non-owner caller, only the sharing permissions that apply to the caller are returned. * Sharing permission properties that contain secrets (e.g. `webUrl`) are only returned for callers that are able to create the sharing permission.  All permission objects have an `id`. A permission representing * a link has the `link` facet filled with details. * a share has the `roles` property set and the `grantedToV2` property filled with the grant recipient details. 
@@ -4362,9 +4871,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listPermissionsSpaceRoot(driveId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissionsWithAllowedValues>> {
+        async listPermissionsSpaceRoot(driveId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfPermissionsWithAllowedValues>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listPermissionsSpaceRoot(driveId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.listPermissionsSpaceRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Set the password of a sharing permission.  Only the `password` property can be modified this way. 
@@ -4375,9 +4886,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async setPermissionPasswordSpaceRoot(driveId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async setPermissionPasswordSpaceRoot(driveId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.setPermissionPasswordSpaceRoot(driveId, permId, sharingLinkPassword, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.setPermissionPasswordSpaceRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Update the properties of a sharing permission by patching the permission resource.  Only the `roles`, `expirationDateTime` and `password` properties can be modified this way. 
@@ -4388,9 +4901,11 @@ export const DrivesRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updatePermissionSpaceRoot(driveId: string, permId: string, permission: Permission, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
+        async updatePermissionSpaceRoot(driveId: string, permId: string, permission: Permission, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Permission>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updatePermissionSpaceRoot(driveId, permId, permission, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['DrivesRootApi.updatePermissionSpaceRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -4520,7 +5035,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public createDriveItem(driveId: string, driveItem?: DriveItem, options?: AxiosRequestConfig) {
+    public createDriveItem(driveId: string, driveItem?: DriveItem, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).createDriveItem(driveId, driveItem, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4533,7 +5048,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public createLinkSpaceRoot(driveId: string, driveItemCreateLink?: DriveItemCreateLink, options?: AxiosRequestConfig) {
+    public createLinkSpaceRoot(driveId: string, driveItemCreateLink?: DriveItemCreateLink, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).createLinkSpaceRoot(driveId, driveItemCreateLink, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4546,7 +5061,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public deletePermissionSpaceRoot(driveId: string, permId: string, options?: AxiosRequestConfig) {
+    public deletePermissionSpaceRoot(driveId: string, permId: string, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).deletePermissionSpaceRoot(driveId, permId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4559,7 +5074,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public getPermissionSpaceRoot(driveId: string, permId: string, options?: AxiosRequestConfig) {
+    public getPermissionSpaceRoot(driveId: string, permId: string, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).getPermissionSpaceRoot(driveId, permId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4571,7 +5086,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public getRoot(driveId: string, options?: AxiosRequestConfig) {
+    public getRoot(driveId: string, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).getRoot(driveId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4584,7 +5099,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public inviteSpaceRoot(driveId: string, driveItemInvite?: DriveItemInvite, options?: AxiosRequestConfig) {
+    public inviteSpaceRoot(driveId: string, driveItemInvite?: DriveItemInvite, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).inviteSpaceRoot(driveId, driveItemInvite, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4596,7 +5111,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public listPermissionsSpaceRoot(driveId: string, options?: AxiosRequestConfig) {
+    public listPermissionsSpaceRoot(driveId: string, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).listPermissionsSpaceRoot(driveId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4610,7 +5125,7 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public setPermissionPasswordSpaceRoot(driveId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: AxiosRequestConfig) {
+    public setPermissionPasswordSpaceRoot(driveId: string, permId: string, sharingLinkPassword: SharingLinkPassword, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).setPermissionPasswordSpaceRoot(driveId, permId, sharingLinkPassword, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -4624,12 +5139,13 @@ export class DrivesRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof DrivesRootApi
      */
-    public updatePermissionSpaceRoot(driveId: string, permId: string, permission: Permission, options?: AxiosRequestConfig) {
+    public updatePermissionSpaceRoot(driveId: string, permId: string, permission: Permission, options?: RawAxiosRequestConfig) {
         return DrivesRootApiFp(this.configuration).updatePermissionSpaceRoot(driveId, permId, permission, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * EducationClassApi - axios parameter creator
  * @export
@@ -4644,7 +5160,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addUserToClass: async (classId: string, classMemberReference: ClassMemberReference, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        addUserToClass: async (classId: string, classMemberReference: ClassMemberReference, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('addUserToClass', 'classId', classId)
             // verify required parameter 'classMemberReference' is not null or undefined
@@ -4687,7 +5203,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createClass: async (educationClass: EducationClass, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createClass: async (educationClass: EducationClass, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'educationClass' is not null or undefined
             assertParamExists('createClass', 'educationClass', educationClass)
             const localVarPath = `/v1.0/education/classes`;
@@ -4727,7 +5243,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteClass: async (classId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteClass: async (classId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('deleteClass', 'classId', classId)
             const localVarPath = `/v1.0/education/classes/{class-id}`
@@ -4766,7 +5282,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteUserFromClass: async (classId: string, userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteUserFromClass: async (classId: string, userId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('deleteUserFromClass', 'classId', classId)
             // verify required parameter 'userId' is not null or undefined
@@ -4807,7 +5323,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getClass: async (classId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getClass: async (classId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('getClass', 'classId', classId)
             const localVarPath = `/v1.0/education/classes/{class-id}`
@@ -4845,7 +5361,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listClassMembers: async (classId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listClassMembers: async (classId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('listClassMembers', 'classId', classId)
             const localVarPath = `/v1.0/education/classes/{class-id}/members`
@@ -4882,7 +5398,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listClasses: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listClasses: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/education/classes`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -4918,7 +5434,7 @@ export const EducationClassApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateClass: async (classId: string, educationClass: EducationClass, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateClass: async (classId: string, educationClass: EducationClass, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('updateClass', 'classId', classId)
             // verify required parameter 'educationClass' is not null or undefined
@@ -4972,9 +5488,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async addUserToClass(classId: string, classMemberReference: ClassMemberReference, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async addUserToClass(classId: string, classMemberReference: ClassMemberReference, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.addUserToClass(classId, classMemberReference, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.addUserToClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -4983,9 +5501,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createClass(educationClass: EducationClass, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationClass>> {
+        async createClass(educationClass: EducationClass, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationClass>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createClass(educationClass, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.createClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -4994,9 +5514,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteClass(classId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteClass(classId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteClass(classId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.deleteClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -5006,9 +5528,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteUserFromClass(classId: string, userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteUserFromClass(classId: string, userId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteUserFromClass(classId, userId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.deleteUserFromClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -5017,9 +5541,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getClass(classId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationClass>> {
+        async getClass(classId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationClass>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getClass(classId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.getClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -5028,9 +5554,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listClassMembers(classId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
+        async listClassMembers(classId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listClassMembers(classId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.listClassMembers']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -5038,9 +5566,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listClasses(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfClass>> {
+        async listClasses(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfClass>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listClasses(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.listClasses']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -5050,9 +5580,11 @@ export const EducationClassApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateClass(classId: string, educationClass: EducationClass, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationClass>> {
+        async updateClass(classId: string, educationClass: EducationClass, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationClass>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateClass(classId, educationClass, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassApi.updateClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -5165,7 +5697,7 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public addUserToClass(classId: string, classMemberReference: ClassMemberReference, options?: AxiosRequestConfig) {
+    public addUserToClass(classId: string, classMemberReference: ClassMemberReference, options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).addUserToClass(classId, classMemberReference, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5177,7 +5709,7 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public createClass(educationClass: EducationClass, options?: AxiosRequestConfig) {
+    public createClass(educationClass: EducationClass, options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).createClass(educationClass, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5189,7 +5721,7 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public deleteClass(classId: string, options?: AxiosRequestConfig) {
+    public deleteClass(classId: string, options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).deleteClass(classId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5202,7 +5734,7 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public deleteUserFromClass(classId: string, userId: string, options?: AxiosRequestConfig) {
+    public deleteUserFromClass(classId: string, userId: string, options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).deleteUserFromClass(classId, userId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5214,7 +5746,7 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public getClass(classId: string, options?: AxiosRequestConfig) {
+    public getClass(classId: string, options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).getClass(classId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5226,7 +5758,7 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public listClassMembers(classId: string, options?: AxiosRequestConfig) {
+    public listClassMembers(classId: string, options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).listClassMembers(classId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5237,7 +5769,7 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public listClasses(options?: AxiosRequestConfig) {
+    public listClasses(options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).listClasses(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5250,12 +5782,13 @@ export class EducationClassApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassApi
      */
-    public updateClass(classId: string, educationClass: EducationClass, options?: AxiosRequestConfig) {
+    public updateClass(classId: string, educationClass: EducationClass, options?: RawAxiosRequestConfig) {
         return EducationClassApiFp(this.configuration).updateClass(classId, educationClass, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * EducationClassTeachersApi - axios parameter creator
  * @export
@@ -5270,7 +5803,7 @@ export const EducationClassTeachersApiAxiosParamCreator = function (configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addTeacherToClass: async (classId: string, classTeacherReference: ClassTeacherReference, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        addTeacherToClass: async (classId: string, classTeacherReference: ClassTeacherReference, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('addTeacherToClass', 'classId', classId)
             // verify required parameter 'classTeacherReference' is not null or undefined
@@ -5314,7 +5847,7 @@ export const EducationClassTeachersApiAxiosParamCreator = function (configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteTeacherFromClass: async (classId: string, userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteTeacherFromClass: async (classId: string, userId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('deleteTeacherFromClass', 'classId', classId)
             // verify required parameter 'userId' is not null or undefined
@@ -5355,7 +5888,7 @@ export const EducationClassTeachersApiAxiosParamCreator = function (configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getTeachers: async (classId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getTeachers: async (classId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'classId' is not null or undefined
             assertParamExists('getTeachers', 'classId', classId)
             const localVarPath = `/v1.0/education/classes/{class-id}/teachers`
@@ -5404,9 +5937,11 @@ export const EducationClassTeachersApiFp = function(configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.addTeacherToClass(classId, classTeacherReference, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassTeachersApi.addTeacherToClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -5416,9 +5951,11 @@ export const EducationClassTeachersApiFp = function(configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteTeacherFromClass(classId: string, userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteTeacherFromClass(classId: string, userId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteTeacherFromClass(classId, userId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassTeachersApi.deleteTeacherFromClass']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -5427,9 +5964,11 @@ export const EducationClassTeachersApiFp = function(configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getTeachers(classId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
+        async getTeachers(classId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getTeachers(classId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationClassTeachersApi.getTeachers']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -5492,7 +6031,7 @@ export class EducationClassTeachersApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassTeachersApi
      */
-    public addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: AxiosRequestConfig) {
+    public addTeacherToClass(classId: string, classTeacherReference: ClassTeacherReference, options?: RawAxiosRequestConfig) {
         return EducationClassTeachersApiFp(this.configuration).addTeacherToClass(classId, classTeacherReference, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5505,7 +6044,7 @@ export class EducationClassTeachersApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassTeachersApi
      */
-    public deleteTeacherFromClass(classId: string, userId: string, options?: AxiosRequestConfig) {
+    public deleteTeacherFromClass(classId: string, userId: string, options?: RawAxiosRequestConfig) {
         return EducationClassTeachersApiFp(this.configuration).deleteTeacherFromClass(classId, userId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -5517,12 +6056,13 @@ export class EducationClassTeachersApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationClassTeachersApi
      */
-    public getTeachers(classId: string, options?: AxiosRequestConfig) {
+    public getTeachers(classId: string, options?: RawAxiosRequestConfig) {
         return EducationClassTeachersApiFp(this.configuration).getTeachers(classId, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * EducationSchoolApi - axios parameter creator
  * @export
@@ -5537,7 +6077,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addClassToSchool: async (schoolId: string, classReference: ClassReference, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        addClassToSchool: async (schoolId: string, classReference: ClassReference, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('addClassToSchool', 'schoolId', schoolId)
             // verify required parameter 'classReference' is not null or undefined
@@ -5581,7 +6121,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addUserToSchool: async (schoolId: string, educationUserReference: EducationUserReference, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        addUserToSchool: async (schoolId: string, educationUserReference: EducationUserReference, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('addUserToSchool', 'schoolId', schoolId)
             // verify required parameter 'educationUserReference' is not null or undefined
@@ -5624,7 +6164,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createSchool: async (educationSchool: EducationSchool, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createSchool: async (educationSchool: EducationSchool, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'educationSchool' is not null or undefined
             assertParamExists('createSchool', 'educationSchool', educationSchool)
             const localVarPath = `/v1.0/education/schools`;
@@ -5665,7 +6205,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteClassFromSchool: async (schoolId: string, classId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteClassFromSchool: async (schoolId: string, classId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('deleteClassFromSchool', 'schoolId', schoolId)
             // verify required parameter 'classId' is not null or undefined
@@ -5706,7 +6246,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteSchool: async (schoolId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteSchool: async (schoolId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('deleteSchool', 'schoolId', schoolId)
             const localVarPath = `/v1.0/education/schools/{school-id}`
@@ -5745,7 +6285,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteUserFromSchool: async (schoolId: string, userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteUserFromSchool: async (schoolId: string, userId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('deleteUserFromSchool', 'schoolId', schoolId)
             // verify required parameter 'userId' is not null or undefined
@@ -5786,7 +6326,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getSchool: async (schoolId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getSchool: async (schoolId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('getSchool', 'schoolId', schoolId)
             const localVarPath = `/v1.0/education/schools/{school-id}`
@@ -5824,7 +6364,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSchoolClasses: async (schoolId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listSchoolClasses: async (schoolId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('listSchoolClasses', 'schoolId', schoolId)
             const localVarPath = `/v1.0/education/schools/{school-id}/classes`
@@ -5862,7 +6402,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSchoolUsers: async (schoolId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listSchoolUsers: async (schoolId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('listSchoolUsers', 'schoolId', schoolId)
             const localVarPath = `/v1.0/education/schools/{school-id}/users`
@@ -5899,7 +6439,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSchools: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listSchools: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/education/schools`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -5935,7 +6475,7 @@ export const EducationSchoolApiAxiosParamCreator = function (configuration?: Con
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateSchool: async (schoolId: string, educationSchool: EducationSchool, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateSchool: async (schoolId: string, educationSchool: EducationSchool, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'schoolId' is not null or undefined
             assertParamExists('updateSchool', 'schoolId', schoolId)
             // verify required parameter 'educationSchool' is not null or undefined
@@ -5989,9 +6529,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async addClassToSchool(schoolId: string, classReference: ClassReference, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async addClassToSchool(schoolId: string, classReference: ClassReference, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.addClassToSchool(schoolId, classReference, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.addClassToSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6001,9 +6543,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async addUserToSchool(schoolId: string, educationUserReference: EducationUserReference, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async addUserToSchool(schoolId: string, educationUserReference: EducationUserReference, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.addUserToSchool(schoolId, educationUserReference, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.addUserToSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6012,9 +6556,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createSchool(educationSchool: EducationSchool, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationSchool>> {
+        async createSchool(educationSchool: EducationSchool, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationSchool>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createSchool(educationSchool, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.createSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6024,9 +6570,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteClassFromSchool(schoolId: string, classId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteClassFromSchool(schoolId: string, classId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteClassFromSchool(schoolId, classId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.deleteClassFromSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Deletes a school. A school can only be delete if it has the terminationDate property set. And if that termination Date is in the past.
@@ -6035,9 +6583,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteSchool(schoolId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteSchool(schoolId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteSchool(schoolId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.deleteSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6047,9 +6597,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteUserFromSchool(schoolId: string, userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteUserFromSchool(schoolId: string, userId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteUserFromSchool(schoolId, userId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.deleteUserFromSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6058,9 +6610,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getSchool(schoolId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationSchool>> {
+        async getSchool(schoolId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationSchool>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getSchool(schoolId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.getSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6069,9 +6623,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSchoolClasses(schoolId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationClass>> {
+        async listSchoolClasses(schoolId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationClass>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listSchoolClasses(schoolId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.listSchoolClasses']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6080,9 +6636,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSchoolUsers(schoolId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
+        async listSchoolUsers(schoolId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listSchoolUsers(schoolId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.listSchoolUsers']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6090,9 +6648,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSchools(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfSchools>> {
+        async listSchools(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfSchools>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listSchools(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.listSchools']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6102,9 +6662,11 @@ export const EducationSchoolApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateSchool(schoolId: string, educationSchool: EducationSchool, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationSchool>> {
+        async updateSchool(schoolId: string, educationSchool: EducationSchool, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationSchool>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateSchool(schoolId, educationSchool, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationSchoolApi.updateSchool']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -6249,7 +6811,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public addClassToSchool(schoolId: string, classReference: ClassReference, options?: AxiosRequestConfig) {
+    public addClassToSchool(schoolId: string, classReference: ClassReference, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).addClassToSchool(schoolId, classReference, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6262,7 +6824,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public addUserToSchool(schoolId: string, educationUserReference: EducationUserReference, options?: AxiosRequestConfig) {
+    public addUserToSchool(schoolId: string, educationUserReference: EducationUserReference, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).addUserToSchool(schoolId, educationUserReference, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6274,7 +6836,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public createSchool(educationSchool: EducationSchool, options?: AxiosRequestConfig) {
+    public createSchool(educationSchool: EducationSchool, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).createSchool(educationSchool, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6287,7 +6849,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public deleteClassFromSchool(schoolId: string, classId: string, options?: AxiosRequestConfig) {
+    public deleteClassFromSchool(schoolId: string, classId: string, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).deleteClassFromSchool(schoolId, classId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6299,7 +6861,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public deleteSchool(schoolId: string, options?: AxiosRequestConfig) {
+    public deleteSchool(schoolId: string, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).deleteSchool(schoolId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6312,7 +6874,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public deleteUserFromSchool(schoolId: string, userId: string, options?: AxiosRequestConfig) {
+    public deleteUserFromSchool(schoolId: string, userId: string, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).deleteUserFromSchool(schoolId, userId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6324,7 +6886,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public getSchool(schoolId: string, options?: AxiosRequestConfig) {
+    public getSchool(schoolId: string, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).getSchool(schoolId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6336,7 +6898,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public listSchoolClasses(schoolId: string, options?: AxiosRequestConfig) {
+    public listSchoolClasses(schoolId: string, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).listSchoolClasses(schoolId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6348,7 +6910,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public listSchoolUsers(schoolId: string, options?: AxiosRequestConfig) {
+    public listSchoolUsers(schoolId: string, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).listSchoolUsers(schoolId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6359,7 +6921,7 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public listSchools(options?: AxiosRequestConfig) {
+    public listSchools(options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).listSchools(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6372,12 +6934,13 @@ export class EducationSchoolApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationSchoolApi
      */
-    public updateSchool(schoolId: string, educationSchool: EducationSchool, options?: AxiosRequestConfig) {
+    public updateSchool(schoolId: string, educationSchool: EducationSchool, options?: RawAxiosRequestConfig) {
         return EducationSchoolApiFp(this.configuration).updateSchool(schoolId, educationSchool, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * EducationUserApi - axios parameter creator
  * @export
@@ -6391,7 +6954,7 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createEducationUser: async (educationUser: EducationUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createEducationUser: async (educationUser: EducationUser, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'educationUser' is not null or undefined
             assertParamExists('createEducationUser', 'educationUser', educationUser)
             const localVarPath = `/v1.0/education/users`;
@@ -6431,7 +6994,7 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteEducationUser: async (userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteEducationUser: async (userId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('deleteEducationUser', 'userId', userId)
             const localVarPath = `/v1.0/education/users/{user-id}`
@@ -6466,11 +7029,11 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi
          * 
          * @summary Get properties of educationUser
          * @param {string} userId key: id or username of user
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<GetEducationUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getEducationUser: async (userId: string, $expand?: Set<'memberOf'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getEducationUser: async (userId: string, $expand?: Set<GetEducationUserExpandEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('getEducationUser', 'userId', userId)
             const localVarPath = `/v1.0/education/users/{user-id}`
@@ -6508,12 +7071,12 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi
         /**
          * 
          * @summary Get entities from education users
-         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<ListEducationUsersOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListEducationUsersExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listEducationUsers: async ($orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $expand?: Set<'memberOf'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listEducationUsers: async ($orderby?: Set<ListEducationUsersOrderbyEnum>, $expand?: Set<ListEducationUsersExpandEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/education/users`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -6557,7 +7120,7 @@ export const EducationUserApiAxiosParamCreator = function (configuration?: Confi
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateEducationUser: async (userId: string, educationUser: EducationUser, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateEducationUser: async (userId: string, educationUser: EducationUser, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('updateEducationUser', 'userId', userId)
             // verify required parameter 'educationUser' is not null or undefined
@@ -6610,9 +7173,11 @@ export const EducationUserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createEducationUser(educationUser: EducationUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationUser>> {
+        async createEducationUser(educationUser: EducationUser, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createEducationUser(educationUser, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationUserApi.createEducationUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6621,33 +7186,39 @@ export const EducationUserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteEducationUser(userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteEducationUser(userId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteEducationUser(userId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationUserApi.deleteEducationUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
          * @summary Get properties of educationUser
          * @param {string} userId key: id or username of user
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<GetEducationUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getEducationUser(userId: string, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationUser>> {
+        async getEducationUser(userId: string, $expand?: Set<GetEducationUserExpandEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getEducationUser(userId, $expand, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationUserApi.getEducationUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
          * @summary Get entities from education users
-         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<ListEducationUsersOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListEducationUsersExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listEducationUsers($orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
+        async listEducationUsers($orderby?: Set<ListEducationUsersOrderbyEnum>, $expand?: Set<ListEducationUsersExpandEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfEducationUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listEducationUsers($orderby, $expand, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationUserApi.listEducationUsers']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -6657,9 +7228,11 @@ export const EducationUserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateEducationUser(userId: string, educationUser: EducationUser, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationUser>> {
+        async updateEducationUser(userId: string, educationUser: EducationUser, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<EducationUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateEducationUser(userId, educationUser, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['EducationUserApi.updateEducationUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -6695,22 +7268,22 @@ export const EducationUserApiFactory = function (configuration?: Configuration,
          * 
          * @summary Get properties of educationUser
          * @param {string} userId key: id or username of user
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<GetEducationUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getEducationUser(userId: string, $expand?: Set<'memberOf'>, options?: any): AxiosPromise<EducationUser> {
+        getEducationUser(userId: string, $expand?: Set<GetEducationUserExpandEnum>, options?: any): AxiosPromise<EducationUser> {
             return localVarFp.getEducationUser(userId, $expand, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get entities from education users
-         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<ListEducationUsersOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListEducationUsersExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listEducationUsers($orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $expand?: Set<'memberOf'>, options?: any): AxiosPromise<CollectionOfEducationUser> {
+        listEducationUsers($orderby?: Set<ListEducationUsersOrderbyEnum>, $expand?: Set<ListEducationUsersExpandEnum>, options?: any): AxiosPromise<CollectionOfEducationUser> {
             return localVarFp.listEducationUsers($orderby, $expand, options).then((request) => request(axios, basePath));
         },
         /**
@@ -6742,7 +7315,7 @@ export class EducationUserApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationUserApi
      */
-    public createEducationUser(educationUser: EducationUser, options?: AxiosRequestConfig) {
+    public createEducationUser(educationUser: EducationUser, options?: RawAxiosRequestConfig) {
         return EducationUserApiFp(this.configuration).createEducationUser(educationUser, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6754,7 +7327,7 @@ export class EducationUserApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationUserApi
      */
-    public deleteEducationUser(userId: string, options?: AxiosRequestConfig) {
+    public deleteEducationUser(userId: string, options?: RawAxiosRequestConfig) {
         return EducationUserApiFp(this.configuration).deleteEducationUser(userId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6762,25 +7335,25 @@ export class EducationUserApi extends BaseAPI {
      * 
      * @summary Get properties of educationUser
      * @param {string} userId key: id or username of user
-     * @param {Set<'memberOf'>} [$expand] Expand related entities
+     * @param {Set<GetEducationUserExpandEnum>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof EducationUserApi
      */
-    public getEducationUser(userId: string, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig) {
+    public getEducationUser(userId: string, $expand?: Set<GetEducationUserExpandEnum>, options?: RawAxiosRequestConfig) {
         return EducationUserApiFp(this.configuration).getEducationUser(userId, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get entities from education users
-     * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-     * @param {Set<'memberOf'>} [$expand] Expand related entities
+     * @param {Set<ListEducationUsersOrderbyEnum>} [$orderby] Order items by property values
+     * @param {Set<ListEducationUsersExpandEnum>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof EducationUserApi
      */
-    public listEducationUsers($orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $expand?: Set<'memberOf'>, options?: AxiosRequestConfig) {
+    public listEducationUsers($orderby?: Set<ListEducationUsersOrderbyEnum>, $expand?: Set<ListEducationUsersExpandEnum>, options?: RawAxiosRequestConfig) {
         return EducationUserApiFp(this.configuration).listEducationUsers($orderby, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -6793,11 +7366,38 @@ export class EducationUserApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof EducationUserApi
      */
-    public updateEducationUser(userId: string, educationUser: EducationUser, options?: AxiosRequestConfig) {
+    public updateEducationUser(userId: string, educationUser: EducationUser, options?: RawAxiosRequestConfig) {
         return EducationUserApiFp(this.configuration).updateEducationUser(userId, educationUser, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const GetEducationUserExpandEnum = {
+    MemberOf: 'memberOf'
+} as const;
+export type GetEducationUserExpandEnum = typeof GetEducationUserExpandEnum[keyof typeof GetEducationUserExpandEnum];
+/**
+ * @export
+ */
+export const ListEducationUsersOrderbyEnum = {
+    DisplayName: 'displayName',
+    DisplayNameDesc: 'displayName desc',
+    Mail: 'mail',
+    MailDesc: 'mail desc',
+    OnPremisesSamAccountName: 'onPremisesSamAccountName',
+    OnPremisesSamAccountNameDesc: 'onPremisesSamAccountName desc'
+} as const;
+export type ListEducationUsersOrderbyEnum = typeof ListEducationUsersOrderbyEnum[keyof typeof ListEducationUsersOrderbyEnum];
+/**
+ * @export
+ */
+export const ListEducationUsersExpandEnum = {
+    MemberOf: 'memberOf'
+} as const;
+export type ListEducationUsersExpandEnum = typeof ListEducationUsersExpandEnum[keyof typeof ListEducationUsersExpandEnum];
+
 
 /**
  * GroupApi - axios parameter creator
@@ -6813,7 +7413,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addMember: async (groupId: string, memberReference: MemberReference, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        addMember: async (groupId: string, memberReference: MemberReference, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'groupId' is not null or undefined
             assertParamExists('addMember', 'groupId', groupId)
             // verify required parameter 'memberReference' is not null or undefined
@@ -6831,6 +7431,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -6853,7 +7459,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteGroup: async (groupId: string, ifMatch?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteGroup: async (groupId: string, ifMatch?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'groupId' is not null or undefined
             assertParamExists('deleteGroup', 'groupId', groupId)
             const localVarPath = `/v1.0/groups/{group-id}`
@@ -6869,6 +7475,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if (ifMatch != null) {
                 localVarHeaderParameter['If-Match'] = String(ifMatch);
             }
@@ -6893,7 +7505,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteMember: async (groupId: string, directoryObjectId: string, ifMatch?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteMember: async (groupId: string, directoryObjectId: string, ifMatch?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'groupId' is not null or undefined
             assertParamExists('deleteMember', 'groupId', groupId)
             // verify required parameter 'directoryObjectId' is not null or undefined
@@ -6912,6 +7524,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if (ifMatch != null) {
                 localVarHeaderParameter['If-Match'] = String(ifMatch);
             }
@@ -6931,12 +7549,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * 
          * @summary Get entity from groups by key
          * @param {string} groupId key: id or name of group
-         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
-         * @param {Set<'members'>} [$expand] Expand related entities
+         * @param {Set<GetGroupSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<GetGroupExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getGroup: async (groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getGroup: async (groupId: string, $select?: Set<GetGroupSelectEnum>, $expand?: Set<GetGroupExpandEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'groupId' is not null or undefined
             assertParamExists('getGroup', 'groupId', groupId)
             const localVarPath = `/v1.0/groups/{group-id}`
@@ -6952,6 +7570,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($select) {
                 localVarQueryParameter['$select'] = Array.from($select).join(COLLECTION_FORMATS.csv);
             }
@@ -6978,7 +7602,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listMembers: async (groupId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listMembers: async (groupId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'groupId' is not null or undefined
             assertParamExists('listMembers', 'groupId', groupId)
             const localVarPath = `/v1.0/groups/{group-id}/members`
@@ -6994,6 +7618,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -7013,7 +7643,7 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateGroup: async (groupId: string, group: Group, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateGroup: async (groupId: string, group: Group, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'groupId' is not null or undefined
             assertParamExists('updateGroup', 'groupId', groupId)
             // verify required parameter 'group' is not null or undefined
@@ -7031,6 +7661,12 @@ export const GroupApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -7063,9 +7699,11 @@ export const GroupApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async addMember(groupId: string, memberReference: MemberReference, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async addMember(groupId: string, memberReference: MemberReference, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.addMember(groupId, memberReference, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupApi.addMember']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -7075,9 +7713,11 @@ export const GroupApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteGroup(groupId: string, ifMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteGroup(groupId: string, ifMatch?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteGroup(groupId, ifMatch, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupApi.deleteGroup']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -7088,22 +7728,26 @@ export const GroupApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteMember(groupId: string, directoryObjectId: string, ifMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteMember(groupId: string, directoryObjectId: string, ifMatch?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteMember(groupId, directoryObjectId, ifMatch, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupApi.deleteMember']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
          * @summary Get entity from groups by key
          * @param {string} groupId key: id or name of group
-         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
-         * @param {Set<'members'>} [$expand] Expand related entities
+         * @param {Set<GetGroupSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<GetGroupExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getGroup(groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Group>> {
+        async getGroup(groupId: string, $select?: Set<GetGroupSelectEnum>, $expand?: Set<GetGroupExpandEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Group>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getGroup(groupId, $select, $expand, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupApi.getGroup']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -7112,9 +7756,11 @@ export const GroupApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listMembers(groupId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfUsers>> {
+        async listMembers(groupId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfUsers>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listMembers(groupId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupApi.listMembers']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -7124,9 +7770,11 @@ export const GroupApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateGroup(groupId: string, group: Group, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async updateGroup(groupId: string, group: Group, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateGroup(groupId, group, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupApi.updateGroup']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -7176,12 +7824,12 @@ export const GroupApiFactory = function (configuration?: Configuration, basePath
          * 
          * @summary Get entity from groups by key
          * @param {string} groupId key: id or name of group
-         * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
-         * @param {Set<'members'>} [$expand] Expand related entities
+         * @param {Set<GetGroupSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<GetGroupExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getGroup(groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise<Group> {
+        getGroup(groupId: string, $select?: Set<GetGroupSelectEnum>, $expand?: Set<GetGroupExpandEnum>, options?: any): AxiosPromise<Group> {
             return localVarFp.getGroup(groupId, $select, $expand, options).then((request) => request(axios, basePath));
         },
         /**
@@ -7224,7 +7872,7 @@ export class GroupApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof GroupApi
      */
-    public addMember(groupId: string, memberReference: MemberReference, options?: AxiosRequestConfig) {
+    public addMember(groupId: string, memberReference: MemberReference, options?: RawAxiosRequestConfig) {
         return GroupApiFp(this.configuration).addMember(groupId, memberReference, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7237,7 +7885,7 @@ export class GroupApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof GroupApi
      */
-    public deleteGroup(groupId: string, ifMatch?: string, options?: AxiosRequestConfig) {
+    public deleteGroup(groupId: string, ifMatch?: string, options?: RawAxiosRequestConfig) {
         return GroupApiFp(this.configuration).deleteGroup(groupId, ifMatch, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7251,7 +7899,7 @@ export class GroupApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof GroupApi
      */
-    public deleteMember(groupId: string, directoryObjectId: string, ifMatch?: string, options?: AxiosRequestConfig) {
+    public deleteMember(groupId: string, directoryObjectId: string, ifMatch?: string, options?: RawAxiosRequestConfig) {
         return GroupApiFp(this.configuration).deleteMember(groupId, directoryObjectId, ifMatch, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7259,13 +7907,13 @@ export class GroupApi extends BaseAPI {
      * 
      * @summary Get entity from groups by key
      * @param {string} groupId key: id or name of group
-     * @param {Set<'id' | 'description' | 'displayName' | 'members'>} [$select] Select properties to be returned
-     * @param {Set<'members'>} [$expand] Expand related entities
+     * @param {Set<GetGroupSelectEnum>} [$select] Select properties to be returned
+     * @param {Set<GetGroupExpandEnum>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof GroupApi
      */
-    public getGroup(groupId: string, $select?: Set<'id' | 'description' | 'displayName' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) {
+    public getGroup(groupId: string, $select?: Set<GetGroupSelectEnum>, $expand?: Set<GetGroupExpandEnum>, options?: RawAxiosRequestConfig) {
         return GroupApiFp(this.configuration).getGroup(groupId, $select, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7277,7 +7925,7 @@ export class GroupApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof GroupApi
      */
-    public listMembers(groupId: string, options?: AxiosRequestConfig) {
+    public listMembers(groupId: string, options?: RawAxiosRequestConfig) {
         return GroupApiFp(this.configuration).listMembers(groupId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7290,11 +7938,29 @@ export class GroupApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof GroupApi
      */
-    public updateGroup(groupId: string, group: Group, options?: AxiosRequestConfig) {
+    public updateGroup(groupId: string, group: Group, options?: RawAxiosRequestConfig) {
         return GroupApiFp(this.configuration).updateGroup(groupId, group, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const GetGroupSelectEnum = {
+    Id: 'id',
+    Description: 'description',
+    DisplayName: 'displayName',
+    Members: 'members'
+} as const;
+export type GetGroupSelectEnum = typeof GetGroupSelectEnum[keyof typeof GetGroupSelectEnum];
+/**
+ * @export
+ */
+export const GetGroupExpandEnum = {
+    Members: 'members'
+} as const;
+export type GetGroupExpandEnum = typeof GetGroupExpandEnum[keyof typeof GetGroupExpandEnum];
+
 
 /**
  * GroupsApi - axios parameter creator
@@ -7309,7 +7975,7 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createGroup: async (group: Group, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createGroup: async (group: Group, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'group' is not null or undefined
             assertParamExists('createGroup', 'group', group)
             const localVarPath = `/v1.0/groups`;
@@ -7324,6 +7990,12 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -7342,13 +8014,13 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio
          * 
          * @summary Get entities from groups
          * @param {string} [$search] Search items by search phrases
-         * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned
-         * @param {Set<'members'>} [$expand] Expand related entities
+         * @param {Set<ListGroupsOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListGroupsSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<ListGroupsExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listGroups: async ($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listGroups: async ($search?: string, $orderby?: Set<ListGroupsOrderbyEnum>, $select?: Set<ListGroupsSelectEnum>, $expand?: Set<ListGroupsExpandEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/groups`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -7361,6 +8033,12 @@ export const GroupsApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($search !== undefined) {
                 localVarQueryParameter['$search'] = $search;
             }
@@ -7405,23 +8083,27 @@ export const GroupsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createGroup(group: Group, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Group>> {
+        async createGroup(group: Group, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Group>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createGroup(group, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupsApi.createGroup']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
          * @summary Get entities from groups
          * @param {string} [$search] Search items by search phrases
-         * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned
-         * @param {Set<'members'>} [$expand] Expand related entities
+         * @param {Set<ListGroupsOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListGroupsSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<ListGroupsExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfGroup>> {
+        async listGroups($search?: string, $orderby?: Set<ListGroupsOrderbyEnum>, $select?: Set<ListGroupsSelectEnum>, $expand?: Set<ListGroupsExpandEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfGroup>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listGroups($search, $orderby, $select, $expand, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['GroupsApi.listGroups']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -7447,13 +8129,13 @@ export const GroupsApiFactory = function (configuration?: Configuration, basePat
          * 
          * @summary Get entities from groups
          * @param {string} [$search] Search items by search phrases
-         * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned
-         * @param {Set<'members'>} [$expand] Expand related entities
+         * @param {Set<ListGroupsOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListGroupsSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<ListGroupsExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: any): AxiosPromise<CollectionOfGroup> {
+        listGroups($search?: string, $orderby?: Set<ListGroupsOrderbyEnum>, $select?: Set<ListGroupsSelectEnum>, $expand?: Set<ListGroupsExpandEnum>, options?: any): AxiosPromise<CollectionOfGroup> {
             return localVarFp.listGroups($search, $orderby, $select, $expand, options).then((request) => request(axios, basePath));
         },
     };
@@ -7474,7 +8156,7 @@ export class GroupsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof GroupsApi
      */
-    public createGroup(group: Group, options?: AxiosRequestConfig) {
+    public createGroup(group: Group, options?: RawAxiosRequestConfig) {
         return GroupsApiFp(this.configuration).createGroup(group, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7482,18 +8164,45 @@ export class GroupsApi extends BaseAPI {
      * 
      * @summary Get entities from groups
      * @param {string} [$search] Search items by search phrases
-     * @param {Set<'displayName' | 'displayName desc'>} [$orderby] Order items by property values
-     * @param {Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>} [$select] Select properties to be returned
-     * @param {Set<'members'>} [$expand] Expand related entities
+     * @param {Set<ListGroupsOrderbyEnum>} [$orderby] Order items by property values
+     * @param {Set<ListGroupsSelectEnum>} [$select] Select properties to be returned
+     * @param {Set<ListGroupsExpandEnum>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof GroupsApi
      */
-    public listGroups($search?: string, $orderby?: Set<'displayName' | 'displayName desc'>, $select?: Set<'id' | 'description' | 'displayName' | 'mail' | 'members'>, $expand?: Set<'members'>, options?: AxiosRequestConfig) {
+    public listGroups($search?: string, $orderby?: Set<ListGroupsOrderbyEnum>, $select?: Set<ListGroupsSelectEnum>, $expand?: Set<ListGroupsExpandEnum>, options?: RawAxiosRequestConfig) {
         return GroupsApiFp(this.configuration).listGroups($search, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const ListGroupsOrderbyEnum = {
+    DisplayName: 'displayName',
+    DisplayNameDesc: 'displayName desc'
+} as const;
+export type ListGroupsOrderbyEnum = typeof ListGroupsOrderbyEnum[keyof typeof ListGroupsOrderbyEnum];
+/**
+ * @export
+ */
+export const ListGroupsSelectEnum = {
+    Id: 'id',
+    Description: 'description',
+    DisplayName: 'displayName',
+    Mail: 'mail',
+    Members: 'members'
+} as const;
+export type ListGroupsSelectEnum = typeof ListGroupsSelectEnum[keyof typeof ListGroupsSelectEnum];
+/**
+ * @export
+ */
+export const ListGroupsExpandEnum = {
+    Members: 'members'
+} as const;
+export type ListGroupsExpandEnum = typeof ListGroupsExpandEnum[keyof typeof ListGroupsExpandEnum];
+
 
 /**
  * MeChangepasswordApi - axios parameter creator
@@ -7508,7 +8217,7 @@ export const MeChangepasswordApiAxiosParamCreator = function (configuration?: Co
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        changeOwnPassword: async (passwordChange: PasswordChange, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        changeOwnPassword: async (passwordChange: PasswordChange, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'passwordChange' is not null or undefined
             assertParamExists('changeOwnPassword', 'passwordChange', passwordChange)
             const localVarPath = `/v1.0/me/changePassword`;
@@ -7523,6 +8232,12 @@ export const MeChangepasswordApiAxiosParamCreator = function (configuration?: Co
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -7554,9 +8269,11 @@ export const MeChangepasswordApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async changeOwnPassword(passwordChange: PasswordChange, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async changeOwnPassword(passwordChange: PasswordChange, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.changeOwnPassword(passwordChange, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeChangepasswordApi.changeOwnPassword']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -7596,12 +8313,13 @@ export class MeChangepasswordApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeChangepasswordApi
      */
-    public changeOwnPassword(passwordChange: PasswordChange, options?: AxiosRequestConfig) {
+    public changeOwnPassword(passwordChange: PasswordChange, options?: RawAxiosRequestConfig) {
         return MeChangepasswordApiFp(this.configuration).changeOwnPassword(passwordChange, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * MeDriveApi - axios parameter creator
  * @export
@@ -7614,7 +8332,7 @@ export const MeDriveApiAxiosParamCreator = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getHome: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getHome: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/me/drive`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -7627,6 +8345,12 @@ export const MeDriveApiAxiosParamCreator = function (configuration?: Configurati
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -7644,7 +8368,7 @@ export const MeDriveApiAxiosParamCreator = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSharedByMe: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listSharedByMe: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1beta1/me/drive/sharedByMe`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -7657,6 +8381,12 @@ export const MeDriveApiAxiosParamCreator = function (configuration?: Configurati
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -7674,7 +8404,7 @@ export const MeDriveApiAxiosParamCreator = function (configuration?: Configurati
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listSharedWithMe: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listSharedWithMe: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1beta1/me/drive/sharedWithMe`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -7687,6 +8417,12 @@ export const MeDriveApiAxiosParamCreator = function (configuration?: Configurati
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -7714,9 +8450,11 @@ export const MeDriveApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getHome(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
+        async getHome(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Drive>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getHome(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeDriveApi.getHome']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * The `driveItems` returned from the `sharedByMe` method always include the `permissions` relation that indicates they are shared items. 
@@ -7724,9 +8462,11 @@ export const MeDriveApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSharedByMe(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDriveItems1>> {
+        async listSharedByMe(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDriveItems1>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listSharedByMe(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeDriveApi.listSharedByMe']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * The `driveItems` returned from the `sharedWithMe` method always include the `remoteItem` facet that indicates they are items from a different drive. 
@@ -7734,9 +8474,11 @@ export const MeDriveApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listSharedWithMe(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDriveItems1>> {
+        async listSharedWithMe(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDriveItems1>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listSharedWithMe(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeDriveApi.listSharedWithMe']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -7792,7 +8534,7 @@ export class MeDriveApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeDriveApi
      */
-    public getHome(options?: AxiosRequestConfig) {
+    public getHome(options?: RawAxiosRequestConfig) {
         return MeDriveApiFp(this.configuration).getHome(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7803,7 +8545,7 @@ export class MeDriveApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeDriveApi
      */
-    public listSharedByMe(options?: AxiosRequestConfig) {
+    public listSharedByMe(options?: RawAxiosRequestConfig) {
         return MeDriveApiFp(this.configuration).listSharedByMe(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -7814,12 +8556,13 @@ export class MeDriveApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeDriveApi
      */
-    public listSharedWithMe(options?: AxiosRequestConfig) {
+    public listSharedWithMe(options?: RawAxiosRequestConfig) {
         return MeDriveApiFp(this.configuration).listSharedWithMe(options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * MeDriveRootApi - axios parameter creator
  * @export
@@ -7832,7 +8575,7 @@ export const MeDriveRootApiAxiosParamCreator = function (configuration?: Configu
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        homeGetRoot: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        homeGetRoot: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/me/drive/root`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -7845,6 +8588,12 @@ export const MeDriveRootApiAxiosParamCreator = function (configuration?: Configu
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -7872,9 +8621,11 @@ export const MeDriveRootApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async homeGetRoot(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
+        async homeGetRoot(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<DriveItem>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.homeGetRoot(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeDriveRootApi.homeGetRoot']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -7912,12 +8663,13 @@ export class MeDriveRootApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeDriveRootApi
      */
-    public homeGetRoot(options?: AxiosRequestConfig) {
+    public homeGetRoot(options?: RawAxiosRequestConfig) {
         return MeDriveRootApiFp(this.configuration).homeGetRoot(options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * MeDriveRootChildrenApi - axios parameter creator
  * @export
@@ -7930,7 +8682,7 @@ export const MeDriveRootChildrenApiAxiosParamCreator = function (configuration?:
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        homeGetChildren: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        homeGetChildren: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/me/drive/root/children`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -7943,6 +8695,12 @@ export const MeDriveRootChildrenApiAxiosParamCreator = function (configuration?:
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -7970,9 +8728,11 @@ export const MeDriveRootChildrenApiFp = function(configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async homeGetChildren(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDriveItems>> {
+        async homeGetChildren(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDriveItems>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.homeGetChildren(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeDriveRootChildrenApi.homeGetChildren']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -8010,12 +8770,13 @@ export class MeDriveRootChildrenApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeDriveRootChildrenApi
      */
-    public homeGetChildren(options?: AxiosRequestConfig) {
+    public homeGetChildren(options?: RawAxiosRequestConfig) {
         return MeDriveRootChildrenApiFp(this.configuration).homeGetChildren(options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * MeDrivesApi - axios parameter creator
  * @export
@@ -8030,7 +8791,7 @@ export const MeDrivesApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listMyDrives: async ($orderby?: string, $filter?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listMyDrives: async ($orderby?: string, $filter?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/me/drives`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8043,6 +8804,12 @@ export const MeDrivesApiAxiosParamCreator = function (configuration?: Configurat
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($orderby !== undefined) {
                 localVarQueryParameter['$orderby'] = $orderby;
             }
@@ -8070,7 +8837,7 @@ export const MeDrivesApiAxiosParamCreator = function (configuration?: Configurat
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listMyDrivesBeta: async ($orderby?: string, $filter?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listMyDrivesBeta: async ($orderby?: string, $filter?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1beta1/me/drives`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8083,6 +8850,12 @@ export const MeDrivesApiAxiosParamCreator = function (configuration?: Configurat
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($orderby !== undefined) {
                 localVarQueryParameter['$orderby'] = $orderby;
             }
@@ -8120,9 +8893,11 @@ export const MeDrivesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listMyDrives($orderby?: string, $filter?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives>> {
+        async listMyDrives($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listMyDrives($orderby, $filter, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeDrivesApi.listMyDrives']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -8132,9 +8907,11 @@ export const MeDrivesApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listMyDrivesBeta($orderby?: string, $filter?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives>> {
+        async listMyDrivesBeta($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfDrives>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listMyDrivesBeta($orderby, $filter, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeDrivesApi.listMyDrivesBeta']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -8187,7 +8964,7 @@ export class MeDrivesApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeDrivesApi
      */
-    public listMyDrives($orderby?: string, $filter?: string, options?: AxiosRequestConfig) {
+    public listMyDrives($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig) {
         return MeDrivesApiFp(this.configuration).listMyDrives($orderby, $filter, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -8200,12 +8977,13 @@ export class MeDrivesApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeDrivesApi
      */
-    public listMyDrivesBeta($orderby?: string, $filter?: string, options?: AxiosRequestConfig) {
+    public listMyDrivesBeta($orderby?: string, $filter?: string, options?: RawAxiosRequestConfig) {
         return MeDrivesApiFp(this.configuration).listMyDrivesBeta($orderby, $filter, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * MeUserApi - axios parameter creator
  * @export
@@ -8215,11 +8993,11 @@ export const MeUserApiAxiosParamCreator = function (configuration?: Configuratio
         /**
          * 
          * @summary Get current user
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<GetOwnUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getOwnUser: async ($expand?: Set<'memberOf'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getOwnUser: async ($expand?: Set<GetOwnUserExpandEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/me`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8232,6 +9010,12 @@ export const MeUserApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($expand) {
                 localVarQueryParameter['$expand'] = Array.from($expand).join(COLLECTION_FORMATS.csv);
             }
@@ -8254,7 +9038,7 @@ export const MeUserApiAxiosParamCreator = function (configuration?: Configuratio
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateOwnUser: async (user?: User, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateOwnUser: async (user?: User, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/me`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8267,6 +9051,12 @@ export const MeUserApiAxiosParamCreator = function (configuration?: Configuratio
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -8294,13 +9084,15 @@ export const MeUserApiFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary Get current user
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<GetOwnUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getOwnUser($expand?: Set<'memberOf'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
+        async getOwnUser($expand?: Set<GetOwnUserExpandEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getOwnUser($expand, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeUserApi.getOwnUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -8309,9 +9101,11 @@ export const MeUserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateOwnUser(user?: User, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
+        async updateOwnUser(user?: User, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateOwnUser(user, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['MeUserApi.updateOwnUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -8326,11 +9120,11 @@ export const MeUserApiFactory = function (configuration?: Configuration, basePat
         /**
          * 
          * @summary Get current user
-         * @param {Set<'memberOf'>} [$expand] Expand related entities
+         * @param {Set<GetOwnUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getOwnUser($expand?: Set<'memberOf'>, options?: any): AxiosPromise<User> {
+        getOwnUser($expand?: Set<GetOwnUserExpandEnum>, options?: any): AxiosPromise<User> {
             return localVarFp.getOwnUser($expand, options).then((request) => request(axios, basePath));
         },
         /**
@@ -8356,12 +9150,12 @@ export class MeUserApi extends BaseAPI {
     /**
      * 
      * @summary Get current user
-     * @param {Set<'memberOf'>} [$expand] Expand related entities
+     * @param {Set<GetOwnUserExpandEnum>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof MeUserApi
      */
-    public getOwnUser($expand?: Set<'memberOf'>, options?: AxiosRequestConfig) {
+    public getOwnUser($expand?: Set<GetOwnUserExpandEnum>, options?: RawAxiosRequestConfig) {
         return MeUserApiFp(this.configuration).getOwnUser($expand, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -8373,11 +9167,19 @@ export class MeUserApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof MeUserApi
      */
-    public updateOwnUser(user?: User, options?: AxiosRequestConfig) {
+    public updateOwnUser(user?: User, options?: RawAxiosRequestConfig) {
         return MeUserApiFp(this.configuration).updateOwnUser(user, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const GetOwnUserExpandEnum = {
+    MemberOf: 'memberOf'
+} as const;
+export type GetOwnUserExpandEnum = typeof GetOwnUserExpandEnum[keyof typeof GetOwnUserExpandEnum];
+
 
 /**
  * RoleManagementApi - axios parameter creator
@@ -8392,7 +9194,7 @@ export const RoleManagementApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getPermissionRoleDefinition: async (roleId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getPermissionRoleDefinition: async (roleId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'roleId' is not null or undefined
             assertParamExists('getPermissionRoleDefinition', 'roleId', roleId)
             const localVarPath = `/v1beta1/roleManagement/permissions/roleDefinitions/{role-id}`
@@ -8408,6 +9210,12 @@ export const RoleManagementApiAxiosParamCreator = function (configuration?: Conf
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -8425,7 +9233,7 @@ export const RoleManagementApiAxiosParamCreator = function (configuration?: Conf
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listPermissionRoleDefinitions: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listPermissionRoleDefinitions: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1beta1/roleManagement/permissions/roleDefinitions`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8438,6 +9246,12 @@ export const RoleManagementApiAxiosParamCreator = function (configuration?: Conf
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -8466,9 +9280,11 @@ export const RoleManagementApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getPermissionRoleDefinition(roleId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UnifiedRoleDefinition>> {
+        async getPermissionRoleDefinition(roleId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UnifiedRoleDefinition>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getPermissionRoleDefinition(roleId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['RoleManagementApi.getPermissionRoleDefinition']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Get a list of `unifiedRoleDefinition` objects for the permissions provider. This list determines the roles that can be selected when creating sharing invites. 
@@ -8476,9 +9292,11 @@ export const RoleManagementApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listPermissionRoleDefinitions(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UnifiedRoleDefinition>> {
+        async listPermissionRoleDefinitions(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UnifiedRoleDefinition>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listPermissionRoleDefinitions(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['RoleManagementApi.listPermissionRoleDefinitions']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -8527,7 +9345,7 @@ export class RoleManagementApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof RoleManagementApi
      */
-    public getPermissionRoleDefinition(roleId: string, options?: AxiosRequestConfig) {
+    public getPermissionRoleDefinition(roleId: string, options?: RawAxiosRequestConfig) {
         return RoleManagementApiFp(this.configuration).getPermissionRoleDefinition(roleId, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -8538,12 +9356,13 @@ export class RoleManagementApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof RoleManagementApi
      */
-    public listPermissionRoleDefinitions(options?: AxiosRequestConfig) {
+    public listPermissionRoleDefinitions(options?: RawAxiosRequestConfig) {
         return RoleManagementApiFp(this.configuration).listPermissionRoleDefinitions(options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * TagsApi - axios parameter creator
  * @export
@@ -8557,7 +9376,7 @@ export const TagsApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        assignTags: async (tagAssignment?: TagAssignment, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        assignTags: async (tagAssignment?: TagAssignment, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/extensions/org.libregraph/tags`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8570,6 +9389,12 @@ export const TagsApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -8590,7 +9415,7 @@ export const TagsApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getTags: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getTags: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/extensions/org.libregraph/tags`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8603,6 +9428,12 @@ export const TagsApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -8621,7 +9452,7 @@ export const TagsApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        unassignTags: async (tagUnassignment?: TagUnassignment, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        unassignTags: async (tagUnassignment?: TagUnassignment, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/extensions/org.libregraph/tags`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -8634,6 +9465,12 @@ export const TagsApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -8665,9 +9502,11 @@ export const TagsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async assignTags(tagAssignment?: TagAssignment, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async assignTags(tagAssignment?: TagAssignment, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.assignTags(tagAssignment, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['TagsApi.assignTags']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -8675,9 +9514,11 @@ export const TagsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getTags(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfTags>> {
+        async getTags(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfTags>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getTags(options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['TagsApi.getTags']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -8686,9 +9527,11 @@ export const TagsApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async unassignTags(tagUnassignment?: TagUnassignment, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async unassignTags(tagUnassignment?: TagUnassignment, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.unassignTags(tagUnassignment, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['TagsApi.unassignTags']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -8747,7 +9590,7 @@ export class TagsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof TagsApi
      */
-    public assignTags(tagAssignment?: TagAssignment, options?: AxiosRequestConfig) {
+    public assignTags(tagAssignment?: TagAssignment, options?: RawAxiosRequestConfig) {
         return TagsApiFp(this.configuration).assignTags(tagAssignment, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -8758,7 +9601,7 @@ export class TagsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof TagsApi
      */
-    public getTags(options?: AxiosRequestConfig) {
+    public getTags(options?: RawAxiosRequestConfig) {
         return TagsApiFp(this.configuration).getTags(options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -8770,12 +9613,13 @@ export class TagsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof TagsApi
      */
-    public unassignTags(tagUnassignment?: TagUnassignment, options?: AxiosRequestConfig) {
+    public unassignTags(tagUnassignment?: TagUnassignment, options?: RawAxiosRequestConfig) {
         return TagsApiFp(this.configuration).unassignTags(tagUnassignment, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * UserApi - axios parameter creator
  * @export
@@ -8790,7 +9634,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        deleteUser: async (userId: string, ifMatch?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        deleteUser: async (userId: string, ifMatch?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('deleteUser', 'userId', userId)
             const localVarPath = `/v1.0/users/{user-id}`
@@ -8806,6 +9650,12 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if (ifMatch != null) {
                 localVarHeaderParameter['If-Match'] = String(ifMatch);
             }
@@ -8829,7 +9679,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        exportPersonalData: async (userId: string, exportPersonalDataRequest?: ExportPersonalDataRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        exportPersonalData: async (userId: string, exportPersonalDataRequest?: ExportPersonalDataRequest, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('exportPersonalData', 'userId', userId)
             const localVarPath = `/v1.0/users/{user-id}/exportPersonalData`
@@ -8845,6 +9695,12 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -8863,12 +9719,12 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
          * 
          * @summary Get entity from users by key
          * @param {string} userId key: id or name of user
-         * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-         * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+         * @param {Set<GetUserSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<GetUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getUser: async (userId: string, $select?: Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getUser: async (userId: string, $select?: Set<GetUserSelectEnum>, $expand?: Set<GetUserExpandEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('getUser', 'userId', userId)
             const localVarPath = `/v1.0/users/{user-id}`
@@ -8884,6 +9740,12 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($select) {
                 localVarQueryParameter['$select'] = Array.from($select).join(COLLECTION_FORMATS.csv);
             }
@@ -8911,7 +9773,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateUser: async (userId: string, user: User, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        updateUser: async (userId: string, user: User, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('updateUser', 'userId', userId)
             // verify required parameter 'user' is not null or undefined
@@ -8929,6 +9791,12 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -8961,9 +9829,11 @@ export const UserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async deleteUser(userId: string, ifMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async deleteUser(userId: string, ifMatch?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.deleteUser(userId, ifMatch, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UserApi.deleteUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -8973,22 +9843,26 @@ export const UserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async exportPersonalData(userId: string, exportPersonalDataRequest?: ExportPersonalDataRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async exportPersonalData(userId: string, exportPersonalDataRequest?: ExportPersonalDataRequest, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.exportPersonalData(userId, exportPersonalDataRequest, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UserApi.exportPersonalData']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
          * @summary Get entity from users by key
          * @param {string} userId key: id or name of user
-         * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-         * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+         * @param {Set<GetUserSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<GetUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getUser(userId: string, $select?: Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
+        async getUser(userId: string, $select?: Set<GetUserSelectEnum>, $expand?: Set<GetUserExpandEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.getUser(userId, $select, $expand, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UserApi.getUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -8998,9 +9872,11 @@ export const UserApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateUser(userId: string, user: User, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
+        async updateUser(userId: string, user: User, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.updateUser(userId, user, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UserApi.updateUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -9038,12 +9914,12 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
          * 
          * @summary Get entity from users by key
          * @param {string} userId key: id or name of user
-         * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-         * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+         * @param {Set<GetUserSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<GetUserExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getUser(userId: string, $select?: Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: any): AxiosPromise<User> {
+        getUser(userId: string, $select?: Set<GetUserSelectEnum>, $expand?: Set<GetUserExpandEnum>, options?: any): AxiosPromise<User> {
             return localVarFp.getUser(userId, $select, $expand, options).then((request) => request(axios, basePath));
         },
         /**
@@ -9076,7 +9952,7 @@ export class UserApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof UserApi
      */
-    public deleteUser(userId: string, ifMatch?: string, options?: AxiosRequestConfig) {
+    public deleteUser(userId: string, ifMatch?: string, options?: RawAxiosRequestConfig) {
         return UserApiFp(this.configuration).deleteUser(userId, ifMatch, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -9089,7 +9965,7 @@ export class UserApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof UserApi
      */
-    public exportPersonalData(userId: string, exportPersonalDataRequest?: ExportPersonalDataRequest, options?: AxiosRequestConfig) {
+    public exportPersonalData(userId: string, exportPersonalDataRequest?: ExportPersonalDataRequest, options?: RawAxiosRequestConfig) {
         return UserApiFp(this.configuration).exportPersonalData(userId, exportPersonalDataRequest, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -9097,13 +9973,13 @@ export class UserApi extends BaseAPI {
      * 
      * @summary Get entity from users by key
      * @param {string} userId key: id or name of user
-     * @param {Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-     * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+     * @param {Set<GetUserSelectEnum>} [$select] Select properties to be returned
+     * @param {Set<GetUserExpandEnum>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof UserApi
      */
-    public getUser(userId: string, $select?: Set<'id' | 'displayName' | 'drive' | 'drives' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig) {
+    public getUser(userId: string, $select?: Set<GetUserSelectEnum>, $expand?: Set<GetUserExpandEnum>, options?: RawAxiosRequestConfig) {
         return UserApiFp(this.configuration).getUser(userId, $select, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -9116,11 +9992,36 @@ export class UserApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof UserApi
      */
-    public updateUser(userId: string, user: User, options?: AxiosRequestConfig) {
+    public updateUser(userId: string, user: User, options?: RawAxiosRequestConfig) {
         return UserApiFp(this.configuration).updateUser(userId, user, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const GetUserSelectEnum = {
+    Id: 'id',
+    DisplayName: 'displayName',
+    Drive: 'drive',
+    Drives: 'drives',
+    Mail: 'mail',
+    MemberOf: 'memberOf',
+    OnPremisesSamAccountName: 'onPremisesSamAccountName',
+    Surname: 'surname'
+} as const;
+export type GetUserSelectEnum = typeof GetUserSelectEnum[keyof typeof GetUserSelectEnum];
+/**
+ * @export
+ */
+export const GetUserExpandEnum = {
+    Drive: 'drive',
+    Drives: 'drives',
+    MemberOf: 'memberOf',
+    AppRoleAssignments: 'appRoleAssignments'
+} as const;
+export type GetUserExpandEnum = typeof GetUserExpandEnum[keyof typeof GetUserExpandEnum];
+
 
 /**
  * UserAppRoleAssignmentApi - axios parameter creator
@@ -9136,7 +10037,7 @@ export const UserAppRoleAssignmentApiAxiosParamCreator = function (configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        userCreateAppRoleAssignments: async (userId: string, appRoleAssignment: AppRoleAssignment, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        userCreateAppRoleAssignments: async (userId: string, appRoleAssignment: AppRoleAssignment, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('userCreateAppRoleAssignments', 'userId', userId)
             // verify required parameter 'appRoleAssignment' is not null or undefined
@@ -9154,6 +10055,12 @@ export const UserAppRoleAssignmentApiAxiosParamCreator = function (configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -9177,7 +10084,7 @@ export const UserAppRoleAssignmentApiAxiosParamCreator = function (configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        userDeleteAppRoleAssignments: async (userId: string, appRoleAssignmentId: string, ifMatch?: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        userDeleteAppRoleAssignments: async (userId: string, appRoleAssignmentId: string, ifMatch?: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('userDeleteAppRoleAssignments', 'userId', userId)
             // verify required parameter 'appRoleAssignmentId' is not null or undefined
@@ -9196,6 +10103,12 @@ export const UserAppRoleAssignmentApiAxiosParamCreator = function (configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if (ifMatch != null) {
                 localVarHeaderParameter['If-Match'] = String(ifMatch);
             }
@@ -9218,7 +10131,7 @@ export const UserAppRoleAssignmentApiAxiosParamCreator = function (configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        userListAppRoleAssignments: async (userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        userListAppRoleAssignments: async (userId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'userId' is not null or undefined
             assertParamExists('userListAppRoleAssignments', 'userId', userId)
             const localVarPath = `/v1.0/users/{user-id}/appRoleAssignments`
@@ -9234,6 +10147,12 @@ export const UserAppRoleAssignmentApiAxiosParamCreator = function (configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -9263,9 +10182,11 @@ export const UserAppRoleAssignmentApiFp = function(configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async userCreateAppRoleAssignments(userId: string, appRoleAssignment: AppRoleAssignment, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AppRoleAssignment>> {
+        async userCreateAppRoleAssignments(userId: string, appRoleAssignment: AppRoleAssignment, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AppRoleAssignment>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.userCreateAppRoleAssignments(userId, appRoleAssignment, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UserAppRoleAssignmentApi.userCreateAppRoleAssignments']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
@@ -9276,9 +10197,11 @@ export const UserAppRoleAssignmentApiFp = function(configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async userDeleteAppRoleAssignments(userId: string, appRoleAssignmentId: string, ifMatch?: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async userDeleteAppRoleAssignments(userId: string, appRoleAssignmentId: string, ifMatch?: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.userDeleteAppRoleAssignments(userId, appRoleAssignmentId, ifMatch, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UserAppRoleAssignmentApi.userDeleteAppRoleAssignments']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * Represents the global roles a user has been granted for an application.
@@ -9287,9 +10210,11 @@ export const UserAppRoleAssignmentApiFp = function(configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async userListAppRoleAssignments(userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfAppRoleAssignments>> {
+        async userListAppRoleAssignments(userId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfAppRoleAssignments>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.userListAppRoleAssignments(userId, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UserAppRoleAssignmentApi.userListAppRoleAssignments']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -9353,7 +10278,7 @@ export class UserAppRoleAssignmentApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof UserAppRoleAssignmentApi
      */
-    public userCreateAppRoleAssignments(userId: string, appRoleAssignment: AppRoleAssignment, options?: AxiosRequestConfig) {
+    public userCreateAppRoleAssignments(userId: string, appRoleAssignment: AppRoleAssignment, options?: RawAxiosRequestConfig) {
         return UserAppRoleAssignmentApiFp(this.configuration).userCreateAppRoleAssignments(userId, appRoleAssignment, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -9367,7 +10292,7 @@ export class UserAppRoleAssignmentApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof UserAppRoleAssignmentApi
      */
-    public userDeleteAppRoleAssignments(userId: string, appRoleAssignmentId: string, ifMatch?: string, options?: AxiosRequestConfig) {
+    public userDeleteAppRoleAssignments(userId: string, appRoleAssignmentId: string, ifMatch?: string, options?: RawAxiosRequestConfig) {
         return UserAppRoleAssignmentApiFp(this.configuration).userDeleteAppRoleAssignments(userId, appRoleAssignmentId, ifMatch, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -9379,12 +10304,13 @@ export class UserAppRoleAssignmentApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof UserAppRoleAssignmentApi
      */
-    public userListAppRoleAssignments(userId: string, options?: AxiosRequestConfig) {
+    public userListAppRoleAssignments(userId: string, options?: RawAxiosRequestConfig) {
         return UserAppRoleAssignmentApiFp(this.configuration).userListAppRoleAssignments(userId, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
 
+
 /**
  * UsersApi - axios parameter creator
  * @export
@@ -9398,7 +10324,7 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createUser: async (user: User, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        createUser: async (user: User, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'user' is not null or undefined
             assertParamExists('createUser', 'user', user)
             const localVarPath = `/v1.0/users`;
@@ -9413,6 +10339,12 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
 
     
             localVarHeaderParameter['Content-Type'] = 'application/json';
@@ -9432,13 +10364,13 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration
          * @summary Get entities from users
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter users by property values and relationship attributes
-         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-         * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+         * @param {Set<ListUsersOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListUsersSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<ListUsersExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUsers: async ($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listUsers: async ($search?: string, $filter?: string, $orderby?: Set<ListUsersOrderbyEnum>, $select?: Set<ListUsersSelectEnum>, $expand?: Set<ListUsersExpandEnum>, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/v1.0/users`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -9451,6 +10383,12 @@ export const UsersApiAxiosParamCreator = function (configuration?: Configuration
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            // authentication openId required
+
+            // authentication basicAuth required
+            // http basic authentication required
+            setBasicAuthToObject(localVarRequestOptions, configuration)
+
             if ($search !== undefined) {
                 localVarQueryParameter['$search'] = $search;
             }
@@ -9499,24 +10437,28 @@ export const UsersApiFp = function(configuration?: Configuration) {
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async createUser(user: User, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
+        async createUser(user: User, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<User>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.createUser(user, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UsersApi.createUser']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
          * 
          * @summary Get entities from users
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter users by property values and relationship attributes
-         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-         * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+         * @param {Set<ListUsersOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListUsersSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<ListUsersExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfUser>> {
+        async listUsers($search?: string, $filter?: string, $orderby?: Set<ListUsersOrderbyEnum>, $select?: Set<ListUsersSelectEnum>, $expand?: Set<ListUsersExpandEnum>, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<CollectionOfUser>> {
             const localVarAxiosArgs = await localVarAxiosParamCreator.listUsers($search, $filter, $orderby, $select, $expand, options);
-            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['UsersApi.listUsers']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
 };
@@ -9543,13 +10485,13 @@ export const UsersApiFactory = function (configuration?: Configuration, basePath
          * @summary Get entities from users
          * @param {string} [$search] Search items by search phrases
          * @param {string} [$filter] Filter users by property values and relationship attributes
-         * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-         * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-         * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+         * @param {Set<ListUsersOrderbyEnum>} [$orderby] Order items by property values
+         * @param {Set<ListUsersSelectEnum>} [$select] Select properties to be returned
+         * @param {Set<ListUsersExpandEnum>} [$expand] Expand related entities
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: any): AxiosPromise<CollectionOfUser> {
+        listUsers($search?: string, $filter?: string, $orderby?: Set<ListUsersOrderbyEnum>, $select?: Set<ListUsersSelectEnum>, $expand?: Set<ListUsersExpandEnum>, options?: any): AxiosPromise<CollectionOfUser> {
             return localVarFp.listUsers($search, $filter, $orderby, $select, $expand, options).then((request) => request(axios, basePath));
         },
     };
@@ -9570,7 +10512,7 @@ export class UsersApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof UsersApi
      */
-    public createUser(user: User, options?: AxiosRequestConfig) {
+    public createUser(user: User, options?: RawAxiosRequestConfig) {
         return UsersApiFp(this.configuration).createUser(user, options).then((request) => request(this.axios, this.basePath));
     }
 
@@ -9579,16 +10521,51 @@ export class UsersApi extends BaseAPI {
      * @summary Get entities from users
      * @param {string} [$search] Search items by search phrases
      * @param {string} [$filter] Filter users by property values and relationship attributes
-     * @param {Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>} [$orderby] Order items by property values
-     * @param {Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>} [$select] Select properties to be returned
-     * @param {Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>} [$expand] Expand related entities
+     * @param {Set<ListUsersOrderbyEnum>} [$orderby] Order items by property values
+     * @param {Set<ListUsersSelectEnum>} [$select] Select properties to be returned
+     * @param {Set<ListUsersExpandEnum>} [$expand] Expand related entities
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof UsersApi
      */
-    public listUsers($search?: string, $filter?: string, $orderby?: Set<'displayName' | 'displayName desc' | 'mail' | 'mail desc' | 'onPremisesSamAccountName' | 'onPremisesSamAccountName desc'>, $select?: Set<'id' | 'displayName' | 'mail' | 'memberOf' | 'onPremisesSamAccountName' | 'surname'>, $expand?: Set<'drive' | 'drives' | 'memberOf' | 'appRoleAssignments'>, options?: AxiosRequestConfig) {
+    public listUsers($search?: string, $filter?: string, $orderby?: Set<ListUsersOrderbyEnum>, $select?: Set<ListUsersSelectEnum>, $expand?: Set<ListUsersExpandEnum>, options?: RawAxiosRequestConfig) {
         return UsersApiFp(this.configuration).listUsers($search, $filter, $orderby, $select, $expand, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
+/**
+ * @export
+ */
+export const ListUsersOrderbyEnum = {
+    DisplayName: 'displayName',
+    DisplayNameDesc: 'displayName desc',
+    Mail: 'mail',
+    MailDesc: 'mail desc',
+    OnPremisesSamAccountName: 'onPremisesSamAccountName',
+    OnPremisesSamAccountNameDesc: 'onPremisesSamAccountName desc'
+} as const;
+export type ListUsersOrderbyEnum = typeof ListUsersOrderbyEnum[keyof typeof ListUsersOrderbyEnum];
+/**
+ * @export
+ */
+export const ListUsersSelectEnum = {
+    Id: 'id',
+    DisplayName: 'displayName',
+    Mail: 'mail',
+    MemberOf: 'memberOf',
+    OnPremisesSamAccountName: 'onPremisesSamAccountName',
+    Surname: 'surname'
+} as const;
+export type ListUsersSelectEnum = typeof ListUsersSelectEnum[keyof typeof ListUsersSelectEnum];
+/**
+ * @export
+ */
+export const ListUsersExpandEnum = {
+    Drive: 'drive',
+    Drives: 'drives',
+    MemberOf: 'memberOf',
+    AppRoleAssignments: 'appRoleAssignments'
+} as const;
+export type ListUsersExpandEnum = typeof ListUsersExpandEnum[keyof typeof ListUsersExpandEnum];
+
 
diff --git a/packages/web-client/src/graph/generated/base.ts b/packages/web-client/src/graph/generated/base.ts
index ed106d2435c..70b60da6fc8 100644
--- a/packages/web-client/src/graph/generated/base.ts
+++ b/packages/web-client/src/graph/generated/base.ts
@@ -16,7 +16,7 @@
 import type { Configuration } from './configuration';
 // Some imports not used depending on template conditions
 // @ts-ignore
-import type { AxiosPromise, AxiosInstance, AxiosRequestConfig } from 'axios';
+import type { AxiosPromise, AxiosInstance, RawAxiosRequestConfig } from 'axios';
 import globalAxios from 'axios';
 
 export const BASE_PATH = "https://ocis.ocis-traefik.latest.owncloud.works/graph".replace(/\/+$/, "");
@@ -39,7 +39,7 @@ export const COLLECTION_FORMATS = {
  */
 export interface RequestArgs {
     url: string;
-    options: AxiosRequestConfig;
+    options: RawAxiosRequestConfig;
 }
 
 /**
@@ -53,7 +53,7 @@ export class BaseAPI {
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
         if (configuration) {
             this.configuration = configuration;
-            this.basePath = configuration.basePath || this.basePath;
+            this.basePath = configuration.basePath ?? basePath;
         }
     }
 };
@@ -70,3 +70,17 @@ export class RequiredError extends Error {
         this.name = "RequiredError"
     }
 }
+
+interface ServerMap {
+    [key: string]: {
+        url: string,
+        description: string,
+    }[];
+}
+
+/**
+ *
+ * @export
+ */
+export const operationServerMap: ServerMap = {
+}
diff --git a/packages/web-client/src/graph/generated/common.ts b/packages/web-client/src/graph/generated/common.ts
index 283361a0af9..cf26d5f353b 100644
--- a/packages/web-client/src/graph/generated/common.ts
+++ b/packages/web-client/src/graph/generated/common.ts
@@ -126,10 +126,50 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? value : {})
+        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
         : (value || "");
 }
 
+function convertMapsAndSetsToPlain(value: any): any {
+    if (typeof Set === "undefined") return value;
+    if (typeof Map === "undefined") return value;
+    if (typeof value !== "object" || !value) {
+        return value;
+    }
+    if (value instanceof Set) {
+        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
+    }
+    if (value instanceof Map) {
+        const entries: Array<[string, any]> = [];
+        value.forEach((value: any, key: any) => {
+            entries.push([key, convertMapsAndSetsToPlain(value)])
+        });
+        return objectFromEntries(entries);
+    }
+    if (Array.isArray(value)) {
+        return value.map(it => convertMapsAndSetsToPlain(it));
+    }
+    return objectFromEntries(objectEntries(value)
+        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+}
+
+/**
+ * Ponyfill for Object.entries
+ */
+function objectEntries(object: Record<string, any>): Array<[string, any]> {
+    return Object.keys(object).map(key => [key, object[key]]);
+}
+
+/**
+ * Ponyfill for Object.fromEntries
+ */
+function objectFromEntries(entries: any): Record<string, any> {
+    return [...entries].reduce((object, [key, val]) => {
+        object[key] = val;
+        return object;
+    }, {});
+}
+
 /**
  *
  * @export
@@ -144,7 +184,7 @@ export const toPathString = function (url: URL) {
  */
 export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
     return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
-        const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
+        const axiosRequestArgs = {...axiosArgs.options, url: (axios.defaults.baseURL ? '' : configuration?.basePath ?? basePath) + axiosArgs.url};
         return axios.request<T, R>(axiosRequestArgs);
     };
 }
diff --git a/packages/web-client/src/graph/generated/configuration.ts b/packages/web-client/src/graph/generated/configuration.ts
index 7ed7d8e0b03..028ff713bc2 100644
--- a/packages/web-client/src/graph/generated/configuration.ts
+++ b/packages/web-client/src/graph/generated/configuration.ts
@@ -19,6 +19,7 @@ export interface ConfigurationParameters {
     password?: string;
     accessToken?: string | Promise<string> | ((name?: string, scopes?: string[]) => string) | ((name?: string, scopes?: string[]) => Promise<string>);
     basePath?: string;
+    serverIndex?: number;
     baseOptions?: any;
     formDataCtor?: new () => any;
 }
@@ -58,6 +59,13 @@ export class Configuration {
      * @memberof Configuration
      */
     basePath?: string;
+    /**
+     * override server index
+     *
+     * @type {number}
+     * @memberof Configuration
+     */
+    serverIndex?: number;
     /**
      * base options for axios calls
      *
@@ -80,6 +88,7 @@ export class Configuration {
         this.password = param.password;
         this.accessToken = param.accessToken;
         this.basePath = param.basePath;
+        this.serverIndex = param.serverIndex;
         this.baseOptions = param.baseOptions;
         this.formDataCtor = param.formDataCtor;
     }
diff --git a/packages/web-client/src/graph/index.ts b/packages/web-client/src/graph/index.ts
index 97a5296c50c..ed1f1c1ccdf 100644
--- a/packages/web-client/src/graph/index.ts
+++ b/packages/web-client/src/graph/index.ts
@@ -25,7 +25,9 @@ import {
   DriveItemInvite,
   SharingLinkPassword,
   CollectionOfPermissions,
-  CollectionOfPermissionsWithAllowedValues
+  CollectionOfPermissionsWithAllowedValues,
+  ActivitiesApiFactory,
+  CollectionOfActivities
 } from './generated'
 import { type GraphUsers, UsersFactory } from './users'
 import { type GraphGroups, GroupsFactory } from './groups'
@@ -114,6 +116,9 @@ export interface Graph {
       sharingLinkPassword: SharingLinkPassword
     ) => AxiosPromise<Permission>
   }
+  activities: {
+    listActivities: (kql: string) => AxiosPromise<CollectionOfActivities>
+  }
 }
 
 export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
@@ -137,6 +142,7 @@ export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
     config.basePath,
     axiosClient
   )
+  const activitiesApiFactory = ActivitiesApiFactory(config, config.basePath, axiosClient)
 
   return <Graph>{
     applications: {
@@ -219,6 +225,9 @@ export const graph = (baseURI: string, axiosClient: AxiosInstance): Graph => {
         permId: string,
         sharingLinkPassword: SharingLinkPassword
       ) => drivesRootApiFactory.setPermissionPasswordSpaceRoot(driveId, permId, sharingLinkPassword)
+    },
+    activities: {
+      listActivities: (kql: string) => activitiesApiFactory.getActivities(kql)
     }
   }
 }
diff --git a/tests/e2e/support/objects/app-files/resource/actions.ts b/tests/e2e/support/objects/app-files/resource/actions.ts
index d6c5dbb0f2b..d7b27ae3508 100644
--- a/tests/e2e/support/objects/app-files/resource/actions.ts
+++ b/tests/e2e/support/objects/app-files/resource/actions.ts
@@ -1784,7 +1784,7 @@ export const checkThatFileVersionIsNotAvailable = async (
   ])
 
   await sidebar.openPanel({ page, name: 'versions' })
-  await expect(page.locator(fileVersionSidebar)).toHaveText('No Versions available for this file')
+  await expect(page.locator(fileVersionSidebar)).toHaveText('No versions available for this file')
 }
 
 export const checkThatFileVersionPanelIsNotAvailable = async (