@flipdish/authorization 0.2.38 → 0.2.39-rc.1781261484

package/api.ts

@@ -23,128 +23,6 @@ import type { RequestArgs } from './base';
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, BaseAPI, RequiredError, operationServerMap } from './base';
 
-/**
- * Details for assigning a role to a principal
- * @export
- * @interface AssignRoleRequestBody
- */
-export interface AssignRoleRequestBody {
-    /**
-     * 
-     * @type {string}
-     * @memberof AssignRoleRequestBody
-     */
-    'role': AssignRoleRequestBodyRoleEnum;
-    /**
-     * 
-     * @type {AuthorizationRequestResource}
-     * @memberof AssignRoleRequestBody
-     */
-    'resource': AuthorizationRequestResource;
-    /**
-     * 
-     * @type {AuthorizationRequestPrincipal}
-     * @memberof AssignRoleRequestBody
-     */
-    'principal': AuthorizationRequestPrincipal;
-    /**
-     * 
-     * @type {string}
-     * @memberof AssignRoleRequestBody
-     */
-    'brandId': string;
-}
-
-export const AssignRoleRequestBodyRoleEnum = {
-    OrgViewer: 'OrgViewer',
-    OrgManager: 'OrgManager',
-    OrgAdmin: 'OrgAdmin',
-    BrandViewer: 'BrandViewer',
-    BrandManager: 'BrandManager',
-    BrandAdmin: 'BrandAdmin',
-    StoreViewer: 'StoreViewer',
-    StoreEditor: 'StoreEditor',
-    StoreManager: 'StoreManager',
-    CustomerViewer: 'CustomerViewer',
-    CustomerManager: 'CustomerManager',
-    VoucherViewer: 'VoucherViewer',
-    VoucherEditor: 'VoucherEditor',
-    VoucherManager: 'VoucherManager',
-    VoucherCampaignManager: 'VoucherCampaignManager',
-    VoucherStatisticsViewer: 'VoucherStatisticsViewer',
-    AnalyticsViewer: 'AnalyticsViewer',
-    ReportsViewer: 'ReportsViewer',
-    FinanceViewer: 'FinanceViewer',
-    FinanceManager: 'FinanceManager',
-    TeamViewer: 'TeamViewer',
-    TeamManager: 'TeamManager',
-    TeamAdmin: 'TeamAdmin',
-    TechViewer: 'TechViewer',
-    TechManager: 'TechManager',
-    AppStoreViewer: 'AppStoreViewer',
-    AppStoreManager: 'AppStoreManager',
-    SalesChannelViewer: 'SalesChannelViewer',
-    SalesChannelEditor: 'SalesChannelEditor',
-    SalesChannelManager: 'SalesChannelManager',
-    DeliveryViewer: 'DeliveryViewer',
-    DeliveryManager: 'DeliveryManager',
-    DriverManager: 'DriverManager',
-    AuditViewer: 'AuditViewer',
-    AuditManager: 'AuditManager',
-    AccountsViewer: 'AccountsViewer',
-    AccountsEditor: 'AccountsEditor',
-    DocumentExplorerViewer: 'DocumentExplorerViewer',
-    DocumentExplorerEditor: 'DocumentExplorerEditor',
-    PayrollViewer: 'PayrollViewer',
-    PayrollEditor: 'PayrollEditor',
-    PropertyViewer: 'PropertyViewer',
-    PropertyManager: 'PropertyManager',
-    PropertyAdmin: 'PropertyAdmin',
-    WebsiteContentEditor: 'WebsiteContentEditor',
-    WebsiteContentViewer: 'WebsiteContentViewer',
-    WebsiteTechViewer: 'WebsiteTechViewer',
-    MenuViewer: 'MenuViewer',
-    MenuEditor: 'MenuEditor',
-    MenuManager: 'MenuManager',
-    MenuMetaFieldManager: 'MenuMetaFieldManager',
-    MenuMetaFieldEditor: 'MenuMetaFieldEditor',
-    MenuMetaFieldViewer: 'MenuMetaFieldViewer',
-    StoreDeliveryZoneManager: 'StoreDeliveryZoneManager',
-    StoreDeliveryZoneEditor: 'StoreDeliveryZoneEditor',
-    StoreDeliveryZoneViewer: 'StoreDeliveryZoneViewer',
-    OrderFulfillmentManager: 'OrderFulfillmentManager',
-    OrderManager: 'OrderManager',
-    OrderEditor: 'OrderEditor',
-    OrderViewer: 'OrderViewer',
-    InventoryManager: 'InventoryManager',
-    InventoryEditor: 'InventoryEditor',
-    InventoryViewer: 'InventoryViewer',
-    PaymentManager: 'PaymentManager',
-    OnboardingManager: 'OnboardingManager',
-    FeatureFlagManager: 'FeatureFlagManager',
-    PropertyOwnerMisc: 'PropertyOwnerMisc',
-    ManagedOwnerMisc: 'ManagedOwnerMisc',
-    IntegratorMisc: 'IntegratorMisc',
-    PropertyManagerMisc: 'PropertyManagerMisc',
-    FinanceManagerMisc: 'FinanceManagerMisc',
-    SupportMisc: 'SupportMisc'
-} as const;
-
-export type AssignRoleRequestBodyRoleEnum = typeof AssignRoleRequestBodyRoleEnum[keyof typeof AssignRoleRequestBodyRoleEnum];
-
-/**
- * Successful role assignment response
- * @export
- * @interface AssignRoleSuccessResponse
- */
-export interface AssignRoleSuccessResponse {
-    /**
-     * Confirmation message
-     * @type {string}
-     * @memberof AssignRoleSuccessResponse
-     */
-    'message': string;
-}
 /**
  * Request to check if a user is authorized to perform an action(s). If you pass in an array of permissions, you will receive a single allow / deny response (based on an AND of the result for each permission). For a granular response to multiple permissions, call the /authorize/batch endpoint. 
  * @export
@@ -609,25 +487,6 @@ export interface ErrorResponse {
      */
     'message': string;
 }
-/**
- * Feature based role and its permissions
- * @export
- * @interface FeatureBasedRole
- */
-export interface FeatureBasedRole {
-    /**
-     * Name of the role
-     * @type {string}
-     * @memberof FeatureBasedRole
-     */
-    'name': string;
-    /**
-     * 
-     * @type {Permissions & Array<Permissions>}
-     * @memberof FeatureBasedRole
-     */
-    'permissions': Permissions & Array<Permissions>;
-}
 /**
  * Request to get authorized brands for a principal or the authenticated user based on the headers. Either principal or headers must be provided, but not both. If both are provided, the principal will be used.
  * @export
@@ -811,149 +670,6 @@ export interface GetAuthorizedPropertiesResponse {
      */
     'deniedResources': Array<AuthorizationBatchResponseAllowedResourcesInner>;
 }
-/**
- * Details for getting roles for a principal
- * @export
- * @interface GetPrincipalRolesRequestBody
- */
-export interface GetPrincipalRolesRequestBody {
-    /**
-     * 
-     * @type {AuthorizationRequestPrincipal}
-     * @memberof GetPrincipalRolesRequestBody
-     */
-    'principal': AuthorizationRequestPrincipal;
-    /**
-     * 
-     * @type {AuthorizationRequestResource}
-     * @memberof GetPrincipalRolesRequestBody
-     */
-    'resource'?: AuthorizationRequestResource;
-}
-/**
- * Successful roles retrieval response
- * @export
- * @interface GetPrincipalRolesSuccessResponse
- */
-export interface GetPrincipalRolesSuccessResponse {
-    /**
-     * List of roles assigned to the principal
-     * @type {Array<GetPrincipalRolesSuccessResponseRolesInner>}
-     * @memberof GetPrincipalRolesSuccessResponse
-     */
-    'roles': Array<GetPrincipalRolesSuccessResponseRolesInner>;
-}
-/**
- * 
- * @export
- * @interface GetPrincipalRolesSuccessResponseRolesInner
- */
-export interface GetPrincipalRolesSuccessResponseRolesInner {
-    /**
-     * Policy ID
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'policyId': string;
-    /**
-     * 
-     * @type {GetPrincipalRolesSuccessResponseRolesInnerRoleName}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'roleName': GetPrincipalRolesSuccessResponseRolesInnerRoleName;
-    /**
-     * Policy type
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'policyType': GetPrincipalRolesSuccessResponseRolesInnerPolicyTypeEnum;
-    /**
-     * Date and time the role was assigned
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'assignedAt': string;
-    /**
-     * User who assigned the role
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'assignedBy': string;
-    /**
-     * Type of resource the role is assigned to
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'resourceType'?: GetPrincipalRolesSuccessResponseRolesInnerResourceTypeEnum;
-    /**
-     * Organization ID
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'orgId'?: string;
-    /**
-     * Property ID
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'propertyId'?: string;
-    /**
-     * Brand ID this role is scoped to
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'brandId'?: string;
-    /**
-     * Sales channel ID this role is scoped to
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'salesChannelId'?: string;
-    /**
-     * Principal ID this role is assigned to
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'principalId': string;
-    /**
-     * Type of principal this role is assigned to
-     * @type {string}
-     * @memberof GetPrincipalRolesSuccessResponseRolesInner
-     */
-    'principalType': GetPrincipalRolesSuccessResponseRolesInnerPrincipalTypeEnum;
-}
-
-export const GetPrincipalRolesSuccessResponseRolesInnerPolicyTypeEnum = {
-    Main: 'Main',
-    BrandOverride: 'BrandOverride',
-    OrgOverride: 'OrgOverride',
-    Forbidden: 'Forbidden',
-    NamedRole: 'NamedRole'
-} as const;
-
-export type GetPrincipalRolesSuccessResponseRolesInnerPolicyTypeEnum = typeof GetPrincipalRolesSuccessResponseRolesInnerPolicyTypeEnum[keyof typeof GetPrincipalRolesSuccessResponseRolesInnerPolicyTypeEnum];
-export const GetPrincipalRolesSuccessResponseRolesInnerResourceTypeEnum = {
-    Property: 'Property',
-    Org: 'Org',
-    Brand: 'Brand',
-    SalesChannel: 'SalesChannel'
-} as const;
-
-export type GetPrincipalRolesSuccessResponseRolesInnerResourceTypeEnum = typeof GetPrincipalRolesSuccessResponseRolesInnerResourceTypeEnum[keyof typeof GetPrincipalRolesSuccessResponseRolesInnerResourceTypeEnum];
-export const GetPrincipalRolesSuccessResponseRolesInnerPrincipalTypeEnum = {
-    User: 'User',
-    Automation: 'Automation'
-} as const;
-
-export type GetPrincipalRolesSuccessResponseRolesInnerPrincipalTypeEnum = typeof GetPrincipalRolesSuccessResponseRolesInnerPrincipalTypeEnum[keyof typeof GetPrincipalRolesSuccessResponseRolesInnerPrincipalTypeEnum];
-
-/**
- * Role name
- * @export
- * @interface GetPrincipalRolesSuccessResponseRolesInnerRoleName
- */
-export interface GetPrincipalRolesSuccessResponseRolesInnerRoleName {
-}
 /**
  * Successful user permissions retrieval response
  * @export
@@ -1009,67 +725,6 @@ export type GetUserPermissionsSuccessResponseResourcesValueResourceTypeEnum = ty
  */
 export interface GetUserPermissionsSuccessResponseResourcesValueResourceId {
 }
-/**
- * Grant teammate app access to a user being assigned within a brand for the first time.
- * @export
- * @interface GrantTeammateAccessRequestBody
- */
-export interface GrantTeammateAccessRequestBody {
-    /**
-     * Teammate app access level (role)
-     * @type {string}
-     * @memberof GrantTeammateAccessRequestBody
-     */
-    'appAccessLevel': GrantTeammateAccessRequestBodyAppAccessLevelEnum;
-    /**
-     * Brand identifier (AppId); normalized to lowercase when stored
-     * @type {string}
-     * @memberof GrantTeammateAccessRequestBody
-     */
-    'brandId': string;
-    /**
-     * Org-wide store access; when false, propertyIds are required for property-scoped roles
-     * @type {boolean}
-     * @memberof GrantTeammateAccessRequestBody
-     */
-    'hasAccessToAllStores': boolean;
-    /**
-     * Property resource ids (e.g. p123) when scoped to properties
-     * @type {Array<string>}
-     * @memberof GrantTeammateAccessRequestBody
-     */
-    'propertyIds'?: Array<string>;
-    /**
-     * Optional v2 permission set keys to apply to this teammate role
-     * @type {Array<string>}
-     * @memberof GrantTeammateAccessRequestBody
-     */
-    'optionalPermissionSetKeys'?: Array<string>;
-    /**
-     * Target user email; persisted on first assignment only
-     * @type {string}
-     * @memberof GrantTeammateAccessRequestBody
-     */
-    'userEmail': string;
-    /**
-     * Target user display name; persisted on first assignment only
-     * @type {string}
-     * @memberof GrantTeammateAccessRequestBody
-     */
-    'userName'?: string;
-}
-
-export const GrantTeammateAccessRequestBodyAppAccessLevelEnum = {
-    Owner: 'Owner',
-    ManagedOwner: 'ManagedOwner',
-    PropertyOwner: 'PropertyOwner',
-    PropertyManager: 'PropertyManager',
-    FinanceManager: 'FinanceManager',
-    Integrator: 'Integrator'
-} as const;
-
-export type GrantTeammateAccessRequestBodyAppAccessLevelEnum = typeof GrantTeammateAccessRequestBodyAppAccessLevelEnum[keyof typeof GrantTeammateAccessRequestBodyAppAccessLevelEnum];
-
 /**
  * 
  * @export
@@ -1116,19 +771,6 @@ export interface IsInRoleResponse {
      */
     'authorized': boolean;
 }
-/**
- * Successful feature based roles retrieval response
- * @export
- * @interface ListFeatureBasedRolesSuccessResponse
- */
-export interface ListFeatureBasedRolesSuccessResponse {
-    /**
-     * 
-     * @type {Array<FeatureBasedRole>}
-     * @memberof ListFeatureBasedRolesSuccessResponse
-     */
-    'roles': Array<FeatureBasedRole>;
-}
 /**
  * 
  * @export
@@ -1137,10 +779,10 @@ export interface ListFeatureBasedRolesSuccessResponse {
 export interface ListOrgRolesSuccessResponseValue {
     /**
      * 
-     * @type {ListOrgRolesSuccessResponseValueAnyOfOrgId}
+     * @type {ListOrgRolesSuccessResponseValueOrgId}
      * @memberof ListOrgRolesSuccessResponseValue
      */
-    'orgId': ListOrgRolesSuccessResponseValueAnyOfOrgId;
+    'orgId': ListOrgRolesSuccessResponseValueOrgId;
     /**
      * List of roles that are assigned to the user in the org
      * @type {Array<string>}
@@ -1155,22 +797,22 @@ export interface ListOrgRolesSuccessResponseValue {
     'optionalPermissionSetKeys'?: Array<string>;
     /**
      * Property IDs, or * for all properties, the roles are scoped to
-     * @type {Array<ListOrgRolesSuccessResponseValueAnyOfPropertiesInner>}
+     * @type {Array<ListOrgRolesSuccessResponseValuePropertiesInner>}
      * @memberof ListOrgRolesSuccessResponseValue
      */
-    'properties'?: Array<ListOrgRolesSuccessResponseValueAnyOfPropertiesInner>;
+    'properties'?: Array<ListOrgRolesSuccessResponseValuePropertiesInner>;
     /**
      * Brand IDs, or * for all brands, the roles are scoped to
-     * @type {Array<ListOrgRolesSuccessResponseValueAnyOfBrandsInner>}
+     * @type {Array<ListOrgRolesSuccessResponseValueBrandsInner>}
      * @memberof ListOrgRolesSuccessResponseValue
      */
-    'brands'?: Array<ListOrgRolesSuccessResponseValueAnyOfBrandsInner>;
+    'brands'?: Array<ListOrgRolesSuccessResponseValueBrandsInner>;
     /**
      * Sales channel IDs, or * for all sales channels, the roles are scoped to
-     * @type {Array<ListOrgRolesSuccessResponseValueAnyOfSalesChannelsInner>}
+     * @type {Array<ListOrgRolesSuccessResponseValueSalesChannelsInner>}
      * @memberof ListOrgRolesSuccessResponseValue
      */
-    'salesChannels'?: Array<ListOrgRolesSuccessResponseValueAnyOfSalesChannelsInner>;
+    'salesChannels'?: Array<ListOrgRolesSuccessResponseValueSalesChannelsInner>;
 }
 
 export const ListOrgRolesSuccessResponseValueRolesEnum = {
@@ -1187,127 +829,30 @@ export type ListOrgRolesSuccessResponseValueRolesEnum = typeof ListOrgRolesSucce
 /**
  * 
  * @export
- * @interface ListOrgRolesSuccessResponseValueAnyOf
- */
-export interface ListOrgRolesSuccessResponseValueAnyOf {
-    /**
-     * 
-     * @type {ListOrgRolesSuccessResponseValueAnyOfOrgId}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOf
-     */
-    'orgId': ListOrgRolesSuccessResponseValueAnyOfOrgId;
-    /**
-     * List of roles that are assigned to the user in the org
-     * @type {Array<string>}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOf
-     */
-    'roles': Array<ListOrgRolesSuccessResponseValueAnyOfRolesEnum>;
-    /**
-     * Optional permission set keys applied to the roles
-     * @type {Array<string>}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOf
-     */
-    'optionalPermissionSetKeys'?: Array<string>;
-    /**
-     * Property IDs, or * for all properties, the roles are scoped to
-     * @type {Array<ListOrgRolesSuccessResponseValueAnyOfPropertiesInner>}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOf
-     */
-    'properties'?: Array<ListOrgRolesSuccessResponseValueAnyOfPropertiesInner>;
-    /**
-     * Brand IDs, or * for all brands, the roles are scoped to
-     * @type {Array<ListOrgRolesSuccessResponseValueAnyOfBrandsInner>}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOf
-     */
-    'brands'?: Array<ListOrgRolesSuccessResponseValueAnyOfBrandsInner>;
-    /**
-     * Sales channel IDs, or * for all sales channels, the roles are scoped to
-     * @type {Array<ListOrgRolesSuccessResponseValueAnyOfSalesChannelsInner>}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOf
-     */
-    'salesChannels'?: Array<ListOrgRolesSuccessResponseValueAnyOfSalesChannelsInner>;
-}
-
-export const ListOrgRolesSuccessResponseValueAnyOfRolesEnum = {
-    Owner: 'Owner',
-    PropertyOwner: 'PropertyOwner',
-    ManagedOwner: 'ManagedOwner',
-    Integrator: 'Integrator',
-    PropertyManager: 'PropertyManager',
-    FinanceManager: 'FinanceManager'
-} as const;
-
-export type ListOrgRolesSuccessResponseValueAnyOfRolesEnum = typeof ListOrgRolesSuccessResponseValueAnyOfRolesEnum[keyof typeof ListOrgRolesSuccessResponseValueAnyOfRolesEnum];
-
-/**
- * 
- * @export
- * @interface ListOrgRolesSuccessResponseValueAnyOfBrandsInner
+ * @interface ListOrgRolesSuccessResponseValueBrandsInner
  */
-export interface ListOrgRolesSuccessResponseValueAnyOfBrandsInner {
+export interface ListOrgRolesSuccessResponseValueBrandsInner {
 }
 /**
  * ID of the org the roles are assigned in
  * @export
- * @interface ListOrgRolesSuccessResponseValueAnyOfOrgId
- */
-export interface ListOrgRolesSuccessResponseValueAnyOfOrgId {
-}
-/**
- * 
- * @export
- * @interface ListOrgRolesSuccessResponseValueAnyOfPropertiesInner
- */
-export interface ListOrgRolesSuccessResponseValueAnyOfPropertiesInner {
-}
-/**
- * 
- * @export
- * @interface ListOrgRolesSuccessResponseValueAnyOfSalesChannelsInner
+ * @interface ListOrgRolesSuccessResponseValueOrgId
  */
-export interface ListOrgRolesSuccessResponseValueAnyOfSalesChannelsInner {
+export interface ListOrgRolesSuccessResponseValueOrgId {
 }
 /**
  * 
  * @export
- * @interface ListOrgRolesSuccessResponseValueAnyOfValue
+ * @interface ListOrgRolesSuccessResponseValuePropertiesInner
  */
-export interface ListOrgRolesSuccessResponseValueAnyOfValue {
-    /**
-     * Type of resource the permissions are assigned to
-     * @type {string}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOfValue
-     */
-    'resourceType': ListOrgRolesSuccessResponseValueAnyOfValueResourceTypeEnum;
-    /**
-     * 
-     * @type {GetUserPermissionsSuccessResponseResourcesValueResourceId}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOfValue
-     */
-    'resourceId': GetUserPermissionsSuccessResponseResourcesValueResourceId;
-    /**
-     * List of roles that are assigned to the user for the resource
-     * @type {Array<ListOrgRolesSuccessResponseValueAnyOfValueRolesInner>}
-     * @memberof ListOrgRolesSuccessResponseValueAnyOfValue
-     */
-    'roles': Array<ListOrgRolesSuccessResponseValueAnyOfValueRolesInner>;
+export interface ListOrgRolesSuccessResponseValuePropertiesInner {
 }
-
-export const ListOrgRolesSuccessResponseValueAnyOfValueResourceTypeEnum = {
-    Property: 'Property',
-    Org: 'Org',
-    Brand: 'Brand',
-    SalesChannel: 'SalesChannel'
-} as const;
-
-export type ListOrgRolesSuccessResponseValueAnyOfValueResourceTypeEnum = typeof ListOrgRolesSuccessResponseValueAnyOfValueResourceTypeEnum[keyof typeof ListOrgRolesSuccessResponseValueAnyOfValueResourceTypeEnum];
-
 /**
  * 
  * @export
- * @interface ListOrgRolesSuccessResponseValueAnyOfValueRolesInner
+ * @interface ListOrgRolesSuccessResponseValueSalesChannelsInner
  */
-export interface ListOrgRolesSuccessResponseValueAnyOfValueRolesInner {
+export interface ListOrgRolesSuccessResponseValueSalesChannelsInner {
 }
 /**
  * Successful permissions retrieval response
@@ -1578,478 +1123,424 @@ export type Permissions = typeof Permissions[keyof typeof Permissions];
 
 
 /**
- * Principal with teammate permission summary
+ * Principals in org
  * @export
- * @interface PrincipalInOrgWithTeammatePermissionSummary
+ * @interface PrincipalsInOrgResponse
  */
-export interface PrincipalInOrgWithTeammatePermissionSummary {
+export interface PrincipalsInOrgResponse {
     /**
      * 
      * @type {string}
-     * @memberof PrincipalInOrgWithTeammatePermissionSummary
+     * @memberof PrincipalsInOrgResponse
      */
-    'type': PrincipalInOrgWithTeammatePermissionSummaryTypeEnum;
+    'orgId': string;
     /**
-     * 
-     * @type {string}
-     * @memberof PrincipalInOrgWithTeammatePermissionSummary
+     * List of principals in org
+     * @type {Array<AuthorizationRequestPrincipal>}
+     * @memberof PrincipalsInOrgResponse
      */
-    'id': string;
+    'principals': Array<AuthorizationRequestPrincipal>;
+}
+/**
+ * Role assignment key to rematerialize
+ * @export
+ * @interface RematerializeRoleAssignmentRequestBody
+ */
+export interface RematerializeRoleAssignmentRequestBody {
     /**
      * 
      * @type {string}
-     * @memberof PrincipalInOrgWithTeammatePermissionSummary
+     * @memberof RematerializeRoleAssignmentRequestBody
      */
-    'name'?: string;
+    'pk': string;
     /**
      * 
      * @type {string}
-     * @memberof PrincipalInOrgWithTeammatePermissionSummary
-     */
-    'email'?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof PrincipalInOrgWithTeammatePermissionSummary
-     */
-    'phone'?: string;
-    /**
-     * Teammate role label; null when no compensating role or unknown
-     * @type {string}
-     * @memberof PrincipalInOrgWithTeammatePermissionSummary
-     */
-    'roleDisplay': string;
-    /**
-     * True when granular roles differ from default for the compensating role
-     * @type {boolean}
-     * @memberof PrincipalInOrgWithTeammatePermissionSummary
-     */
-    'isCustomised': boolean;
-}
-
-export const PrincipalInOrgWithTeammatePermissionSummaryTypeEnum = {
-    User: 'User',
-    Automation: 'Automation'
-} as const;
-
-export type PrincipalInOrgWithTeammatePermissionSummaryTypeEnum = typeof PrincipalInOrgWithTeammatePermissionSummaryTypeEnum[keyof typeof PrincipalInOrgWithTeammatePermissionSummaryTypeEnum];
-
-/**
- * Principals in org
- * @export
- * @interface PrincipalsInOrgResponse
- */
-export interface PrincipalsInOrgResponse {
-    /**
-     * 
-     * @type {string}
-     * @memberof PrincipalsInOrgResponse
-     */
-    'orgId': string;
-    /**
-     * List of principals in org
-     * @type {Array<AuthorizationRequestPrincipal>}
-     * @memberof PrincipalsInOrgResponse
-     */
-    'principals': Array<AuthorizationRequestPrincipal>;
-}
-/**
- * Principals in org including teammate permission summary per principal
- * @export
- * @interface PrincipalsInOrgWithTeammatePermissionSummaryResponse
- */
-export interface PrincipalsInOrgWithTeammatePermissionSummaryResponse {
-    /**
-     * 
-     * @type {string}
-     * @memberof PrincipalsInOrgWithTeammatePermissionSummaryResponse
-     */
-    'orgId': string;
-    /**
-     * List of principals with roleDisplay and isCustomised
-     * @type {Array<PrincipalInOrgWithTeammatePermissionSummary>}
-     * @memberof PrincipalsInOrgWithTeammatePermissionSummaryResponse
-     */
-    'principals': Array<PrincipalInOrgWithTeammatePermissionSummary>;
-}
-/**
- * V2 role assignment key to rematerialize
- * @export
- * @interface RematerializeRoleAssignmentV2RequestBody
- */
-export interface RematerializeRoleAssignmentV2RequestBody {
-    /**
-     * 
-     * @type {string}
-     * @memberof RematerializeRoleAssignmentV2RequestBody
-     */
-    'pk': string;
-    /**
-     * 
-     * @type {string}
-     * @memberof RematerializeRoleAssignmentV2RequestBody
+     * @memberof RematerializeRoleAssignmentRequestBody
      */
     'sk': string;
 }
 /**
- * Successful V2 role assignment rematerialization response
+ * Successful role assignment rematerialization response
  * @export
- * @interface RematerializeRoleAssignmentV2SuccessResponse
+ * @interface RematerializeRoleAssignmentSuccessResponse
  */
-export interface RematerializeRoleAssignmentV2SuccessResponse {
+export interface RematerializeRoleAssignmentSuccessResponse {
     /**
      * 
-     * @type {RematerializeRoleAssignmentV2SuccessResponseRoleAssignment}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponse
+     * @type {RematerializeRoleAssignmentSuccessResponseRoleAssignment}
+     * @memberof RematerializeRoleAssignmentSuccessResponse
      */
-    'roleAssignment': RematerializeRoleAssignmentV2SuccessResponseRoleAssignment;
+    'roleAssignment': RematerializeRoleAssignmentSuccessResponseRoleAssignment;
     /**
      * 
      * @type {number}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponse
+     * @memberof RematerializeRoleAssignmentSuccessResponse
      */
     'materialized': number;
     /**
      * 
      * @type {number}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponse
+     * @memberof RematerializeRoleAssignmentSuccessResponse
      */
     'applied': number;
     /**
      * 
-     * @type {Array<RematerializeRoleAssignmentV2SuccessResponsePolicyAssignmentsInner>}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponse
+     * @type {Array<RematerializeRoleAssignmentSuccessResponsePolicyAssignmentsInner>}
+     * @memberof RematerializeRoleAssignmentSuccessResponse
      */
-    'policyAssignments': Array<RematerializeRoleAssignmentV2SuccessResponsePolicyAssignmentsInner>;
+    'policyAssignments': Array<RematerializeRoleAssignmentSuccessResponsePolicyAssignmentsInner>;
 }
 /**
  * 
  * @export
- * @interface RematerializeRoleAssignmentV2SuccessResponsePolicyAssignmentsInner
+ * @interface RematerializeRoleAssignmentSuccessResponsePolicyAssignmentsInner
  */
-export interface RematerializeRoleAssignmentV2SuccessResponsePolicyAssignmentsInner {
+export interface RematerializeRoleAssignmentSuccessResponsePolicyAssignmentsInner {
     /**
      * 
      * @type {string}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponsePolicyAssignmentsInner
+     * @memberof RematerializeRoleAssignmentSuccessResponsePolicyAssignmentsInner
      */
     'policyId': string;
     /**
      * 
      * @type {string}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponsePolicyAssignmentsInner
+     * @memberof RematerializeRoleAssignmentSuccessResponsePolicyAssignmentsInner
      */
     'assignmentPk': string;
     /**
      * 
      * @type {string}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponsePolicyAssignmentsInner
+     * @memberof RematerializeRoleAssignmentSuccessResponsePolicyAssignmentsInner
      */
     'assignmentSk': string;
 }
 /**
  * 
  * @export
- * @interface RematerializeRoleAssignmentV2SuccessResponseRoleAssignment
+ * @interface RematerializeRoleAssignmentSuccessResponseRoleAssignment
  */
-export interface RematerializeRoleAssignmentV2SuccessResponseRoleAssignment {
+export interface RematerializeRoleAssignmentSuccessResponseRoleAssignment {
     /**
      * 
      * @type {string}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponseRoleAssignment
+     * @memberof RematerializeRoleAssignmentSuccessResponseRoleAssignment
      */
     'pk': string;
     /**
      * 
      * @type {string}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponseRoleAssignment
+     * @memberof RematerializeRoleAssignmentSuccessResponseRoleAssignment
      */
     'sk': string;
     /**
      * 
      * @type {string}
-     * @memberof RematerializeRoleAssignmentV2SuccessResponseRoleAssignment
+     * @memberof RematerializeRoleAssignmentSuccessResponseRoleAssignment
      */
     'assignmentId': string;
 }
 /**
- * Details for revoking a forbidden role from a principal
+ * 
  * @export
- * @interface RevokeForbiddenRoleRequestBody
+ * @interface RemoveTeammateRequestBody
  */
-export interface RevokeForbiddenRoleRequestBody {
+export interface RemoveTeammateRequestBody {
     /**
      * 
-     * @type {AuthorizationRequestPrincipal}
-     * @memberof RevokeForbiddenRoleRequestBody
+     * @type {RemoveTeammateRequestBodyPrincipal}
+     * @memberof RemoveTeammateRequestBody
      */
-    'principal': AuthorizationRequestPrincipal;
+    'principal': RemoveTeammateRequestBodyPrincipal;
+    /**
+     * 
+     * @type {RemoveTeammateRequestBodyActor}
+     * @memberof RemoveTeammateRequestBody
+     */
+    'actor'?: RemoveTeammateRequestBodyActor;
+}
+/**
+ * Actor performing the removal
+ * @export
+ * @interface RemoveTeammateRequestBodyActor
+ */
+export interface RemoveTeammateRequestBodyActor {
+    /**
+     * 
+     * @type {string}
+     * @memberof RemoveTeammateRequestBodyActor
+     */
+    'type': RemoveTeammateRequestBodyActorTypeEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof RemoveTeammateRequestBodyActor
+     */
+    'id': string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RemoveTeammateRequestBodyActor
+     */
+    'name'?: string;
     /**
-     * Compensation role to revoke the forbidden role from
+     * 
      * @type {string}
-     * @memberof RevokeForbiddenRoleRequestBody
+     * @memberof RemoveTeammateRequestBodyActor
      */
-    'compensatingRole': RevokeForbiddenRoleRequestBodyCompensatingRoleEnum;
+    'email'?: string;
     /**
-     * Brand ID to scope the revocation to
+     * 
      * @type {string}
-     * @memberof RevokeForbiddenRoleRequestBody
+     * @memberof RemoveTeammateRequestBodyActor
      */
-    'brandId'?: string;
+    'phone'?: string;
 }
 
-export const RevokeForbiddenRoleRequestBodyCompensatingRoleEnum = {
-    OwnerCompensating: 'OwnerCompensating',
-    PropertyOwnerCompensating: 'PropertyOwnerCompensating',
-    ManagedOwnerCompensating: 'ManagedOwnerCompensating',
-    IntegratorCompensating: 'IntegratorCompensating',
-    PropertyManagerCompensating: 'PropertyManagerCompensating',
-    FinanceManagerCompensating: 'FinanceManagerCompensating'
+export const RemoveTeammateRequestBodyActorTypeEnum = {
+    User: 'User',
+    Automation: 'Automation'
 } as const;
 
-export type RevokeForbiddenRoleRequestBodyCompensatingRoleEnum = typeof RevokeForbiddenRoleRequestBodyCompensatingRoleEnum[keyof typeof RevokeForbiddenRoleRequestBodyCompensatingRoleEnum];
+export type RemoveTeammateRequestBodyActorTypeEnum = typeof RemoveTeammateRequestBodyActorTypeEnum[keyof typeof RemoveTeammateRequestBodyActorTypeEnum];
 
 /**
- * Details for revoking a role from a principal
+ * Principal to remove from the org
  * @export
- * @interface RevokeRoleRequestBody
+ * @interface RemoveTeammateRequestBodyPrincipal
  */
-export interface RevokeRoleRequestBody {
+export interface RemoveTeammateRequestBodyPrincipal {
     /**
      * 
      * @type {string}
-     * @memberof RevokeRoleRequestBody
+     * @memberof RemoveTeammateRequestBodyPrincipal
      */
-    'role': RevokeRoleRequestBodyRoleEnum;
+    'type': RemoveTeammateRequestBodyPrincipalTypeEnum;
     /**
      * 
-     * @type {AuthorizationRequestResource}
-     * @memberof RevokeRoleRequestBody
+     * @type {string}
+     * @memberof RemoveTeammateRequestBodyPrincipal
      */
-    'resource': AuthorizationRequestResource;
+    'id': string;
     /**
      * 
-     * @type {AuthorizationRequestPrincipal}
-     * @memberof RevokeRoleRequestBody
+     * @type {string}
+     * @memberof RemoveTeammateRequestBodyPrincipal
      */
-    'principal': AuthorizationRequestPrincipal;
+    'name'?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RemoveTeammateRequestBodyPrincipal
+     */
+    'email'?: string;
     /**
      * 
      * @type {string}
-     * @memberof RevokeRoleRequestBody
+     * @memberof RemoveTeammateRequestBodyPrincipal
      */
-    'brandId': string;
+    'phone'?: string;
 }
 
-export const RevokeRoleRequestBodyRoleEnum = {
-    OrgViewer: 'OrgViewer',
-    OrgManager: 'OrgManager',
-    OrgAdmin: 'OrgAdmin',
-    BrandViewer: 'BrandViewer',
-    BrandManager: 'BrandManager',
-    BrandAdmin: 'BrandAdmin',
-    StoreViewer: 'StoreViewer',
-    StoreEditor: 'StoreEditor',
-    StoreManager: 'StoreManager',
-    CustomerViewer: 'CustomerViewer',
-    CustomerManager: 'CustomerManager',
-    VoucherViewer: 'VoucherViewer',
-    VoucherEditor: 'VoucherEditor',
-    VoucherManager: 'VoucherManager',
-    VoucherCampaignManager: 'VoucherCampaignManager',
-    VoucherStatisticsViewer: 'VoucherStatisticsViewer',
-    AnalyticsViewer: 'AnalyticsViewer',
-    ReportsViewer: 'ReportsViewer',
-    FinanceViewer: 'FinanceViewer',
-    FinanceManager: 'FinanceManager',
-    TeamViewer: 'TeamViewer',
-    TeamManager: 'TeamManager',
-    TeamAdmin: 'TeamAdmin',
-    TechViewer: 'TechViewer',
-    TechManager: 'TechManager',
-    AppStoreViewer: 'AppStoreViewer',
-    AppStoreManager: 'AppStoreManager',
-    SalesChannelViewer: 'SalesChannelViewer',
-    SalesChannelEditor: 'SalesChannelEditor',
-    SalesChannelManager: 'SalesChannelManager',
-    DeliveryViewer: 'DeliveryViewer',
-    DeliveryManager: 'DeliveryManager',
-    DriverManager: 'DriverManager',
-    AuditViewer: 'AuditViewer',
-    AuditManager: 'AuditManager',
-    AccountsViewer: 'AccountsViewer',
-    AccountsEditor: 'AccountsEditor',
-    DocumentExplorerViewer: 'DocumentExplorerViewer',
-    DocumentExplorerEditor: 'DocumentExplorerEditor',
-    PayrollViewer: 'PayrollViewer',
-    PayrollEditor: 'PayrollEditor',
-    PropertyViewer: 'PropertyViewer',
-    PropertyManager: 'PropertyManager',
-    PropertyAdmin: 'PropertyAdmin',
-    WebsiteContentEditor: 'WebsiteContentEditor',
-    WebsiteContentViewer: 'WebsiteContentViewer',
-    WebsiteTechViewer: 'WebsiteTechViewer',
-    MenuViewer: 'MenuViewer',
-    MenuEditor: 'MenuEditor',
-    MenuManager: 'MenuManager',
-    MenuMetaFieldManager: 'MenuMetaFieldManager',
-    MenuMetaFieldEditor: 'MenuMetaFieldEditor',
-    MenuMetaFieldViewer: 'MenuMetaFieldViewer',
-    StoreDeliveryZoneManager: 'StoreDeliveryZoneManager',
-    StoreDeliveryZoneEditor: 'StoreDeliveryZoneEditor',
-    StoreDeliveryZoneViewer: 'StoreDeliveryZoneViewer',
-    OrderFulfillmentManager: 'OrderFulfillmentManager',
-    OrderManager: 'OrderManager',
-    OrderEditor: 'OrderEditor',
-    OrderViewer: 'OrderViewer',
-    InventoryManager: 'InventoryManager',
-    InventoryEditor: 'InventoryEditor',
-    InventoryViewer: 'InventoryViewer',
-    PaymentManager: 'PaymentManager',
-    OnboardingManager: 'OnboardingManager',
-    FeatureFlagManager: 'FeatureFlagManager',
-    PropertyOwnerMisc: 'PropertyOwnerMisc',
-    ManagedOwnerMisc: 'ManagedOwnerMisc',
-    IntegratorMisc: 'IntegratorMisc',
-    PropertyManagerMisc: 'PropertyManagerMisc',
-    FinanceManagerMisc: 'FinanceManagerMisc',
-    SupportMisc: 'SupportMisc'
+export const RemoveTeammateRequestBodyPrincipalTypeEnum = {
+    User: 'User',
+    Automation: 'Automation'
 } as const;
 
-export type RevokeRoleRequestBodyRoleEnum = typeof RevokeRoleRequestBodyRoleEnum[keyof typeof RevokeRoleRequestBodyRoleEnum];
+export type RemoveTeammateRequestBodyPrincipalTypeEnum = typeof RemoveTeammateRequestBodyPrincipalTypeEnum[keyof typeof RemoveTeammateRequestBodyPrincipalTypeEnum];
 
 /**
- * Successful role revocation response
+ * Teammate removed from org
  * @export
- * @interface RevokeRoleSuccessResponse
+ * @interface RemoveTeammateSuccessResponse
  */
-export interface RevokeRoleSuccessResponse {
+export interface RemoveTeammateSuccessResponse {
     /**
-     * Confirmation message
+     * 
      * @type {string}
-     * @memberof RevokeRoleSuccessResponse
+     * @memberof RemoveTeammateSuccessResponse
      */
     'message': string;
 }
 /**
- * Role names
+ * 
  * @export
- * @enum {string}
+ * @interface RoleAssignmentRequestBody
  */
+export interface RoleAssignmentRequestBody {
+    /**
+     * 
+     * @type {RoleAssignmentRequestBodyPrincipal}
+     * @memberof RoleAssignmentRequestBody
+     */
+    'principal': RoleAssignmentRequestBodyPrincipal;
+    /**
+     * Role name
+     * @type {string}
+     * @memberof RoleAssignmentRequestBody
+     */
+    'roleName': RoleAssignmentRequestBodyRoleNameEnum;
+    /**
+     * Property resource ids (e.g. p123) when scoped to properties
+     * @type {Array<ListOrgRolesSuccessResponseValuePropertiesInner>}
+     * @memberof RoleAssignmentRequestBody
+     */
+    'properties'?: Array<ListOrgRolesSuccessResponseValuePropertiesInner>;
+    /**
+     * Brand resource ids (e.g. b123) when scoped to brands
+     * @type {Array<ListOrgRolesSuccessResponseValueBrandsInner>}
+     * @memberof RoleAssignmentRequestBody
+     */
+    'brands'?: Array<ListOrgRolesSuccessResponseValueBrandsInner>;
+    /**
+     * Sales channel resource ids (e.g. sc123) when scoped to sales channels
+     * @type {Array<ListOrgRolesSuccessResponseValueSalesChannelsInner>}
+     * @memberof RoleAssignmentRequestBody
+     */
+    'salesChannels'?: Array<ListOrgRolesSuccessResponseValueSalesChannelsInner>;
+    /**
+     * Optional permission set keys to apply to this role assignment
+     * @type {Array<string>}
+     * @memberof RoleAssignmentRequestBody
+     */
+    'optionalPermissionSetKeys'?: Array<string>;
+    /**
+     * 
+     * @type {RoleAssignmentRequestBodyActor}
+     * @memberof RoleAssignmentRequestBody
+     */
+    'actor'?: RoleAssignmentRequestBodyActor;
+}
 
-export const RoleNames = {
-    Admin: 'Admin',
-    Factory: 'Factory',
-    AuthDeveloper: 'AuthDeveloper'
+export const RoleAssignmentRequestBodyRoleNameEnum = {
+    Owner: 'Owner',
+    PropertyOwner: 'PropertyOwner',
+    ManagedOwner: 'ManagedOwner',
+    Integrator: 'Integrator',
+    PropertyManager: 'PropertyManager',
+    FinanceManager: 'FinanceManager'
 } as const;
 
-export type RoleNames = typeof RoleNames[keyof typeof RoleNames];
-
+export type RoleAssignmentRequestBodyRoleNameEnum = typeof RoleAssignmentRequestBodyRoleNameEnum[keyof typeof RoleAssignmentRequestBodyRoleNameEnum];
 
 /**
- * Teammate access applied
+ * Actor making the assignment
  * @export
- * @interface TeammateAccessSuccessResponse
+ * @interface RoleAssignmentRequestBodyActor
  */
-export interface TeammateAccessSuccessResponse {
+export interface RoleAssignmentRequestBodyActor {
     /**
      * 
      * @type {string}
-     * @memberof TeammateAccessSuccessResponse
+     * @memberof RoleAssignmentRequestBodyActor
      */
-    'message': string;
-}
-/**
- * Update teammate app access for an existing teammate. Email and name are not accepted on update; the existing values stored against the user id are reused.
- * @export
- * @interface UpdateTeammateAccessRequestBody
- */
-export interface UpdateTeammateAccessRequestBody {
+    'type': RoleAssignmentRequestBodyActorTypeEnum;
     /**
-     * Teammate app access level (role)
+     * 
      * @type {string}
-     * @memberof UpdateTeammateAccessRequestBody
+     * @memberof RoleAssignmentRequestBodyActor
      */
-    'appAccessLevel': UpdateTeammateAccessRequestBodyAppAccessLevelEnum;
+    'id': string;
     /**
-     * Brand identifier (AppId); normalized to lowercase when stored
+     * 
      * @type {string}
-     * @memberof UpdateTeammateAccessRequestBody
+     * @memberof RoleAssignmentRequestBodyActor
      */
-    'brandId': string;
-    /**
-     * Org-wide store access; when false, propertyIds are required for property-scoped roles
-     * @type {boolean}
-     * @memberof UpdateTeammateAccessRequestBody
-     */
-    'hasAccessToAllStores': boolean;
+    'name'?: string;
     /**
-     * Property resource ids (e.g. p123) when scoped to properties
-     * @type {Array<string>}
-     * @memberof UpdateTeammateAccessRequestBody
+     * 
+     * @type {string}
+     * @memberof RoleAssignmentRequestBodyActor
      */
-    'propertyIds'?: Array<string>;
+    'email'?: string;
     /**
-     * Optional v2 permission set keys to apply to this teammate role
-     * @type {Array<string>}
-     * @memberof UpdateTeammateAccessRequestBody
+     * 
+     * @type {string}
+     * @memberof RoleAssignmentRequestBodyActor
      */
-    'optionalPermissionSetKeys'?: Array<string>;
+    'phone'?: string;
 }
 
-export const UpdateTeammateAccessRequestBodyAppAccessLevelEnum = {
-    Owner: 'Owner',
-    ManagedOwner: 'ManagedOwner',
-    PropertyOwner: 'PropertyOwner',
-    PropertyManager: 'PropertyManager',
-    FinanceManager: 'FinanceManager',
-    Integrator: 'Integrator'
+export const RoleAssignmentRequestBodyActorTypeEnum = {
+    User: 'User',
+    Automation: 'Automation'
 } as const;
 
-export type UpdateTeammateAccessRequestBodyAppAccessLevelEnum = typeof UpdateTeammateAccessRequestBodyAppAccessLevelEnum[keyof typeof UpdateTeammateAccessRequestBodyAppAccessLevelEnum];
+export type RoleAssignmentRequestBodyActorTypeEnum = typeof RoleAssignmentRequestBodyActorTypeEnum[keyof typeof RoleAssignmentRequestBodyActorTypeEnum];
 
 /**
- * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
+ * Principal to assign the role to
  * @export
- * @interface V2UiRoleAssignmentRequestBody
+ * @interface RoleAssignmentRequestBodyPrincipal
  */
-export interface V2UiRoleAssignmentRequestBody {
+export interface RoleAssignmentRequestBodyPrincipal {
     /**
-     * Teammate app access level (role)
+     * 
      * @type {string}
-     * @memberof V2UiRoleAssignmentRequestBody
+     * @memberof RoleAssignmentRequestBodyPrincipal
      */
-    'appAccessLevel': V2UiRoleAssignmentRequestBodyAppAccessLevelEnum;
+    'type': RoleAssignmentRequestBodyPrincipalTypeEnum;
     /**
-     * Org-wide store access; when false, propertyIds are required for property-scoped roles
-     * @type {boolean}
-     * @memberof V2UiRoleAssignmentRequestBody
+     * 
+     * @type {string}
+     * @memberof RoleAssignmentRequestBodyPrincipal
      */
-    'hasAccessToAllStores': boolean;
+    'id': string;
     /**
-     * Property resource ids (e.g. p123) when scoped to properties
-     * @type {Array<string>}
-     * @memberof V2UiRoleAssignmentRequestBody
+     * 
+     * @type {string}
+     * @memberof RoleAssignmentRequestBodyPrincipal
      */
-    'propertyIds'?: Array<string>;
+    'name'?: string;
     /**
-     * Optional v2 permission set keys to apply to this teammate role
-     * @type {Array<string>}
-     * @memberof V2UiRoleAssignmentRequestBody
+     * 
+     * @type {string}
+     * @memberof RoleAssignmentRequestBodyPrincipal
      */
-    'optionalPermissionSetKeys'?: Array<string>;
+    'email'?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof RoleAssignmentRequestBodyPrincipal
+     */
+    'phone'?: string;
 }
 
-export const V2UiRoleAssignmentRequestBodyAppAccessLevelEnum = {
-    Owner: 'Owner',
-    ManagedOwner: 'ManagedOwner',
-    PropertyOwner: 'PropertyOwner',
-    PropertyManager: 'PropertyManager',
-    FinanceManager: 'FinanceManager',
-    Integrator: 'Integrator'
+export const RoleAssignmentRequestBodyPrincipalTypeEnum = {
+    User: 'User',
+    Automation: 'Automation'
+} as const;
+
+export type RoleAssignmentRequestBodyPrincipalTypeEnum = typeof RoleAssignmentRequestBodyPrincipalTypeEnum[keyof typeof RoleAssignmentRequestBodyPrincipalTypeEnum];
+
+/**
+ * Role assignment applied
+ * @export
+ * @interface RoleAssignmentSuccessResponse
+ */
+export interface RoleAssignmentSuccessResponse {
+    /**
+     * 
+     * @type {string}
+     * @memberof RoleAssignmentSuccessResponse
+     */
+    'message': string;
+}
+/**
+ * Role names
+ * @export
+ * @enum {string}
+ */
+
+export const RoleNames = {
+    Admin: 'Admin',
+    Factory: 'Factory',
+    AuthDeveloper: 'AuthDeveloper'
 } as const;
 
-export type V2UiRoleAssignmentRequestBodyAppAccessLevelEnum = typeof V2UiRoleAssignmentRequestBodyAppAccessLevelEnum[keyof typeof V2UiRoleAssignmentRequestBodyAppAccessLevelEnum];
+export type RoleNames = typeof RoleNames[keyof typeof RoleNames];
+
 
 /**
  * 
@@ -2867,46 +2358,13 @@ export class AuthorizedEntitiesApi extends BaseAPI {
  */
 export const ConfigurationDataApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
-        /**
-         * List the available feature based roles
-         * @summary List Feature Based Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        configListFeatureBasedRoles: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/config/featureBasedRoles`;
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
         /**
          * List the available permissions
          * @summary List Permissions
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        configListPermissions: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listPermissions: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/config/permissions`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -2939,7 +2397,7 @@ export const ConfigurationDataApiAxiosParamCreator = function (configuration?: C
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        configListRoles: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        listRoles: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/config/roles`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -2957,105 +2415,6 @@ export const ConfigurationDataApiAxiosParamCreator = function (configuration?: C
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the available feature based roles
-         * @summary List Feature Based Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listFeatureBasedRoles: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/featureBasedRoles`;
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the available permissions
-         * @summary List Permissions
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listPermissions: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/permissions`;
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the available roles
-         * @summary List Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listRoles: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            const localVarPath = `/roles`;
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -3075,54 +2434,6 @@ export const ConfigurationDataApiAxiosParamCreator = function (configuration?: C
 export const ConfigurationDataApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = ConfigurationDataApiAxiosParamCreator(configuration)
     return {
-        /**
-         * List the available feature based roles
-         * @summary List Feature Based Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async configListFeatureBasedRoles(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ListFeatureBasedRolesSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.configListFeatureBasedRoles(options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['ConfigurationDataApi.configListFeatureBasedRoles']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * List the available permissions
-         * @summary List Permissions
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async configListPermissions(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ListPermissionsSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.configListPermissions(options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['ConfigurationDataApi.configListPermissions']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * List the available roles
-         * @summary List Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async configListRoles(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ListRolesSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.configListRoles(options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['ConfigurationDataApi.configListRoles']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * List the available feature based roles
-         * @summary List Feature Based Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listFeatureBasedRoles(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<ListFeatureBasedRolesSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listFeatureBasedRoles(options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['ConfigurationDataApi.listFeatureBasedRoles']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
         /**
          * List the available permissions
          * @summary List Permissions
@@ -3157,42 +2468,6 @@ export const ConfigurationDataApiFp = function(configuration?: Configuration) {
 export const ConfigurationDataApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = ConfigurationDataApiFp(configuration)
     return {
-        /**
-         * List the available feature based roles
-         * @summary List Feature Based Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        configListFeatureBasedRoles(options?: RawAxiosRequestConfig): AxiosPromise<ListFeatureBasedRolesSuccessResponse> {
-            return localVarFp.configListFeatureBasedRoles(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * List the available permissions
-         * @summary List Permissions
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        configListPermissions(options?: RawAxiosRequestConfig): AxiosPromise<ListPermissionsSuccessResponse> {
-            return localVarFp.configListPermissions(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * List the available roles
-         * @summary List Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        configListRoles(options?: RawAxiosRequestConfig): AxiosPromise<ListRolesSuccessResponse> {
-            return localVarFp.configListRoles(options).then((request) => request(axios, basePath));
-        },
-        /**
-         * List the available feature based roles
-         * @summary List Feature Based Roles
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listFeatureBasedRoles(options?: RawAxiosRequestConfig): AxiosPromise<ListFeatureBasedRolesSuccessResponse> {
-            return localVarFp.listFeatureBasedRoles(options).then((request) => request(axios, basePath));
-        },
         /**
          * List the available permissions
          * @summary List Permissions
@@ -3221,347 +2496,49 @@ export const ConfigurationDataApiFactory = function (configuration?: Configurati
  * @extends {BaseAPI}
  */
 export class ConfigurationDataApi extends BaseAPI {
-    /**
-     * List the available feature based roles
-     * @summary List Feature Based Roles
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ConfigurationDataApi
-     */
-    public configListFeatureBasedRoles(options?: RawAxiosRequestConfig) {
-        return ConfigurationDataApiFp(this.configuration).configListFeatureBasedRoles(options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * List the available permissions
      * @summary List Permissions
      * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ConfigurationDataApi
-     */
-    public configListPermissions(options?: RawAxiosRequestConfig) {
-        return ConfigurationDataApiFp(this.configuration).configListPermissions(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * List the available roles
-     * @summary List Roles
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ConfigurationDataApi
-     */
-    public configListRoles(options?: RawAxiosRequestConfig) {
-        return ConfigurationDataApiFp(this.configuration).configListRoles(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * List the available feature based roles
-     * @summary List Feature Based Roles
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ConfigurationDataApi
-     */
-    public listFeatureBasedRoles(options?: RawAxiosRequestConfig) {
-        return ConfigurationDataApiFp(this.configuration).listFeatureBasedRoles(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * List the available permissions
-     * @summary List Permissions
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ConfigurationDataApi
-     */
-    public listPermissions(options?: RawAxiosRequestConfig) {
-        return ConfigurationDataApiFp(this.configuration).listPermissions(options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * List the available roles
-     * @summary List Roles
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof ConfigurationDataApi
-     */
-    public listRoles(options?: RawAxiosRequestConfig) {
-        return ConfigurationDataApiFp(this.configuration).listRoles(options).then((request) => request(this.axios, this.basePath));
-    }
-}
-
-
-
-/**
- * RoleAssignmentApi - axios parameter creator
- * @export
- */
-export const RoleAssignmentApiAxiosParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * Assigns a specified role to a given principal (user, group, etc.)
-         * @summary Assign Role to Principal
-         * @param {string} orgId 
-         * @param {AssignRoleRequestBody} [assignRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        assignRoleToPrincipal: async (orgId: string, assignRoleRequestBody?: AssignRoleRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('assignRoleToPrincipal', 'orgId', orgId)
-            const localVarPath = `/orgs/{orgId}/roles/assignRoleToPrincipal`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(assignRoleRequestBody, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Get the active roles for a given principal
-         * @summary Get Principal Roles
-         * @param {string} orgId 
-         * @param {GetPrincipalRolesRequestBody} [getPrincipalRolesRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getPrincipalRoles: async (orgId: string, getPrincipalRolesRequestBody?: GetPrincipalRolesRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('getPrincipalRoles', 'orgId', orgId)
-            const localVarPath = `/orgs/{orgId}/roles/getPrincipalRoles`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(getPrincipalRolesRequestBody, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Grant teammate app access and underlying permissions for a user being assigned within a brand for the first time. Email and name are persisted on first assignment only and must be supplied here.
-         * @summary Grant teammate access to a new user
-         * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {GrantTeammateAccessRequestBody} [grantTeammateAccessRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        grantTeammateAccess: async (orgId: string, userId: string, grantTeammateAccessRequestBody?: GrantTeammateAccessRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('grantTeammateAccess', 'orgId', orgId)
-            // verify required parameter 'userId' is not null or undefined
-            assertParamExists('grantTeammateAccess', 'userId', userId)
-            const localVarPath = `/orgs/{orgId}/users/{userId}/grantTeammateAccess`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)))
-                .replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(grantTeammateAccessRequestBody, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-         * @summary Grant v2 teammate access to a user
-         * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        grantTeammateAccessV2: async (orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('grantTeammateAccessV2', 'orgId', orgId)
-            // verify required parameter 'userId' is not null or undefined
-            assertParamExists('grantTeammateAccessV2', 'userId', userId)
-            const localVarPath = `/v2/orgs/{orgId}/users/{userId}/grantTeammateAccess`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)))
-                .replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(v2UiRoleAssignmentRequestBody, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Rematerializes a V2 role assignment and applies the resulting policy assignments
-         * @summary Rematerialize V2 Role Assignment
-         * @param {string} orgId 
-         * @param {RematerializeRoleAssignmentV2RequestBody} [rematerializeRoleAssignmentV2RequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        rematerializeRoleAssignmentV2: async (orgId: string, rematerializeRoleAssignmentV2RequestBody?: RematerializeRoleAssignmentV2RequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('rematerializeRoleAssignmentV2', 'orgId', orgId)
-            const localVarPath = `/orgs/{orgId}/roleAssignments/v2/rematerialize`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(rematerializeRoleAssignmentV2RequestBody, localVarRequestOptions, configuration)
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Revokes a forbidden role from a given principal (user, group, etc.)
-         * @summary Revoke Forbidden Role from Principal
-         * @param {string} orgId 
-         * @param {RevokeForbiddenRoleRequestBody} [revokeForbiddenRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        revokeForbiddenRoleFromPrincipal: async (orgId: string, revokeForbiddenRoleRequestBody?: RevokeForbiddenRoleRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('revokeForbiddenRoleFromPrincipal', 'orgId', orgId)
-            const localVarPath = `/orgs/{orgId}/roles/revokeForbiddenRoleFromPrincipal`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // use dummy base URL string because the URL constructor only accepts absolute URLs.
-            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
-            let baseOptions;
-            if (configuration) {
-                baseOptions = configuration.baseOptions;
-            }
-
-            const localVarRequestOptions = { method: 'POST', ...baseOptions, ...options};
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
+     * @throws {RequiredError}
+     * @memberof ConfigurationDataApi
+     */
+    public listPermissions(options?: RawAxiosRequestConfig) {
+        return ConfigurationDataApiFp(this.configuration).listPermissions(options).then((request) => request(this.axios, this.basePath));
+    }
 
+    /**
+     * List the available roles
+     * @summary List Roles
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof ConfigurationDataApi
+     */
+    public listRoles(options?: RawAxiosRequestConfig) {
+        return ConfigurationDataApiFp(this.configuration).listRoles(options).then((request) => request(this.axios, this.basePath));
+    }
+}
 
-    
-            localVarHeaderParameter['Content-Type'] = 'application/json';
 
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(revokeForbiddenRoleRequestBody, localVarRequestOptions, configuration)
 
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
+/**
+ * RoleAssignmentApi - axios parameter creator
+ * @export
+ */
+export const RoleAssignmentApiAxiosParamCreator = function (configuration?: Configuration) {
+    return {
         /**
-         * Revokes a specified role from a given principal (user, group, etc.)
-         * @summary Revoke Role from Principal
+         * Apply a role assignment for the target user without invoking legacy teammate/Zeus role assignment flows.
+         * @summary Apply role assignment
          * @param {string} orgId 
-         * @param {RevokeRoleRequestBody} [revokeRoleRequestBody] 
+         * @param {RoleAssignmentRequestBody} [roleAssignmentRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        revokeRoleFromPrincipal: async (orgId: string, revokeRoleRequestBody?: RevokeRoleRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        applyRoleAssignment: async (orgId: string, roleAssignmentRequestBody?: RoleAssignmentRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('revokeRoleFromPrincipal', 'orgId', orgId)
-            const localVarPath = `/orgs/{orgId}/roles/revokeRoleFromPrincipal`
+            assertParamExists('applyRoleAssignment', 'orgId', orgId)
+            const localVarPath = `/orgs/{orgId}/roleAssignments/apply`
                 .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -3584,7 +2561,7 @@ export const RoleAssignmentApiAxiosParamCreator = function (configuration?: Conf
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(revokeRoleRequestBody, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(roleAssignmentRequestBody, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -3592,22 +2569,18 @@ export const RoleAssignmentApiAxiosParamCreator = function (configuration?: Conf
             };
         },
         /**
-         * Update teammate app access and underlying permissions for an existing teammate. The user must already have been granted access for this brand. Email and name are not accepted on update; existing values are reused. Returns 404 if no existing assignment is found.
-         * @summary Update teammate access for an existing user
+         * Rematerializes a role assignment and applies the resulting policy assignments
+         * @summary Rematerialize Role Assignment
          * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {UpdateTeammateAccessRequestBody} [updateTeammateAccessRequestBody] 
+         * @param {RematerializeRoleAssignmentRequestBody} [rematerializeRoleAssignmentRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateTeammateAccess: async (orgId: string, userId: string, updateTeammateAccessRequestBody?: UpdateTeammateAccessRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        rematerializeRoleAssignmentV2: async (orgId: string, rematerializeRoleAssignmentRequestBody?: RematerializeRoleAssignmentRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('updateTeammateAccess', 'orgId', orgId)
-            // verify required parameter 'userId' is not null or undefined
-            assertParamExists('updateTeammateAccess', 'userId', userId)
-            const localVarPath = `/orgs/{orgId}/users/{userId}/updateTeammateAccess`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)))
-                .replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
+            assertParamExists('rematerializeRoleAssignmentV2', 'orgId', orgId)
+            const localVarPath = `/orgs/{orgId}/roleAssignments/rematerialize`
+                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -3629,7 +2602,7 @@ export const RoleAssignmentApiAxiosParamCreator = function (configuration?: Conf
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(updateTeammateAccessRequestBody, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(rematerializeRoleAssignmentRequestBody, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -3637,22 +2610,18 @@ export const RoleAssignmentApiAxiosParamCreator = function (configuration?: Conf
             };
         },
         /**
-         * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-         * @summary Update v2 teammate access for a user
+         * Revokes all V2 role assignments for the teammate in this org, reconciles away their policies, and removes them from the org user list. Does not delete the teammate account in Zeus.
+         * @summary Remove teammate
          * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
+         * @param {RemoveTeammateRequestBody} [removeTeammateRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        updateTeammateAccessV2: async (orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        removeTeammate: async (orgId: string, removeTeammateRequestBody?: RemoveTeammateRequestBody, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('updateTeammateAccessV2', 'orgId', orgId)
-            // verify required parameter 'userId' is not null or undefined
-            assertParamExists('updateTeammateAccessV2', 'userId', userId)
-            const localVarPath = `/v2/orgs/{orgId}/users/{userId}/updateTeammateAccess`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)))
-                .replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
+            assertParamExists('removeTeammate', 'orgId', orgId)
+            const localVarPath = `/orgs/{orgId}/roleAssignments/remove`
+                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
             let baseOptions;
@@ -3674,7 +2643,7 @@ export const RoleAssignmentApiAxiosParamCreator = function (configuration?: Conf
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(v2UiRoleAssignmentRequestBody, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(removeTeammateRequestBody, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -3692,133 +2661,45 @@ export const RoleAssignmentApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = RoleAssignmentApiAxiosParamCreator(configuration)
     return {
         /**
-         * Assigns a specified role to a given principal (user, group, etc.)
-         * @summary Assign Role to Principal
-         * @param {string} orgId 
-         * @param {AssignRoleRequestBody} [assignRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async assignRoleToPrincipal(orgId: string, assignRoleRequestBody?: AssignRoleRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<AssignRoleSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.assignRoleToPrincipal(orgId, assignRoleRequestBody, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.assignRoleToPrincipal']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * Get the active roles for a given principal
-         * @summary Get Principal Roles
-         * @param {string} orgId 
-         * @param {GetPrincipalRolesRequestBody} [getPrincipalRolesRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async getPrincipalRoles(orgId: string, getPrincipalRolesRequestBody?: GetPrincipalRolesRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<GetPrincipalRolesSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getPrincipalRoles(orgId, getPrincipalRolesRequestBody, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.getPrincipalRoles']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * Grant teammate app access and underlying permissions for a user being assigned within a brand for the first time. Email and name are persisted on first assignment only and must be supplied here.
-         * @summary Grant teammate access to a new user
-         * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {GrantTeammateAccessRequestBody} [grantTeammateAccessRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async grantTeammateAccess(orgId: string, userId: string, grantTeammateAccessRequestBody?: GrantTeammateAccessRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<TeammateAccessSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.grantTeammateAccess(orgId, userId, grantTeammateAccessRequestBody, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.grantTeammateAccess']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-         * @summary Grant v2 teammate access to a user
+         * Apply a role assignment for the target user without invoking legacy teammate/Zeus role assignment flows.
+         * @summary Apply role assignment
          * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
+         * @param {RoleAssignmentRequestBody} [roleAssignmentRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async grantTeammateAccessV2(orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<TeammateAccessSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.grantTeammateAccessV2(orgId, userId, v2UiRoleAssignmentRequestBody, options);
+        async applyRoleAssignment(orgId: string, roleAssignmentRequestBody?: RoleAssignmentRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RoleAssignmentSuccessResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.applyRoleAssignment(orgId, roleAssignmentRequestBody, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.grantTeammateAccessV2']?.[localVarOperationServerIndex]?.url;
+            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.applyRoleAssignment']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
-         * Rematerializes a V2 role assignment and applies the resulting policy assignments
-         * @summary Rematerialize V2 Role Assignment
+         * Rematerializes a role assignment and applies the resulting policy assignments
+         * @summary Rematerialize Role Assignment
          * @param {string} orgId 
-         * @param {RematerializeRoleAssignmentV2RequestBody} [rematerializeRoleAssignmentV2RequestBody] 
+         * @param {RematerializeRoleAssignmentRequestBody} [rematerializeRoleAssignmentRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async rematerializeRoleAssignmentV2(orgId: string, rematerializeRoleAssignmentV2RequestBody?: RematerializeRoleAssignmentV2RequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RematerializeRoleAssignmentV2SuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.rematerializeRoleAssignmentV2(orgId, rematerializeRoleAssignmentV2RequestBody, options);
+        async rematerializeRoleAssignmentV2(orgId: string, rematerializeRoleAssignmentRequestBody?: RematerializeRoleAssignmentRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RematerializeRoleAssignmentSuccessResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.rematerializeRoleAssignmentV2(orgId, rematerializeRoleAssignmentRequestBody, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.rematerializeRoleAssignmentV2']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
-         * Revokes a forbidden role from a given principal (user, group, etc.)
-         * @summary Revoke Forbidden Role from Principal
-         * @param {string} orgId 
-         * @param {RevokeForbiddenRoleRequestBody} [revokeForbiddenRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async revokeForbiddenRoleFromPrincipal(orgId: string, revokeForbiddenRoleRequestBody?: RevokeForbiddenRoleRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RevokeRoleSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.revokeForbiddenRoleFromPrincipal(orgId, revokeForbiddenRoleRequestBody, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.revokeForbiddenRoleFromPrincipal']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * Revokes a specified role from a given principal (user, group, etc.)
-         * @summary Revoke Role from Principal
-         * @param {string} orgId 
-         * @param {RevokeRoleRequestBody} [revokeRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async revokeRoleFromPrincipal(orgId: string, revokeRoleRequestBody?: RevokeRoleRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RevokeRoleSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.revokeRoleFromPrincipal(orgId, revokeRoleRequestBody, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.revokeRoleFromPrincipal']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * Update teammate app access and underlying permissions for an existing teammate. The user must already have been granted access for this brand. Email and name are not accepted on update; existing values are reused. Returns 404 if no existing assignment is found.
-         * @summary Update teammate access for an existing user
-         * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {UpdateTeammateAccessRequestBody} [updateTeammateAccessRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async updateTeammateAccess(orgId: string, userId: string, updateTeammateAccessRequestBody?: UpdateTeammateAccessRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<TeammateAccessSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateTeammateAccess(orgId, userId, updateTeammateAccessRequestBody, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.updateTeammateAccess']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-         * @summary Update v2 teammate access for a user
+         * Revokes all V2 role assignments for the teammate in this org, reconciles away their policies, and removes them from the org user list. Does not delete the teammate account in Zeus.
+         * @summary Remove teammate
          * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
+         * @param {RemoveTeammateRequestBody} [removeTeammateRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async updateTeammateAccessV2(orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<TeammateAccessSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.updateTeammateAccessV2(orgId, userId, v2UiRoleAssignmentRequestBody, options);
+        async removeTeammate(orgId: string, removeTeammateRequestBody?: RemoveTeammateRequestBody, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<RemoveTeammateSuccessResponse>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.removeTeammate(orgId, removeTeammateRequestBody, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.updateTeammateAccessV2']?.[localVarOperationServerIndex]?.url;
+            const localVarOperationServerBasePath = operationServerMap['RoleAssignmentApi.removeTeammate']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
@@ -3832,107 +2713,37 @@ export const RoleAssignmentApiFactory = function (configuration?: Configuration,
     const localVarFp = RoleAssignmentApiFp(configuration)
     return {
         /**
-         * Assigns a specified role to a given principal (user, group, etc.)
-         * @summary Assign Role to Principal
-         * @param {string} orgId 
-         * @param {AssignRoleRequestBody} [assignRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        assignRoleToPrincipal(orgId: string, assignRoleRequestBody?: AssignRoleRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<AssignRoleSuccessResponse> {
-            return localVarFp.assignRoleToPrincipal(orgId, assignRoleRequestBody, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Get the active roles for a given principal
-         * @summary Get Principal Roles
+         * Apply a role assignment for the target user without invoking legacy teammate/Zeus role assignment flows.
+         * @summary Apply role assignment
          * @param {string} orgId 
-         * @param {GetPrincipalRolesRequestBody} [getPrincipalRolesRequestBody] 
+         * @param {RoleAssignmentRequestBody} [roleAssignmentRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getPrincipalRoles(orgId: string, getPrincipalRolesRequestBody?: GetPrincipalRolesRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<GetPrincipalRolesSuccessResponse> {
-            return localVarFp.getPrincipalRoles(orgId, getPrincipalRolesRequestBody, options).then((request) => request(axios, basePath));
+        applyRoleAssignment(orgId: string, roleAssignmentRequestBody?: RoleAssignmentRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<RoleAssignmentSuccessResponse> {
+            return localVarFp.applyRoleAssignment(orgId, roleAssignmentRequestBody, options).then((request) => request(axios, basePath));
         },
         /**
-         * Grant teammate app access and underlying permissions for a user being assigned within a brand for the first time. Email and name are persisted on first assignment only and must be supplied here.
-         * @summary Grant teammate access to a new user
+         * Rematerializes a role assignment and applies the resulting policy assignments
+         * @summary Rematerialize Role Assignment
          * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {GrantTeammateAccessRequestBody} [grantTeammateAccessRequestBody] 
+         * @param {RematerializeRoleAssignmentRequestBody} [rematerializeRoleAssignmentRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        grantTeammateAccess(orgId: string, userId: string, grantTeammateAccessRequestBody?: GrantTeammateAccessRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<TeammateAccessSuccessResponse> {
-            return localVarFp.grantTeammateAccess(orgId, userId, grantTeammateAccessRequestBody, options).then((request) => request(axios, basePath));
+        rematerializeRoleAssignmentV2(orgId: string, rematerializeRoleAssignmentRequestBody?: RematerializeRoleAssignmentRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<RematerializeRoleAssignmentSuccessResponse> {
+            return localVarFp.rematerializeRoleAssignmentV2(orgId, rematerializeRoleAssignmentRequestBody, options).then((request) => request(axios, basePath));
         },
         /**
-         * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-         * @summary Grant v2 teammate access to a user
+         * Revokes all V2 role assignments for the teammate in this org, reconciles away their policies, and removes them from the org user list. Does not delete the teammate account in Zeus.
+         * @summary Remove teammate
          * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
+         * @param {RemoveTeammateRequestBody} [removeTeammateRequestBody] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        grantTeammateAccessV2(orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<TeammateAccessSuccessResponse> {
-            return localVarFp.grantTeammateAccessV2(orgId, userId, v2UiRoleAssignmentRequestBody, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Rematerializes a V2 role assignment and applies the resulting policy assignments
-         * @summary Rematerialize V2 Role Assignment
-         * @param {string} orgId 
-         * @param {RematerializeRoleAssignmentV2RequestBody} [rematerializeRoleAssignmentV2RequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        rematerializeRoleAssignmentV2(orgId: string, rematerializeRoleAssignmentV2RequestBody?: RematerializeRoleAssignmentV2RequestBody, options?: RawAxiosRequestConfig): AxiosPromise<RematerializeRoleAssignmentV2SuccessResponse> {
-            return localVarFp.rematerializeRoleAssignmentV2(orgId, rematerializeRoleAssignmentV2RequestBody, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Revokes a forbidden role from a given principal (user, group, etc.)
-         * @summary Revoke Forbidden Role from Principal
-         * @param {string} orgId 
-         * @param {RevokeForbiddenRoleRequestBody} [revokeForbiddenRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        revokeForbiddenRoleFromPrincipal(orgId: string, revokeForbiddenRoleRequestBody?: RevokeForbiddenRoleRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<RevokeRoleSuccessResponse> {
-            return localVarFp.revokeForbiddenRoleFromPrincipal(orgId, revokeForbiddenRoleRequestBody, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Revokes a specified role from a given principal (user, group, etc.)
-         * @summary Revoke Role from Principal
-         * @param {string} orgId 
-         * @param {RevokeRoleRequestBody} [revokeRoleRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        revokeRoleFromPrincipal(orgId: string, revokeRoleRequestBody?: RevokeRoleRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<RevokeRoleSuccessResponse> {
-            return localVarFp.revokeRoleFromPrincipal(orgId, revokeRoleRequestBody, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Update teammate app access and underlying permissions for an existing teammate. The user must already have been granted access for this brand. Email and name are not accepted on update; existing values are reused. Returns 404 if no existing assignment is found.
-         * @summary Update teammate access for an existing user
-         * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {UpdateTeammateAccessRequestBody} [updateTeammateAccessRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateTeammateAccess(orgId: string, userId: string, updateTeammateAccessRequestBody?: UpdateTeammateAccessRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<TeammateAccessSuccessResponse> {
-            return localVarFp.updateTeammateAccess(orgId, userId, updateTeammateAccessRequestBody, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-         * @summary Update v2 teammate access for a user
-         * @param {string} orgId 
-         * @param {string} userId Target Flipdish user id (numeric string)
-         * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateTeammateAccessV2(orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<TeammateAccessSuccessResponse> {
-            return localVarFp.updateTeammateAccessV2(orgId, userId, v2UiRoleAssignmentRequestBody, options).then((request) => request(axios, basePath));
+        removeTeammate(orgId: string, removeTeammateRequestBody?: RemoveTeammateRequestBody, options?: RawAxiosRequestConfig): AxiosPromise<RemoveTeammateSuccessResponse> {
+            return localVarFp.removeTeammate(orgId, removeTeammateRequestBody, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -3945,124 +2756,42 @@ export const RoleAssignmentApiFactory = function (configuration?: Configuration,
  */
 export class RoleAssignmentApi extends BaseAPI {
     /**
-     * Assigns a specified role to a given principal (user, group, etc.)
-     * @summary Assign Role to Principal
-     * @param {string} orgId 
-     * @param {AssignRoleRequestBody} [assignRoleRequestBody] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof RoleAssignmentApi
-     */
-    public assignRoleToPrincipal(orgId: string, assignRoleRequestBody?: AssignRoleRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).assignRoleToPrincipal(orgId, assignRoleRequestBody, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Get the active roles for a given principal
-     * @summary Get Principal Roles
-     * @param {string} orgId 
-     * @param {GetPrincipalRolesRequestBody} [getPrincipalRolesRequestBody] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof RoleAssignmentApi
-     */
-    public getPrincipalRoles(orgId: string, getPrincipalRolesRequestBody?: GetPrincipalRolesRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).getPrincipalRoles(orgId, getPrincipalRolesRequestBody, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Grant teammate app access and underlying permissions for a user being assigned within a brand for the first time. Email and name are persisted on first assignment only and must be supplied here.
-     * @summary Grant teammate access to a new user
-     * @param {string} orgId 
-     * @param {string} userId Target Flipdish user id (numeric string)
-     * @param {GrantTeammateAccessRequestBody} [grantTeammateAccessRequestBody] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof RoleAssignmentApi
-     */
-    public grantTeammateAccess(orgId: string, userId: string, grantTeammateAccessRequestBody?: GrantTeammateAccessRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).grantTeammateAccess(orgId, userId, grantTeammateAccessRequestBody, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-     * @summary Grant v2 teammate access to a user
-     * @param {string} orgId 
-     * @param {string} userId Target Flipdish user id (numeric string)
-     * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof RoleAssignmentApi
-     */
-    public grantTeammateAccessV2(orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).grantTeammateAccessV2(orgId, userId, v2UiRoleAssignmentRequestBody, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Rematerializes a V2 role assignment and applies the resulting policy assignments
-     * @summary Rematerialize V2 Role Assignment
-     * @param {string} orgId 
-     * @param {RematerializeRoleAssignmentV2RequestBody} [rematerializeRoleAssignmentV2RequestBody] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof RoleAssignmentApi
-     */
-    public rematerializeRoleAssignmentV2(orgId: string, rematerializeRoleAssignmentV2RequestBody?: RematerializeRoleAssignmentV2RequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).rematerializeRoleAssignmentV2(orgId, rematerializeRoleAssignmentV2RequestBody, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Revokes a forbidden role from a given principal (user, group, etc.)
-     * @summary Revoke Forbidden Role from Principal
-     * @param {string} orgId 
-     * @param {RevokeForbiddenRoleRequestBody} [revokeForbiddenRoleRequestBody] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof RoleAssignmentApi
-     */
-    public revokeForbiddenRoleFromPrincipal(orgId: string, revokeForbiddenRoleRequestBody?: RevokeForbiddenRoleRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).revokeForbiddenRoleFromPrincipal(orgId, revokeForbiddenRoleRequestBody, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Revokes a specified role from a given principal (user, group, etc.)
-     * @summary Revoke Role from Principal
+     * Apply a role assignment for the target user without invoking legacy teammate/Zeus role assignment flows.
+     * @summary Apply role assignment
      * @param {string} orgId 
-     * @param {RevokeRoleRequestBody} [revokeRoleRequestBody] 
+     * @param {RoleAssignmentRequestBody} [roleAssignmentRequestBody] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof RoleAssignmentApi
      */
-    public revokeRoleFromPrincipal(orgId: string, revokeRoleRequestBody?: RevokeRoleRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).revokeRoleFromPrincipal(orgId, revokeRoleRequestBody, options).then((request) => request(this.axios, this.basePath));
+    public applyRoleAssignment(orgId: string, roleAssignmentRequestBody?: RoleAssignmentRequestBody, options?: RawAxiosRequestConfig) {
+        return RoleAssignmentApiFp(this.configuration).applyRoleAssignment(orgId, roleAssignmentRequestBody, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
-     * Update teammate app access and underlying permissions for an existing teammate. The user must already have been granted access for this brand. Email and name are not accepted on update; existing values are reused. Returns 404 if no existing assignment is found.
-     * @summary Update teammate access for an existing user
+     * Rematerializes a role assignment and applies the resulting policy assignments
+     * @summary Rematerialize Role Assignment
      * @param {string} orgId 
-     * @param {string} userId Target Flipdish user id (numeric string)
-     * @param {UpdateTeammateAccessRequestBody} [updateTeammateAccessRequestBody] 
+     * @param {RematerializeRoleAssignmentRequestBody} [rematerializeRoleAssignmentRequestBody] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof RoleAssignmentApi
      */
-    public updateTeammateAccess(orgId: string, userId: string, updateTeammateAccessRequestBody?: UpdateTeammateAccessRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).updateTeammateAccess(orgId, userId, updateTeammateAccessRequestBody, options).then((request) => request(this.axios, this.basePath));
+    public rematerializeRoleAssignmentV2(orgId: string, rematerializeRoleAssignmentRequestBody?: RematerializeRoleAssignmentRequestBody, options?: RawAxiosRequestConfig) {
+        return RoleAssignmentApiFp(this.configuration).rematerializeRoleAssignmentV2(orgId, rematerializeRoleAssignmentRequestBody, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
-     * Apply a v2 UI role assignment without invoking legacy teammate/Zeus role assignment flows.
-     * @summary Update v2 teammate access for a user
+     * Revokes all V2 role assignments for the teammate in this org, reconciles away their policies, and removes them from the org user list. Does not delete the teammate account in Zeus.
+     * @summary Remove teammate
      * @param {string} orgId 
-     * @param {string} userId Target Flipdish user id (numeric string)
-     * @param {V2UiRoleAssignmentRequestBody} [v2UiRoleAssignmentRequestBody] 
+     * @param {RemoveTeammateRequestBody} [removeTeammateRequestBody] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof RoleAssignmentApi
      */
-    public updateTeammateAccessV2(orgId: string, userId: string, v2UiRoleAssignmentRequestBody?: V2UiRoleAssignmentRequestBody, options?: RawAxiosRequestConfig) {
-        return RoleAssignmentApiFp(this.configuration).updateTeammateAccessV2(orgId, userId, v2UiRoleAssignmentRequestBody, options).then((request) => request(this.axios, this.basePath));
+    public removeTeammate(orgId: string, removeTeammateRequestBody?: RemoveTeammateRequestBody, options?: RawAxiosRequestConfig) {
+        return RoleAssignmentApiFp(this.configuration).removeTeammate(orgId, removeTeammateRequestBody, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
@@ -4102,80 +2831,6 @@ export const UserManagementApiAxiosParamCreator = function (configuration?: Conf
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the users in a given org for the v2 control plane UI
-         * @summary List Users in Org V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listUsersInOrgV2: async (orgId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('listUsersInOrgV2', 'orgId', orgId)
-            const localVarPath = `/v2/orgs/{orgId}/users`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Same principals as list users, plus roleDisplay and isCustomised per principal (extra Dynamo reads for compensating roles and granular assignments).
-         * @summary List Users in Org with teammate permission summary
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listUsersInOrgWithTeammatePermissionSummary: async (orgId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('listUsersInOrgWithTeammatePermissionSummary', 'orgId', orgId)
-            const localVarPath = `/orgs/{orgId}/users/teammatePermissionSummary`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -4203,35 +2858,9 @@ export const UserManagementApiFp = function(configuration?: Configuration) {
          * @throws {RequiredError}
          */
         async listUsersInOrg(orgId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PrincipalsInOrgResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUsersInOrg(orgId, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['UserManagementApi.listUsersInOrg']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * List the users in a given org for the v2 control plane UI
-         * @summary List Users in Org V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listUsersInOrgV2(orgId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PrincipalsInOrgResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUsersInOrgV2(orgId, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['UserManagementApi.listUsersInOrgV2']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * Same principals as list users, plus roleDisplay and isCustomised per principal (extra Dynamo reads for compensating roles and granular assignments).
-         * @summary List Users in Org with teammate permission summary
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listUsersInOrgWithTeammatePermissionSummary(orgId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PrincipalsInOrgWithTeammatePermissionSummaryResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUsersInOrgWithTeammatePermissionSummary(orgId, options);
+            const localVarAxiosArgs = await localVarAxiosParamCreator.listUsersInOrg(orgId, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['UserManagementApi.listUsersInOrgWithTeammatePermissionSummary']?.[localVarOperationServerIndex]?.url;
+            const localVarOperationServerBasePath = operationServerMap['UserManagementApi.listUsersInOrg']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
     }
@@ -4254,26 +2883,6 @@ export const UserManagementApiFactory = function (configuration?: Configuration,
         listUsersInOrg(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<PrincipalsInOrgResponse> {
             return localVarFp.listUsersInOrg(orgId, options).then((request) => request(axios, basePath));
         },
-        /**
-         * List the users in a given org for the v2 control plane UI
-         * @summary List Users in Org V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listUsersInOrgV2(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<PrincipalsInOrgResponse> {
-            return localVarFp.listUsersInOrgV2(orgId, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * Same principals as list users, plus roleDisplay and isCustomised per principal (extra Dynamo reads for compensating roles and granular assignments).
-         * @summary List Users in Org with teammate permission summary
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listUsersInOrgWithTeammatePermissionSummary(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<PrincipalsInOrgWithTeammatePermissionSummaryResponse> {
-            return localVarFp.listUsersInOrgWithTeammatePermissionSummary(orgId, options).then((request) => request(axios, basePath));
-        },
     };
 };
 
@@ -4295,30 +2904,6 @@ export class UserManagementApi extends BaseAPI {
     public listUsersInOrg(orgId: string, options?: RawAxiosRequestConfig) {
         return UserManagementApiFp(this.configuration).listUsersInOrg(orgId, options).then((request) => request(this.axios, this.basePath));
     }
-
-    /**
-     * List the users in a given org for the v2 control plane UI
-     * @summary List Users in Org V2
-     * @param {string} orgId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserManagementApi
-     */
-    public listUsersInOrgV2(orgId: string, options?: RawAxiosRequestConfig) {
-        return UserManagementApiFp(this.configuration).listUsersInOrgV2(orgId, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * Same principals as list users, plus roleDisplay and isCustomised per principal (extra Dynamo reads for compensating roles and granular assignments).
-     * @summary List Users in Org with teammate permission summary
-     * @param {string} orgId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserManagementApi
-     */
-    public listUsersInOrgWithTeammatePermissionSummary(orgId: string, options?: RawAxiosRequestConfig) {
-        return UserManagementApiFp(this.configuration).listUsersInOrgWithTeammatePermissionSummary(orgId, options).then((request) => request(this.axios, this.basePath));
-    }
 }
 
 
@@ -4330,7 +2915,7 @@ export class UserManagementApi extends BaseAPI {
 export const UserPermissionsApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
         /**
-         * List the available permissions for the current user
+         * List the current permission assignments in the org
          * @summary List Org Permissions
          * @param {string} orgId 
          * @param {*} [options] Override http request option.
@@ -4367,44 +2952,7 @@ export const UserPermissionsApiAxiosParamCreator = function (configuration?: Con
             };
         },
         /**
-         * List the v2 materialized permissions for an org
-         * @summary List Org Permissions V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOrgPermissionsV2: async (orgId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('listOrgPermissionsV2', 'orgId', orgId)
-            const localVarPath = `/v2/orgs/{orgId}/permissions`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the available roles for the current user
+         * List the current roles assignments in the org
          * @summary List Org Roles
          * @param {string} orgId 
          * @param {*} [options] Override http request option.
@@ -4431,43 +2979,6 @@ export const UserPermissionsApiAxiosParamCreator = function (configuration?: Con
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the v2 role assignments for an org
-         * @summary List Org Roles V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOrgRolesV2: async (orgId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('listOrgRolesV2', 'orgId', orgId)
-            const localVarPath = `/v2/orgs/{orgId}/roles`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -4505,43 +3016,6 @@ export const UserPermissionsApiAxiosParamCreator = function (configuration?: Con
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the v2 materialized permissions for the current user
-         * @summary List Own Permissions V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOwnPermissionsV2: async (orgId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('listOwnPermissionsV2', 'orgId', orgId)
-            const localVarPath = `/v2/orgs/{orgId}/user/permissions`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)));
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -4583,47 +3057,6 @@ export const UserPermissionsApiAxiosParamCreator = function (configuration?: Con
 
 
     
-            setSearchParams(localVarUrlObj, localVarQueryParameter);
-            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
-            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-
-            return {
-                url: toPathString(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * List the v2 materialized permissions for a given user
-         * @summary List User Permissions V2
-         * @param {string} orgId 
-         * @param {string} userId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listUserPermissionsV2: async (orgId: string, userId: string, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
-            // verify required parameter 'orgId' is not null or undefined
-            assertParamExists('listUserPermissionsV2', 'orgId', orgId)
-            // verify required parameter 'userId' is not null or undefined
-            assertParamExists('listUserPermissionsV2', 'userId', userId)
-            const localVarPath = `/v2/orgs/{orgId}/user/{userId}/permissions`
-                .replace(`{${"orgId"}}`, encodeURIComponent(String(orgId)))
-                .replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
-            // 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 ApiKeyAuth required
-            await setApiKeyToObject(localVarHeaderParameter, "Authorization", configuration)
-
-
-    
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
@@ -4644,7 +3077,7 @@ export const UserPermissionsApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = UserPermissionsApiAxiosParamCreator(configuration)
     return {
         /**
-         * List the available permissions for the current user
+         * List the current permission assignments in the org
          * @summary List Org Permissions
          * @param {string} orgId 
          * @param {*} [options] Override http request option.
@@ -4657,20 +3090,7 @@ export const UserPermissionsApiFp = function(configuration?: Configuration) {
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
         /**
-         * List the v2 materialized permissions for an org
-         * @summary List Org Permissions V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOrgPermissionsV2(orgId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: { [key: string]: GetUserPermissionsSuccessResponseResourcesValue; }; }>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOrgPermissionsV2(orgId, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['UserPermissionsApi.listOrgPermissionsV2']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
-        /**
-         * List the available roles for the current user
+         * List the current roles assignments in the org
          * @summary List Org Roles
          * @param {string} orgId 
          * @param {*} [options] Override http request option.
@@ -4682,19 +3102,6 @@ export const UserPermissionsApiFp = function(configuration?: Configuration) {
             const localVarOperationServerBasePath = operationServerMap['UserPermissionsApi.listOrgRoles']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
-        /**
-         * List the v2 role assignments for an org
-         * @summary List Org Roles V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOrgRolesV2(orgId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<{ [key: string]: ListOrgRolesSuccessResponseValue; }>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOrgRolesV2(orgId, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['UserPermissionsApi.listOrgRolesV2']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
         /**
          * List the available permissions for the current user
          * @summary List Own Permissions
@@ -4708,19 +3115,6 @@ export const UserPermissionsApiFp = function(configuration?: Configuration) {
             const localVarOperationServerBasePath = operationServerMap['UserPermissionsApi.listOwnPermissions']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
-        /**
-         * List the v2 materialized permissions for the current user
-         * @summary List Own Permissions V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listOwnPermissionsV2(orgId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<GetUserPermissionsSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listOwnPermissionsV2(orgId, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['UserPermissionsApi.listOwnPermissionsV2']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
         /**
          * List the available permissions for a given user
          * @summary List User Permissions
@@ -4735,20 +3129,6 @@ export const UserPermissionsApiFp = function(configuration?: Configuration) {
             const localVarOperationServerBasePath = operationServerMap['UserPermissionsApi.listUserPermissions']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
         },
-        /**
-         * List the v2 materialized permissions for a given user
-         * @summary List User Permissions V2
-         * @param {string} orgId 
-         * @param {string} userId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        async listUserPermissionsV2(orgId: string, userId: string, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<GetUserPermissionsSuccessResponse>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.listUserPermissionsV2(orgId, userId, options);
-            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
-            const localVarOperationServerBasePath = operationServerMap['UserPermissionsApi.listUserPermissionsV2']?.[localVarOperationServerIndex]?.url;
-            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
-        },
     }
 };
 
@@ -4760,7 +3140,7 @@ export const UserPermissionsApiFactory = function (configuration?: Configuration
     const localVarFp = UserPermissionsApiFp(configuration)
     return {
         /**
-         * List the available permissions for the current user
+         * List the current permission assignments in the org
          * @summary List Org Permissions
          * @param {string} orgId 
          * @param {*} [options] Override http request option.
@@ -4770,17 +3150,7 @@ export const UserPermissionsApiFactory = function (configuration?: Configuration
             return localVarFp.listOrgPermissions(orgId, options).then((request) => request(axios, basePath));
         },
         /**
-         * List the v2 materialized permissions for an org
-         * @summary List Org Permissions V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOrgPermissionsV2(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<{ [key: string]: { [key: string]: GetUserPermissionsSuccessResponseResourcesValue; }; }> {
-            return localVarFp.listOrgPermissionsV2(orgId, options).then((request) => request(axios, basePath));
-        },
-        /**
-         * List the available roles for the current user
+         * List the current roles assignments in the org
          * @summary List Org Roles
          * @param {string} orgId 
          * @param {*} [options] Override http request option.
@@ -4789,16 +3159,6 @@ export const UserPermissionsApiFactory = function (configuration?: Configuration
         listOrgRoles(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<{ [key: string]: ListOrgRolesSuccessResponseValue; }> {
             return localVarFp.listOrgRoles(orgId, options).then((request) => request(axios, basePath));
         },
-        /**
-         * List the v2 role assignments for an org
-         * @summary List Org Roles V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOrgRolesV2(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<{ [key: string]: ListOrgRolesSuccessResponseValue; }> {
-            return localVarFp.listOrgRolesV2(orgId, options).then((request) => request(axios, basePath));
-        },
         /**
          * List the available permissions for the current user
          * @summary List Own Permissions
@@ -4809,16 +3169,6 @@ export const UserPermissionsApiFactory = function (configuration?: Configuration
         listOwnPermissions(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<GetUserPermissionsSuccessResponse> {
             return localVarFp.listOwnPermissions(orgId, options).then((request) => request(axios, basePath));
         },
-        /**
-         * List the v2 materialized permissions for the current user
-         * @summary List Own Permissions V2
-         * @param {string} orgId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listOwnPermissionsV2(orgId: string, options?: RawAxiosRequestConfig): AxiosPromise<GetUserPermissionsSuccessResponse> {
-            return localVarFp.listOwnPermissionsV2(orgId, options).then((request) => request(axios, basePath));
-        },
         /**
          * List the available permissions for a given user
          * @summary List User Permissions
@@ -4830,17 +3180,6 @@ export const UserPermissionsApiFactory = function (configuration?: Configuration
         listUserPermissions(orgId: string, userId: string, options?: RawAxiosRequestConfig): AxiosPromise<GetUserPermissionsSuccessResponse> {
             return localVarFp.listUserPermissions(orgId, userId, options).then((request) => request(axios, basePath));
         },
-        /**
-         * List the v2 materialized permissions for a given user
-         * @summary List User Permissions V2
-         * @param {string} orgId 
-         * @param {string} userId 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        listUserPermissionsV2(orgId: string, userId: string, options?: RawAxiosRequestConfig): AxiosPromise<GetUserPermissionsSuccessResponse> {
-            return localVarFp.listUserPermissionsV2(orgId, userId, options).then((request) => request(axios, basePath));
-        },
     };
 };
 
@@ -4852,7 +3191,7 @@ export const UserPermissionsApiFactory = function (configuration?: Configuration
  */
 export class UserPermissionsApi extends BaseAPI {
     /**
-     * List the available permissions for the current user
+     * List the current permission assignments in the org
      * @summary List Org Permissions
      * @param {string} orgId 
      * @param {*} [options] Override http request option.
@@ -4864,19 +3203,7 @@ export class UserPermissionsApi extends BaseAPI {
     }
 
     /**
-     * List the v2 materialized permissions for an org
-     * @summary List Org Permissions V2
-     * @param {string} orgId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserPermissionsApi
-     */
-    public listOrgPermissionsV2(orgId: string, options?: RawAxiosRequestConfig) {
-        return UserPermissionsApiFp(this.configuration).listOrgPermissionsV2(orgId, options).then((request) => request(this.axios, this.basePath));
-    }
-
-    /**
-     * List the available roles for the current user
+     * List the current roles assignments in the org
      * @summary List Org Roles
      * @param {string} orgId 
      * @param {*} [options] Override http request option.
@@ -4887,18 +3214,6 @@ export class UserPermissionsApi extends BaseAPI {
         return UserPermissionsApiFp(this.configuration).listOrgRoles(orgId, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * List the v2 role assignments for an org
-     * @summary List Org Roles V2
-     * @param {string} orgId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserPermissionsApi
-     */
-    public listOrgRolesV2(orgId: string, options?: RawAxiosRequestConfig) {
-        return UserPermissionsApiFp(this.configuration).listOrgRolesV2(orgId, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * List the available permissions for the current user
      * @summary List Own Permissions
@@ -4911,18 +3226,6 @@ export class UserPermissionsApi extends BaseAPI {
         return UserPermissionsApiFp(this.configuration).listOwnPermissions(orgId, options).then((request) => request(this.axios, this.basePath));
     }
 
-    /**
-     * List the v2 materialized permissions for the current user
-     * @summary List Own Permissions V2
-     * @param {string} orgId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserPermissionsApi
-     */
-    public listOwnPermissionsV2(orgId: string, options?: RawAxiosRequestConfig) {
-        return UserPermissionsApiFp(this.configuration).listOwnPermissionsV2(orgId, options).then((request) => request(this.axios, this.basePath));
-    }
-
     /**
      * List the available permissions for a given user
      * @summary List User Permissions
@@ -4935,19 +3238,6 @@ export class UserPermissionsApi extends BaseAPI {
     public listUserPermissions(orgId: string, userId: string, options?: RawAxiosRequestConfig) {
         return UserPermissionsApiFp(this.configuration).listUserPermissions(orgId, userId, options).then((request) => request(this.axios, this.basePath));
     }
-
-    /**
-     * List the v2 materialized permissions for a given user
-     * @summary List User Permissions V2
-     * @param {string} orgId 
-     * @param {string} userId 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserPermissionsApi
-     */
-    public listUserPermissionsV2(orgId: string, userId: string, options?: RawAxiosRequestConfig) {
-        return UserPermissionsApiFp(this.configuration).listUserPermissionsV2(orgId, userId, options).then((request) => request(this.axios, this.basePath));
-    }
 }