@tapis/tapis-typescript-sk 0.0.2 → 0.0.3

package/src/apis/UserApi.ts

@@ -2,9 +2,9 @@
 /* eslint-disable */
 /**
  * Tapis Security API
- * The Tapis Security API provides access to the Tapis Security Kernel authorization and secrets facilities.
+ * The Tapis Security API provides for management of Security Kernel (SK) role-based authorization and secrets resources. 
  *
- * The version of the OpenAPI document: 0.1
+ * The version of the OpenAPI document: 1.8.2
  * Contact: cicsupport@tacc.utexas.edu
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -14,73 +14,69 @@
 
 
 import * as runtime from '../runtime';
+import type {
+  ReqGrantRole,
+  ReqGrantRoleWithPermission,
+  ReqGrantUserPermission,
+  ReqRevokeRole,
+  ReqRevokeUserPermission,
+  ReqUserHasRole,
+  ReqUserHasRoleMulti,
+  ReqUserIsAdmin,
+  ReqUserIsPermitted,
+  ReqUserIsPermittedMulti,
+  RespAuthorized,
+  RespBasic,
+  RespChangeCount,
+  RespName,
+  RespNameArray,
+  RoleTypeEnum,
+} from '../models/index';
 import {
-    ReqGrantAdminRole,
-    ReqGrantAdminRoleFromJSON,
-    ReqGrantAdminRoleToJSON,
-    ReqGrantUserPermission,
+    ReqGrantRoleFromJSON,
+    ReqGrantRoleToJSON,
+    ReqGrantRoleWithPermissionFromJSON,
+    ReqGrantRoleWithPermissionToJSON,
     ReqGrantUserPermissionFromJSON,
     ReqGrantUserPermissionToJSON,
-    ReqGrantUserRole,
-    ReqGrantUserRoleFromJSON,
-    ReqGrantUserRoleToJSON,
-    ReqGrantUserRoleWithPermission,
-    ReqGrantUserRoleWithPermissionFromJSON,
-    ReqGrantUserRoleWithPermissionToJSON,
-    ReqRevokeAdminRole,
-    ReqRevokeAdminRoleFromJSON,
-    ReqRevokeAdminRoleToJSON,
-    ReqRevokeUserPermission,
+    ReqRevokeRoleFromJSON,
+    ReqRevokeRoleToJSON,
     ReqRevokeUserPermissionFromJSON,
     ReqRevokeUserPermissionToJSON,
-    ReqRevokeUserRole,
-    ReqRevokeUserRoleFromJSON,
-    ReqRevokeUserRoleToJSON,
-    ReqUserHasRole,
     ReqUserHasRoleFromJSON,
     ReqUserHasRoleToJSON,
-    ReqUserHasRoleMulti,
     ReqUserHasRoleMultiFromJSON,
     ReqUserHasRoleMultiToJSON,
-    ReqUserIsAdmin,
     ReqUserIsAdminFromJSON,
     ReqUserIsAdminToJSON,
-    ReqUserIsPermitted,
     ReqUserIsPermittedFromJSON,
     ReqUserIsPermittedToJSON,
-    ReqUserIsPermittedMulti,
     ReqUserIsPermittedMultiFromJSON,
     ReqUserIsPermittedMultiToJSON,
-    RespAuthorized,
     RespAuthorizedFromJSON,
     RespAuthorizedToJSON,
-    RespBasic,
     RespBasicFromJSON,
     RespBasicToJSON,
-    RespChangeCount,
     RespChangeCountFromJSON,
     RespChangeCountToJSON,
-    RespName,
     RespNameFromJSON,
     RespNameToJSON,
-    RespNameArray,
     RespNameArrayFromJSON,
     RespNameArrayToJSON,
-} from '../models';
+    RoleTypeEnumFromJSON,
+    RoleTypeEnumToJSON,
+} from '../models/index';
 
 export interface GetAdminsRequest {
     tenant: string;
-    pretty?: boolean;
 }
 
 export interface GetDefaultUserRole1Request {
     user: string;
-    pretty?: boolean;
 }
 
 export interface GetUserNamesRequest {
     tenant?: string;
-    pretty?: boolean;
 }
 
 export interface GetUserPermsRequest {
@@ -88,95 +84,70 @@ export interface GetUserPermsRequest {
     tenant?: string;
     implies?: string;
     impliedBy?: string;
-    pretty?: boolean;
 }
 
 export interface GetUserRolesRequest {
     user: string;
     tenant?: string;
-    pretty?: boolean;
 }
 
 export interface GetUsersWithPermissionRequest {
     permSpec: string;
     tenant?: string;
-    pretty?: boolean;
 }
 
 export interface GetUsersWithRoleRequest {
     roleName: string;
     tenant?: string;
-    pretty?: boolean;
-}
-
-export interface GrantAdminRoleRequest {
-    reqGrantAdminRole: ReqGrantAdminRole;
-    pretty?: boolean;
+    roleType?: RoleTypeEnum;
 }
 
 export interface GrantRoleRequest {
-    reqGrantUserRole: ReqGrantUserRole;
-    pretty?: boolean;
+    reqGrantRole: ReqGrantRole;
 }
 
 export interface GrantRoleWithPermissionRequest {
-    reqGrantUserRoleWithPermission: ReqGrantUserRoleWithPermission;
-    pretty?: boolean;
+    reqGrantRoleWithPermission: ReqGrantRoleWithPermission;
 }
 
 export interface GrantUserPermissionRequest {
     reqGrantUserPermission: ReqGrantUserPermission;
-    pretty?: boolean;
 }
 
 export interface HasRoleRequest {
     reqUserHasRole: ReqUserHasRole;
-    pretty?: boolean;
 }
 
 export interface HasRoleAllRequest {
     reqUserHasRoleMulti: ReqUserHasRoleMulti;
-    pretty?: boolean;
 }
 
 export interface HasRoleAnyRequest {
     reqUserHasRoleMulti: ReqUserHasRoleMulti;
-    pretty?: boolean;
 }
 
 export interface IsAdminRequest {
     reqUserIsAdmin: ReqUserIsAdmin;
-    pretty?: boolean;
 }
 
 export interface IsPermittedRequest {
     reqUserIsPermitted: ReqUserIsPermitted;
-    pretty?: boolean;
 }
 
 export interface IsPermittedAllRequest {
     reqUserIsPermittedMulti: ReqUserIsPermittedMulti;
-    pretty?: boolean;
 }
 
 export interface IsPermittedAnyRequest {
     reqUserIsPermittedMulti: ReqUserIsPermittedMulti;
-    pretty?: boolean;
 }
 
-export interface RevokeAdminRoleRequest {
-    reqRevokeAdminRole: ReqRevokeAdminRole;
-    pretty?: boolean;
+export interface RevokeRoleRequest {
+    reqRevokeRole: ReqRevokeRole;
 }
 
 export interface RevokeUserPermissionRequest {
     reqRevokeUserPermission: ReqRevokeUserPermission;
-    pretty?: boolean;
-}
-
-export interface RevokeUserRoleRequest {
-    reqRevokeUserRole: ReqRevokeUserRole;
-    pretty?: boolean;
 }
 
 /**
@@ -185,27 +156,26 @@ export interface RevokeUserRoleRequest {
 export class UserApi extends runtime.BaseAPI {
 
     /**
-     * Get all users assigned the tenant administrator role ($!tenant_admin).  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get all users assigned the tenant administrator role ($!tenant_admin).  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getAdminsRaw(requestParameters: GetAdminsRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespNameArray>> {
-        if (requestParameters.tenant === null || requestParameters.tenant === undefined) {
-            throw new runtime.RequiredError('tenant','Required parameter requestParameters.tenant was null or undefined when calling getAdmins.');
+    async getAdminsRaw(requestParameters: GetAdminsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespNameArray>> {
+        if (requestParameters['tenant'] == null) {
+            throw new runtime.RequiredError(
+                'tenant',
+                'Required parameter "tenant" was null or undefined when calling getAdmins().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
-            path: `/security/user/admins/{tenant}`.replace(`{${"tenant"}}`, encodeURIComponent(String(requestParameters.tenant))),
+            path: `/security/user/admins/{tenant}`.replace(`{${"tenant"}}`, encodeURIComponent(String(requestParameters['tenant']))),
             method: 'GET',
             headers: headerParameters,
             query: queryParameters,
@@ -215,31 +185,34 @@ export class UserApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get all users assigned the tenant administrator role ($!tenant_admin).  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get all users assigned the tenant administrator role ($!tenant_admin).  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getAdmins(requestParameters: GetAdminsRequest, initOverrides?: RequestInit): Promise<RespNameArray> {
+    async getAdmins(requestParameters: GetAdminsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespNameArray> {
         const response = await this.getAdminsRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Get a user\'s default role. The default role is implicitly created by the system when needed if it doesn\'t already exist. No authorization required.  A user\'s default role is constructed by prepending \'$$\' to the user\'s name.  This implies the maximum length of a user name is 58 since role names are limited to 60 characters.
+     * Get a user\'s default role. The default role is implicitly created by the system when needed if it doesn\'t already exist. No authorization required.  A user\'s default role is constructed by prepending \'$$\' to the user\'s name. This implies the maximum length of a user name is 58 since role names are limited to 60 characters. 
      */
-    async getDefaultUserRole1Raw(requestParameters: GetDefaultUserRole1Request, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespName>> {
-        if (requestParameters.user === null || requestParameters.user === undefined) {
-            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling getDefaultUserRole1.');
+    async getDefaultUserRole1Raw(requestParameters: GetDefaultUserRole1Request, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespName>> {
+        if (requestParameters['user'] == null) {
+            throw new runtime.RequiredError(
+                'user',
+                'Required parameter "user" was null or undefined when calling getDefaultUserRole1().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
+        if (this.configuration && this.configuration.apiKey) {
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+        }
+
         const response = await this.request({
-            path: `/security/user/defaultRole/{user}`.replace(`{${"user"}}`, encodeURIComponent(String(requestParameters.user))),
+            path: `/security/user/defaultRole/{user}`.replace(`{${"user"}}`, encodeURIComponent(String(requestParameters['user']))),
             method: 'GET',
             headers: headerParameters,
             query: queryParameters,
@@ -249,31 +222,27 @@ export class UserApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get a user\'s default role. The default role is implicitly created by the system when needed if it doesn\'t already exist. No authorization required.  A user\'s default role is constructed by prepending \'$$\' to the user\'s name.  This implies the maximum length of a user name is 58 since role names are limited to 60 characters.
+     * Get a user\'s default role. The default role is implicitly created by the system when needed if it doesn\'t already exist. No authorization required.  A user\'s default role is constructed by prepending \'$$\' to the user\'s name. This implies the maximum length of a user name is 58 since role names are limited to 60 characters. 
      */
-    async getDefaultUserRole1(requestParameters: GetDefaultUserRole1Request, initOverrides?: RequestInit): Promise<RespName> {
+    async getDefaultUserRole1(requestParameters: GetDefaultUserRole1Request, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespName> {
         const response = await this.getDefaultUserRole1Raw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Get the names of all users in the tenant that have been granted a role or permission.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get the names of all users in the tenant that have been granted a role or permission.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUserNamesRaw(requestParameters: GetUserNamesRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespNameArray>> {
+    async getUserNamesRaw(requestParameters: GetUserNamesRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespNameArray>> {
         const queryParameters: any = {};
 
-        if (requestParameters.tenant !== undefined) {
-            queryParameters['tenant'] = requestParameters.tenant;
-        }
-
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
+        if (requestParameters['tenant'] != null) {
+            queryParameters['tenant'] = requestParameters['tenant'];
         }
 
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -287,47 +256,46 @@ export class UserApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get the names of all users in the tenant that have been granted a role or permission.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get the names of all users in the tenant that have been granted a role or permission.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUserNames(requestParameters: GetUserNamesRequest, initOverrides?: RequestInit): Promise<RespNameArray> {
+    async getUserNames(requestParameters: GetUserNamesRequest = {}, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespNameArray> {
         const response = await this.getUserNamesRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Get the permissions assigned to a user in a tenant, including those assigned transively.  The result list can be optionally filtered by the one or both of the query parameters: implies and impliedBy.  The implied parameter removes permissions from the result list that the specified permission do not imply. The impliedBy parameter removes permissions from the result list that the specified permission are not implied by. Below are some examples.Consider a user that is assigned these permissions:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  **Using the *implies* Query Parameter**  When _implies=stream:dev:*:project1_, this endpoint returns:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  When _implies=stream:dev:write:project1_, this endpoint returns an empty list.  **Using the *impliedBy* Query Parameter**  When _impliedBy=stream:dev:*:project1_, this endpoint returns an empty list.  When _impliedBy=stream:dev:write:project1_, this endpoint returns:      stream:dev:read,write:project1     stream:dev:read,write,exec:project1  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get the permissions assigned to a user in a tenant, including those assigned transively. The result list can be optionally filtered by the one or both of the query parameters: implies and impliedBy.  When implies is set, the filter _implies_ each entry in the result set. When impliedBy is set, each entry in the result set is _implied by_ the filter. Below are some examples.  Consider a user that is assigned these permissions:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  **Using the *implies* Query Parameter**  When _implies=stream:dev:*:project1_, this endpoint returns:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  When _implies=stream:dev:write:project1_, this endpoint returns an empty list.  **Using the *impliedBy* Query Parameter**  When _impliedBy=stream:dev:*:project1_, this endpoint returns an empty list.  When _impliedBy=stream:dev:write:project1_, this endpoint returns:      stream:dev:read,write:project1     stream:dev:read,write,exec:project1  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUserPermsRaw(requestParameters: GetUserPermsRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespNameArray>> {
-        if (requestParameters.user === null || requestParameters.user === undefined) {
-            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling getUserPerms.');
+    async getUserPermsRaw(requestParameters: GetUserPermsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespNameArray>> {
+        if (requestParameters['user'] == null) {
+            throw new runtime.RequiredError(
+                'user',
+                'Required parameter "user" was null or undefined when calling getUserPerms().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.tenant !== undefined) {
-            queryParameters['tenant'] = requestParameters.tenant;
+        if (requestParameters['tenant'] != null) {
+            queryParameters['tenant'] = requestParameters['tenant'];
         }
 
-        if (requestParameters.implies !== undefined) {
-            queryParameters['implies'] = requestParameters.implies;
+        if (requestParameters['implies'] != null) {
+            queryParameters['implies'] = requestParameters['implies'];
         }
 
-        if (requestParameters.impliedBy !== undefined) {
-            queryParameters['impliedBy'] = requestParameters.impliedBy;
-        }
-
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
+        if (requestParameters['impliedBy'] != null) {
+            queryParameters['impliedBy'] = requestParameters['impliedBy'];
         }
 
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
-            path: `/security/user/perms/{user}`.replace(`{${"user"}}`, encodeURIComponent(String(requestParameters.user))),
+            path: `/security/user/perms/{user}`.replace(`{${"user"}}`, encodeURIComponent(String(requestParameters['user']))),
             method: 'GET',
             headers: headerParameters,
             query: queryParameters,
@@ -337,39 +305,38 @@ export class UserApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get the permissions assigned to a user in a tenant, including those assigned transively.  The result list can be optionally filtered by the one or both of the query parameters: implies and impliedBy.  The implied parameter removes permissions from the result list that the specified permission do not imply. The impliedBy parameter removes permissions from the result list that the specified permission are not implied by. Below are some examples.Consider a user that is assigned these permissions:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  **Using the *implies* Query Parameter**  When _implies=stream:dev:*:project1_, this endpoint returns:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  When _implies=stream:dev:write:project1_, this endpoint returns an empty list.  **Using the *impliedBy* Query Parameter**  When _impliedBy=stream:dev:*:project1_, this endpoint returns an empty list.  When _impliedBy=stream:dev:write:project1_, this endpoint returns:      stream:dev:read,write:project1     stream:dev:read,write,exec:project1  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get the permissions assigned to a user in a tenant, including those assigned transively. The result list can be optionally filtered by the one or both of the query parameters: implies and impliedBy.  When implies is set, the filter _implies_ each entry in the result set. When impliedBy is set, each entry in the result set is _implied by_ the filter. Below are some examples.  Consider a user that is assigned these permissions:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  **Using the *implies* Query Parameter**  When _implies=stream:dev:*:project1_, this endpoint returns:      stream:dev:read:project1     stream:dev:read,write:project1     stream:dev:read,write,exec:project1  When _implies=stream:dev:write:project1_, this endpoint returns an empty list.  **Using the *impliedBy* Query Parameter**  When _impliedBy=stream:dev:*:project1_, this endpoint returns an empty list.  When _impliedBy=stream:dev:write:project1_, this endpoint returns:      stream:dev:read,write:project1     stream:dev:read,write,exec:project1  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUserPerms(requestParameters: GetUserPermsRequest, initOverrides?: RequestInit): Promise<RespNameArray> {
+    async getUserPerms(requestParameters: GetUserPermsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespNameArray> {
         const response = await this.getUserPermsRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Get the roles assigned to a user in the specified tenant, including those assigned transively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get the roles assigned to a user in the specified tenant, including those assigned transively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUserRolesRaw(requestParameters: GetUserRolesRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespNameArray>> {
-        if (requestParameters.user === null || requestParameters.user === undefined) {
-            throw new runtime.RequiredError('user','Required parameter requestParameters.user was null or undefined when calling getUserRoles.');
+    async getUserRolesRaw(requestParameters: GetUserRolesRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespNameArray>> {
+        if (requestParameters['user'] == null) {
+            throw new runtime.RequiredError(
+                'user',
+                'Required parameter "user" was null or undefined when calling getUserRoles().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.tenant !== undefined) {
-            queryParameters['tenant'] = requestParameters.tenant;
-        }
-
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
+        if (requestParameters['tenant'] != null) {
+            queryParameters['tenant'] = requestParameters['tenant'];
         }
 
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
-            path: `/security/user/roles/{user}`.replace(`{${"user"}}`, encodeURIComponent(String(requestParameters.user))),
+            path: `/security/user/roles/{user}`.replace(`{${"user"}}`, encodeURIComponent(String(requestParameters['user']))),
             method: 'GET',
             headers: headerParameters,
             query: queryParameters,
@@ -379,39 +346,38 @@ export class UserApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get the roles assigned to a user in the specified tenant, including those assigned transively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get the roles assigned to a user in the specified tenant, including those assigned transively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUserRoles(requestParameters: GetUserRolesRequest, initOverrides?: RequestInit): Promise<RespNameArray> {
+    async getUserRoles(requestParameters: GetUserRolesRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespNameArray> {
         const response = await this.getUserRolesRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Get all users in a tenant assigned a permission.  The permSpec parameter is a permission specification that uses colons as separators, the asterisk as a wildcard character and commas to define lists.  Here are examples of permission specifications:      system:mytenant:read:mysystem     system:mytenant:*:mysystem     system:mytenant     files:mytenant:read,write:mysystems This method recognizes the percent sign (%) as a string wildcard only in the context of database searching.  If a percent sign (%) appears in the permSpec it is interpreted as a zero or more character wildcard.  For example, the following specification would match the first three of the above example specifications but not the fourth:      system:mytenant:%  The wildcard character cannot appear as the first character in the permSpec.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get all users in a tenant assigned a permission. The permSpec parameter is a permission specification that uses colons as separators, the asterisk as a wildcard character and commas to define lists. Here are examples of permission specifications:      system:mytenant:read:mysystem     system:mytenant:*:mysystem     system:mytenant     files:mytenant:read,write:mysystems This method recognizes the percent sign (%) as a string wildcard only in the context of database searching. If a percent sign (%) appears in the permSpec it is interpreted as a zero or more character wildcard. For example, the following specification would match the first three of the above example specifications but not the fourth:      system:mytenant:%  The wildcard character cannot appear as the first character in the permSpec.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUsersWithPermissionRaw(requestParameters: GetUsersWithPermissionRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespNameArray>> {
-        if (requestParameters.permSpec === null || requestParameters.permSpec === undefined) {
-            throw new runtime.RequiredError('permSpec','Required parameter requestParameters.permSpec was null or undefined when calling getUsersWithPermission.');
+    async getUsersWithPermissionRaw(requestParameters: GetUsersWithPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespNameArray>> {
+        if (requestParameters['permSpec'] == null) {
+            throw new runtime.RequiredError(
+                'permSpec',
+                'Required parameter "permSpec" was null or undefined when calling getUsersWithPermission().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.tenant !== undefined) {
-            queryParameters['tenant'] = requestParameters.tenant;
-        }
-
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
+        if (requestParameters['tenant'] != null) {
+            queryParameters['tenant'] = requestParameters['tenant'];
         }
 
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
-            path: `/security/user/withPermission/{permSpec}`.replace(`{${"permSpec"}}`, encodeURIComponent(String(requestParameters.permSpec))),
+            path: `/security/user/withPermission/{permSpec}`.replace(`{${"permSpec"}}`, encodeURIComponent(String(requestParameters['permSpec']))),
             method: 'GET',
             headers: headerParameters,
             query: queryParameters,
@@ -421,39 +387,42 @@ export class UserApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get all users in a tenant assigned a permission.  The permSpec parameter is a permission specification that uses colons as separators, the asterisk as a wildcard character and commas to define lists.  Here are examples of permission specifications:      system:mytenant:read:mysystem     system:mytenant:*:mysystem     system:mytenant     files:mytenant:read,write:mysystems This method recognizes the percent sign (%) as a string wildcard only in the context of database searching.  If a percent sign (%) appears in the permSpec it is interpreted as a zero or more character wildcard.  For example, the following specification would match the first three of the above example specifications but not the fourth:      system:mytenant:%  The wildcard character cannot appear as the first character in the permSpec.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get all users in a tenant assigned a permission. The permSpec parameter is a permission specification that uses colons as separators, the asterisk as a wildcard character and commas to define lists. Here are examples of permission specifications:      system:mytenant:read:mysystem     system:mytenant:*:mysystem     system:mytenant     files:mytenant:read,write:mysystems This method recognizes the percent sign (%) as a string wildcard only in the context of database searching. If a percent sign (%) appears in the permSpec it is interpreted as a zero or more character wildcard. For example, the following specification would match the first three of the above example specifications but not the fourth:      system:mytenant:%  The wildcard character cannot appear as the first character in the permSpec.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUsersWithPermission(requestParameters: GetUsersWithPermissionRequest, initOverrides?: RequestInit): Promise<RespNameArray> {
+    async getUsersWithPermission(requestParameters: GetUsersWithPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespNameArray> {
         const response = await this.getUsersWithPermissionRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Get all users assigned a role.  The role must exist in the tenant.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get all users assigned a role. The role must exist in the tenant.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUsersWithRoleRaw(requestParameters: GetUsersWithRoleRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespNameArray>> {
-        if (requestParameters.roleName === null || requestParameters.roleName === undefined) {
-            throw new runtime.RequiredError('roleName','Required parameter requestParameters.roleName was null or undefined when calling getUsersWithRole.');
+    async getUsersWithRoleRaw(requestParameters: GetUsersWithRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespNameArray>> {
+        if (requestParameters['roleName'] == null) {
+            throw new runtime.RequiredError(
+                'roleName',
+                'Required parameter "roleName" was null or undefined when calling getUsersWithRole().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.tenant !== undefined) {
-            queryParameters['tenant'] = requestParameters.tenant;
+        if (requestParameters['tenant'] != null) {
+            queryParameters['tenant'] = requestParameters['tenant'];
         }
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
+        if (requestParameters['roleType'] != null) {
+            queryParameters['roleType'] = requestParameters['roleType'];
         }
 
         const headerParameters: runtime.HTTPHeaders = {};
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
-            path: `/security/user/withRole/{roleName}`.replace(`{${"roleName"}}`, encodeURIComponent(String(requestParameters.roleName))),
+            path: `/security/user/withRole/{roleName}`.replace(`{${"roleName"}}`, encodeURIComponent(String(requestParameters['roleName']))),
             method: 'GET',
             headers: headerParameters,
             query: queryParameters,
@@ -463,74 +432,32 @@ export class UserApi extends runtime.BaseAPI {
     }
 
     /**
-     * Get all users assigned a role.  The role must exist in the tenant.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Get all users assigned a role. The role must exist in the tenant.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async getUsersWithRole(requestParameters: GetUsersWithRoleRequest, initOverrides?: RequestInit): Promise<RespNameArray> {
+    async getUsersWithRole(requestParameters: GetUsersWithRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespNameArray> {
         const response = await this.getUsersWithRoleRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Grant a user the tenant administrator role.  A valid tenant and user must be specified in the request body.  The user specified in the JWT must be an administrator in the tenant specified in the request body.
+     * Grant a user the specified role. A valid tenant and user must be specified in the request body. The type of role to grant may be specified in the request body. Allowed types are USER, TENANT_ADMIN and RESTRICTED_SVC. Default type is USER.  The user and the role must be in the same tenant.  For roles of type USER the request is authorized only if the requestor is the role owner, a tenant administrator or a site administrator. For roles of type TENANT_ADMIN the requestor must a tenant or site administrator. For roles of type RESTRICTED_SVC the requestor must a site administrator. 
      */
-    async grantAdminRoleRaw(requestParameters: GrantAdminRoleRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespChangeCount>> {
-        if (requestParameters.reqGrantAdminRole === null || requestParameters.reqGrantAdminRole === undefined) {
-            throw new runtime.RequiredError('reqGrantAdminRole','Required parameter requestParameters.reqGrantAdminRole was null or undefined when calling grantAdminRole.');
+    async grantRoleRaw(requestParameters: GrantRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespChangeCount>> {
+        if (requestParameters['reqGrantRole'] == null) {
+            throw new runtime.RequiredError(
+                'reqGrantRole',
+                'Required parameter "reqGrantRole" was null or undefined when calling grantRole().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-        }
-
-        const response = await this.request({
-            path: `/security/user/grantAdminRole`,
-            method: 'POST',
-            headers: headerParameters,
-            query: queryParameters,
-            body: ReqGrantAdminRoleToJSON(requestParameters.reqGrantAdminRole),
-        }, initOverrides);
-
-        return new runtime.JSONApiResponse(response, (jsonValue) => RespChangeCountFromJSON(jsonValue));
-    }
-
-    /**
-     * Grant a user the tenant administrator role.  A valid tenant and user must be specified in the request body.  The user specified in the JWT must be an administrator in the tenant specified in the request body.
-     */
-    async grantAdminRole(requestParameters: GrantAdminRoleRequest, initOverrides?: RequestInit): Promise<RespChangeCount> {
-        const response = await this.grantAdminRoleRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-
-    /**
-     * Grant a user the specified role.  A valid tenant and user must be specified in the request body.  This request is authorized only if the requestor is the role owner or an administrator.  The user and the role must be in the same tenant.
-     */
-    async grantRoleRaw(requestParameters: GrantRoleRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespChangeCount>> {
-        if (requestParameters.reqGrantUserRole === null || requestParameters.reqGrantUserRole === undefined) {
-            throw new runtime.RequiredError('reqGrantUserRole','Required parameter requestParameters.reqGrantUserRole was null or undefined when calling grantRole.');
-        }
-
-        const queryParameters: any = {};
-
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
-        const headerParameters: runtime.HTTPHeaders = {};
-
-        headerParameters['Content-Type'] = 'application/json';
-
-        if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -538,40 +465,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqGrantUserRoleToJSON(requestParameters.reqGrantUserRole),
+            body: ReqGrantRoleToJSON(requestParameters['reqGrantRole']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespChangeCountFromJSON(jsonValue));
     }
 
     /**
-     * Grant a user the specified role.  A valid tenant and user must be specified in the request body.  This request is authorized only if the requestor is the role owner or an administrator.  The user and the role must be in the same tenant.
+     * Grant a user the specified role. A valid tenant and user must be specified in the request body. The type of role to grant may be specified in the request body. Allowed types are USER, TENANT_ADMIN and RESTRICTED_SVC. Default type is USER.  The user and the role must be in the same tenant.  For roles of type USER the request is authorized only if the requestor is the role owner, a tenant administrator or a site administrator. For roles of type TENANT_ADMIN the requestor must a tenant or site administrator. For roles of type RESTRICTED_SVC the requestor must a site administrator. 
      */
-    async grantRole(requestParameters: GrantRoleRequest, initOverrides?: RequestInit): Promise<RespChangeCount> {
+    async grantRole(requestParameters: GrantRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespChangeCount> {
         const response = await this.grantRoleRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Grant a user the specified role containing the specified permission.  This compound request first adds the permission to the role if it is not already a member of the role and then assigns the role to the user.  The change count returned can range from zero to two depending on how many insertions were actually required.  Only the role owner or an administrator is authorized to make this request.  The user and the role must be in the same tenant.
+     * Grant a user the specified role containing the specified permission. This compound request first adds the permission to the role if it is not already a member of the role and then assigns the role to the user. The change count returned can range from zero to two depending on how many insertions were actually required.  The user and the role must be in the same tenant.  For roles of type USER the request is authorized only if the requestor is the role owner, a tenant administrator or a site administrator. For roles of type TENANT_ADMIN the requestor must a tenant or site administrator. For roles of type RESTRICTED_SVC the requestor must a site administrator. 
      */
-    async grantRoleWithPermissionRaw(requestParameters: GrantRoleWithPermissionRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespChangeCount>> {
-        if (requestParameters.reqGrantUserRoleWithPermission === null || requestParameters.reqGrantUserRoleWithPermission === undefined) {
-            throw new runtime.RequiredError('reqGrantUserRoleWithPermission','Required parameter requestParameters.reqGrantUserRoleWithPermission was null or undefined when calling grantRoleWithPermission.');
+    async grantRoleWithPermissionRaw(requestParameters: GrantRoleWithPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespChangeCount>> {
+        if (requestParameters['reqGrantRoleWithPermission'] == null) {
+            throw new runtime.RequiredError(
+                'reqGrantRoleWithPermission',
+                'Required parameter "reqGrantRoleWithPermission" was null or undefined when calling grantRoleWithPermission().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -579,40 +505,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqGrantUserRoleWithPermissionToJSON(requestParameters.reqGrantUserRoleWithPermission),
+            body: ReqGrantRoleWithPermissionToJSON(requestParameters['reqGrantRoleWithPermission']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespChangeCountFromJSON(jsonValue));
     }
 
     /**
-     * Grant a user the specified role containing the specified permission.  This compound request first adds the permission to the role if it is not already a member of the role and then assigns the role to the user.  The change count returned can range from zero to two depending on how many insertions were actually required.  Only the role owner or an administrator is authorized to make this request.  The user and the role must be in the same tenant.
+     * Grant a user the specified role containing the specified permission. This compound request first adds the permission to the role if it is not already a member of the role and then assigns the role to the user. The change count returned can range from zero to two depending on how many insertions were actually required.  The user and the role must be in the same tenant.  For roles of type USER the request is authorized only if the requestor is the role owner, a tenant administrator or a site administrator. For roles of type TENANT_ADMIN the requestor must a tenant or site administrator. For roles of type RESTRICTED_SVC the requestor must a site administrator. 
      */
-    async grantRoleWithPermission(requestParameters: GrantRoleWithPermissionRequest, initOverrides?: RequestInit): Promise<RespChangeCount> {
+    async grantRoleWithPermission(requestParameters: GrantRoleWithPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespChangeCount> {
         const response = await this.grantRoleWithPermissionRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Grant a user the specified permission by assigning that permission to to the user\'s default role.  If the user\'s default role does not exist,this request will create that role and grant it to the user before assigning the permission to the role.  A user\'s default role name is discoverable by calling either of the user/defaultRole or role/defaultRole endpoints.  The change count returned can range from zero to three depending on how many insertions and updates were actually required  The caller must be an administrator or service allowed to perform updates in the user\'s tenant.
+     * Grant a user the specified permission by assigning that permission to to the user\'s default role. If the user\'s default role does not exist it will be created.  A user\'s default role name is discoverable by calling either of the user/defaultRole or role/defaultRole endpoints.  The change count returned can range from zero to three depending on how many insertions and updates were actually required.  The caller must be an administrator or service allowed to perform updates in the user\'s tenant. 
      */
-    async grantUserPermissionRaw(requestParameters: GrantUserPermissionRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespChangeCount>> {
-        if (requestParameters.reqGrantUserPermission === null || requestParameters.reqGrantUserPermission === undefined) {
-            throw new runtime.RequiredError('reqGrantUserPermission','Required parameter requestParameters.reqGrantUserPermission was null or undefined when calling grantUserPermission.');
+    async grantUserPermissionRaw(requestParameters: GrantUserPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespChangeCount>> {
+        if (requestParameters['reqGrantUserPermission'] == null) {
+            throw new runtime.RequiredError(
+                'reqGrantUserPermission',
+                'Required parameter "reqGrantUserPermission" was null or undefined when calling grantUserPermission().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -620,40 +545,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqGrantUserPermissionToJSON(requestParameters.reqGrantUserPermission),
+            body: ReqGrantUserPermissionToJSON(requestParameters['reqGrantUserPermission']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespChangeCountFromJSON(jsonValue));
     }
 
     /**
-     * Grant a user the specified permission by assigning that permission to to the user\'s default role.  If the user\'s default role does not exist,this request will create that role and grant it to the user before assigning the permission to the role.  A user\'s default role name is discoverable by calling either of the user/defaultRole or role/defaultRole endpoints.  The change count returned can range from zero to three depending on how many insertions and updates were actually required  The caller must be an administrator or service allowed to perform updates in the user\'s tenant.
+     * Grant a user the specified permission by assigning that permission to to the user\'s default role. If the user\'s default role does not exist it will be created.  A user\'s default role name is discoverable by calling either of the user/defaultRole or role/defaultRole endpoints.  The change count returned can range from zero to three depending on how many insertions and updates were actually required.  The caller must be an administrator or service allowed to perform updates in the user\'s tenant. 
      */
-    async grantUserPermission(requestParameters: GrantUserPermissionRequest, initOverrides?: RequestInit): Promise<RespChangeCount> {
+    async grantUserPermission(requestParameters: GrantUserPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespChangeCount> {
         const response = await this.grantUserPermissionRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Check whether a user in a tenant has been assigned the specified role, either directly or transitively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned the specified role, either directly or transitively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async hasRoleRaw(requestParameters: HasRoleRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespAuthorized>> {
-        if (requestParameters.reqUserHasRole === null || requestParameters.reqUserHasRole === undefined) {
-            throw new runtime.RequiredError('reqUserHasRole','Required parameter requestParameters.reqUserHasRole was null or undefined when calling hasRole.');
+    async hasRoleRaw(requestParameters: HasRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespAuthorized>> {
+        if (requestParameters['reqUserHasRole'] == null) {
+            throw new runtime.RequiredError(
+                'reqUserHasRole',
+                'Required parameter "reqUserHasRole" was null or undefined when calling hasRole().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -661,40 +585,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqUserHasRoleToJSON(requestParameters.reqUserHasRole),
+            body: ReqUserHasRoleToJSON(requestParameters['reqUserHasRole']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespAuthorizedFromJSON(jsonValue));
     }
 
     /**
-     * Check whether a user in a tenant has been assigned the specified role, either directly or transitively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned the specified role, either directly or transitively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async hasRole(requestParameters: HasRoleRequest, initOverrides?: RequestInit): Promise<RespAuthorized> {
+    async hasRole(requestParameters: HasRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespAuthorized> {
         const response = await this.hasRoleRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Check whether a user in a tenant has been assigned all of the roles specified in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned all of the roles specified in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async hasRoleAllRaw(requestParameters: HasRoleAllRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespAuthorized>> {
-        if (requestParameters.reqUserHasRoleMulti === null || requestParameters.reqUserHasRoleMulti === undefined) {
-            throw new runtime.RequiredError('reqUserHasRoleMulti','Required parameter requestParameters.reqUserHasRoleMulti was null or undefined when calling hasRoleAll.');
+    async hasRoleAllRaw(requestParameters: HasRoleAllRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespAuthorized>> {
+        if (requestParameters['reqUserHasRoleMulti'] == null) {
+            throw new runtime.RequiredError(
+                'reqUserHasRoleMulti',
+                'Required parameter "reqUserHasRoleMulti" was null or undefined when calling hasRoleAll().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -702,40 +625,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqUserHasRoleMultiToJSON(requestParameters.reqUserHasRoleMulti),
+            body: ReqUserHasRoleMultiToJSON(requestParameters['reqUserHasRoleMulti']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespAuthorizedFromJSON(jsonValue));
     }
 
     /**
-     * Check whether a user in a tenant has been assigned all of the roles specified in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned all of the roles specified in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async hasRoleAll(requestParameters: HasRoleAllRequest, initOverrides?: RequestInit): Promise<RespAuthorized> {
+    async hasRoleAll(requestParameters: HasRoleAllRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespAuthorized> {
         const response = await this.hasRoleAllRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Check whether a user in a tenant has been assigned any of the roles specified in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned any of the roles specified in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async hasRoleAnyRaw(requestParameters: HasRoleAnyRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespAuthorized>> {
-        if (requestParameters.reqUserHasRoleMulti === null || requestParameters.reqUserHasRoleMulti === undefined) {
-            throw new runtime.RequiredError('reqUserHasRoleMulti','Required parameter requestParameters.reqUserHasRoleMulti was null or undefined when calling hasRoleAny.');
+    async hasRoleAnyRaw(requestParameters: HasRoleAnyRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespAuthorized>> {
+        if (requestParameters['reqUserHasRoleMulti'] == null) {
+            throw new runtime.RequiredError(
+                'reqUserHasRoleMulti',
+                'Required parameter "reqUserHasRoleMulti" was null or undefined when calling hasRoleAny().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -743,40 +665,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqUserHasRoleMultiToJSON(requestParameters.reqUserHasRoleMulti),
+            body: ReqUserHasRoleMultiToJSON(requestParameters['reqUserHasRoleMulti']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespAuthorizedFromJSON(jsonValue));
     }
 
     /**
-     * Check whether a user in a tenant has been assigned any of the roles specified in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned any of the roles specified in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async hasRoleAny(requestParameters: HasRoleAnyRequest, initOverrides?: RequestInit): Promise<RespAuthorized> {
+    async hasRoleAny(requestParameters: HasRoleAnyRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespAuthorized> {
         const response = await this.hasRoleAnyRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Check whether a user in a tenant has been assigned the tenant administrator role, either directly or transitively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned the tenant administrator role, either directly or transitively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isAdminRaw(requestParameters: IsAdminRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespAuthorized>> {
-        if (requestParameters.reqUserIsAdmin === null || requestParameters.reqUserIsAdmin === undefined) {
-            throw new runtime.RequiredError('reqUserIsAdmin','Required parameter requestParameters.reqUserIsAdmin was null or undefined when calling isAdmin.');
+    async isAdminRaw(requestParameters: IsAdminRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespAuthorized>> {
+        if (requestParameters['reqUserIsAdmin'] == null) {
+            throw new runtime.RequiredError(
+                'reqUserIsAdmin',
+                'Required parameter "reqUserIsAdmin" was null or undefined when calling isAdmin().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -784,40 +705,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqUserIsAdminToJSON(requestParameters.reqUserIsAdmin),
+            body: ReqUserIsAdminToJSON(requestParameters['reqUserIsAdmin']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespAuthorizedFromJSON(jsonValue));
     }
 
     /**
-     * Check whether a user in a tenant has been assigned the tenant administrator role, either directly or transitively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user in a tenant has been assigned the tenant administrator role, either directly or transitively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isAdmin(requestParameters: IsAdminRequest, initOverrides?: RequestInit): Promise<RespAuthorized> {
+    async isAdmin(requestParameters: IsAdminRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespAuthorized> {
         const response = await this.isAdminRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Check whether specified permission matches a permission assigned to the user, either directly or transitively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether specified permission matches a permission assigned to the user, either directly or transitively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isPermittedRaw(requestParameters: IsPermittedRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespAuthorized>> {
-        if (requestParameters.reqUserIsPermitted === null || requestParameters.reqUserIsPermitted === undefined) {
-            throw new runtime.RequiredError('reqUserIsPermitted','Required parameter requestParameters.reqUserIsPermitted was null or undefined when calling isPermitted.');
+    async isPermittedRaw(requestParameters: IsPermittedRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespAuthorized>> {
+        if (requestParameters['reqUserIsPermitted'] == null) {
+            throw new runtime.RequiredError(
+                'reqUserIsPermitted',
+                'Required parameter "reqUserIsPermitted" was null or undefined when calling isPermitted().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -825,40 +745,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqUserIsPermittedToJSON(requestParameters.reqUserIsPermitted),
+            body: ReqUserIsPermittedToJSON(requestParameters['reqUserIsPermitted']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespAuthorizedFromJSON(jsonValue));
     }
 
     /**
-     * Check whether specified permission matches a permission assigned to the user, either directly or transitively.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether specified permission matches a permission assigned to the user, either directly or transitively.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isPermitted(requestParameters: IsPermittedRequest, initOverrides?: RequestInit): Promise<RespAuthorized> {
+    async isPermitted(requestParameters: IsPermittedRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespAuthorized> {
         const response = await this.isPermittedRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Check whether a user\'s permissions satisfy all of the permission specifications contained in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user\'s permissions satisfy all of the permission specifications contained in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isPermittedAllRaw(requestParameters: IsPermittedAllRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespAuthorized>> {
-        if (requestParameters.reqUserIsPermittedMulti === null || requestParameters.reqUserIsPermittedMulti === undefined) {
-            throw new runtime.RequiredError('reqUserIsPermittedMulti','Required parameter requestParameters.reqUserIsPermittedMulti was null or undefined when calling isPermittedAll.');
+    async isPermittedAllRaw(requestParameters: IsPermittedAllRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespAuthorized>> {
+        if (requestParameters['reqUserIsPermittedMulti'] == null) {
+            throw new runtime.RequiredError(
+                'reqUserIsPermittedMulti',
+                'Required parameter "reqUserIsPermittedMulti" was null or undefined when calling isPermittedAll().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -866,40 +785,39 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqUserIsPermittedMultiToJSON(requestParameters.reqUserIsPermittedMulti),
+            body: ReqUserIsPermittedMultiToJSON(requestParameters['reqUserIsPermittedMulti']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespAuthorizedFromJSON(jsonValue));
     }
 
     /**
-     * Check whether a user\'s permissions satisfy all of the permission specifications contained in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user\'s permissions satisfy all of the permission specifications contained in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isPermittedAll(requestParameters: IsPermittedAllRequest, initOverrides?: RequestInit): Promise<RespAuthorized> {
+    async isPermittedAll(requestParameters: IsPermittedAllRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespAuthorized> {
         const response = await this.isPermittedAllRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Check whether a user\'s permissions satisfy any of the permission specifications contained in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user\'s permissions satisfy any of the permission specifications contained in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isPermittedAnyRaw(requestParameters: IsPermittedAnyRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespAuthorized>> {
-        if (requestParameters.reqUserIsPermittedMulti === null || requestParameters.reqUserIsPermittedMulti === undefined) {
-            throw new runtime.RequiredError('reqUserIsPermittedMulti','Required parameter requestParameters.reqUserIsPermittedMulti was null or undefined when calling isPermittedAny.');
+    async isPermittedAnyRaw(requestParameters: IsPermittedAnyRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespAuthorized>> {
+        if (requestParameters['reqUserIsPermittedMulti'] == null) {
+            throw new runtime.RequiredError(
+                'reqUserIsPermittedMulti',
+                'Required parameter "reqUserIsPermittedMulti" was null or undefined when calling isPermittedAny().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -907,81 +825,79 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqUserIsPermittedMultiToJSON(requestParameters.reqUserIsPermittedMulti),
+            body: ReqUserIsPermittedMultiToJSON(requestParameters['reqUserIsPermittedMulti']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespAuthorizedFromJSON(jsonValue));
     }
 
     /**
-     * Check whether a user\'s permissions satisfy any of the permission specifications contained in the request body.  This request is authorized if the requestor is a user that has access to the specified tenant or if the requestor is a service.
+     * Check whether a user\'s permissions satisfy any of the permission specifications contained in the request body.  This request is authorized if the requestor is a service or a user that has access to the specified tenant. 
      */
-    async isPermittedAny(requestParameters: IsPermittedAnyRequest, initOverrides?: RequestInit): Promise<RespAuthorized> {
+    async isPermittedAny(requestParameters: IsPermittedAnyRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespAuthorized> {
         const response = await this.isPermittedAnyRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Revoke the previously granted tenant administrator role from a user. No action is taken if the user is not currently assigned the role (the request is idempotent).  The request will not be honored if revoking the role would leave the tenant with no administrator.  The user specified in the JWT must themselves be an administrator and a valid tenant and user must be specified in the request body.
+     * Revoke a previously granted role from a user. No action is taken if the user is not currently assigned the role. This request is idempotent.  The type of role to grant may be specified in the request body. Allowed types are USER, TENANT_ADMIN and RESTRICTED_SVC. Default type is USER.  The user and the role must be in the same tenant.  For roles of type USER the request is authorized only if the requestor is the role owner, a tenant administrator or a site administrator. For roles of type TENANT_ADMIN the requestor must a tenant or site administrator. For roles of type RESTRICTED_SVC the requestor must a site administrator. 
      */
-    async revokeAdminRoleRaw(requestParameters: RevokeAdminRoleRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespChangeCount>> {
-        if (requestParameters.reqRevokeAdminRole === null || requestParameters.reqRevokeAdminRole === undefined) {
-            throw new runtime.RequiredError('reqRevokeAdminRole','Required parameter requestParameters.reqRevokeAdminRole was null or undefined when calling revokeAdminRole.');
+    async revokeRoleRaw(requestParameters: RevokeRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespChangeCount>> {
+        if (requestParameters['reqRevokeRole'] == null) {
+            throw new runtime.RequiredError(
+                'reqRevokeRole',
+                'Required parameter "reqRevokeRole" was null or undefined when calling revokeRole().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
-            path: `/security/user/revokeAdminRole`,
+            path: `/security/user/revokeRole`,
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqRevokeAdminRoleToJSON(requestParameters.reqRevokeAdminRole),
+            body: ReqRevokeRoleToJSON(requestParameters['reqRevokeRole']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespChangeCountFromJSON(jsonValue));
     }
 
     /**
-     * Revoke the previously granted tenant administrator role from a user. No action is taken if the user is not currently assigned the role (the request is idempotent).  The request will not be honored if revoking the role would leave the tenant with no administrator.  The user specified in the JWT must themselves be an administrator and a valid tenant and user must be specified in the request body.
+     * Revoke a previously granted role from a user. No action is taken if the user is not currently assigned the role. This request is idempotent.  The type of role to grant may be specified in the request body. Allowed types are USER, TENANT_ADMIN and RESTRICTED_SVC. Default type is USER.  The user and the role must be in the same tenant.  For roles of type USER the request is authorized only if the requestor is the role owner, a tenant administrator or a site administrator. For roles of type TENANT_ADMIN the requestor must a tenant or site administrator. For roles of type RESTRICTED_SVC the requestor must a site administrator. 
      */
-    async revokeAdminRole(requestParameters: RevokeAdminRoleRequest, initOverrides?: RequestInit): Promise<RespChangeCount> {
-        const response = await this.revokeAdminRoleRaw(requestParameters, initOverrides);
+    async revokeRole(requestParameters: RevokeRoleRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespChangeCount> {
+        const response = await this.revokeRoleRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
     /**
-     * Revoke the specified permission from the user\'s default role. A user\'s default role is constructed by prepending \'$$\' to the user\'s name. Default roles are created on demand. If the role does not exist when this method is called no error is reported and no changes occur.  The change count returned can be zero or one depending on how many permissions were revoked.  A valid tenant and user must be specified in the request body.  The caller must be an administrator, a service or the user themselves.
+     * Revoke the specified permission from the user\'s default role. A user\'s default role is constructed by prepending \'$$\' to the user\'s name. Default roles are created on demand. If the role does not exist when this method is called no error is reported and no changes occur.  The change count returned can be zero or one depending on how many permissions were revoked.  A valid tenant and user must be specified in the request body. The caller must be an administrator, a service or the user themselves. 
      */
-    async revokeUserPermissionRaw(requestParameters: RevokeUserPermissionRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespChangeCount>> {
-        if (requestParameters.reqRevokeUserPermission === null || requestParameters.reqRevokeUserPermission === undefined) {
-            throw new runtime.RequiredError('reqRevokeUserPermission','Required parameter requestParameters.reqRevokeUserPermission was null or undefined when calling revokeUserPermission.');
+    async revokeUserPermissionRaw(requestParameters: RevokeUserPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<RespChangeCount>> {
+        if (requestParameters['reqRevokeUserPermission'] == null) {
+            throw new runtime.RequiredError(
+                'reqRevokeUserPermission',
+                'Required parameter "reqRevokeUserPermission" was null or undefined when calling revokeUserPermission().'
+            );
         }
 
         const queryParameters: any = {};
 
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
         const headerParameters: runtime.HTTPHeaders = {};
 
         headerParameters['Content-Type'] = 'application/json';
 
         if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
+            headerParameters["X-Tapis-Token"] = await this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
         }
 
         const response = await this.request({
@@ -989,59 +905,18 @@ export class UserApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: ReqRevokeUserPermissionToJSON(requestParameters.reqRevokeUserPermission),
+            body: ReqRevokeUserPermissionToJSON(requestParameters['reqRevokeUserPermission']),
         }, initOverrides);
 
         return new runtime.JSONApiResponse(response, (jsonValue) => RespChangeCountFromJSON(jsonValue));
     }
 
     /**
-     * Revoke the specified permission from the user\'s default role. A user\'s default role is constructed by prepending \'$$\' to the user\'s name. Default roles are created on demand. If the role does not exist when this method is called no error is reported and no changes occur.  The change count returned can be zero or one depending on how many permissions were revoked.  A valid tenant and user must be specified in the request body.  The caller must be an administrator, a service or the user themselves.
+     * Revoke the specified permission from the user\'s default role. A user\'s default role is constructed by prepending \'$$\' to the user\'s name. Default roles are created on demand. If the role does not exist when this method is called no error is reported and no changes occur.  The change count returned can be zero or one depending on how many permissions were revoked.  A valid tenant and user must be specified in the request body. The caller must be an administrator, a service or the user themselves. 
      */
-    async revokeUserPermission(requestParameters: RevokeUserPermissionRequest, initOverrides?: RequestInit): Promise<RespChangeCount> {
+    async revokeUserPermission(requestParameters: RevokeUserPermissionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<RespChangeCount> {
         const response = await this.revokeUserPermissionRaw(requestParameters, initOverrides);
         return await response.value();
     }
 
-    /**
-     * Revoke a previously granted role from a user. No action is taken if the user is not currently assigned the role. This request is idempotent.  This request is authorized only if the requestor is the role owner or an administrator.
-     */
-    async revokeUserRoleRaw(requestParameters: RevokeUserRoleRequest, initOverrides?: RequestInit): Promise<runtime.ApiResponse<RespChangeCount>> {
-        if (requestParameters.reqRevokeUserRole === null || requestParameters.reqRevokeUserRole === undefined) {
-            throw new runtime.RequiredError('reqRevokeUserRole','Required parameter requestParameters.reqRevokeUserRole was null or undefined when calling revokeUserRole.');
-        }
-
-        const queryParameters: any = {};
-
-        if (requestParameters.pretty !== undefined) {
-            queryParameters['pretty'] = requestParameters.pretty;
-        }
-
-        const headerParameters: runtime.HTTPHeaders = {};
-
-        headerParameters['Content-Type'] = 'application/json';
-
-        if (this.configuration && this.configuration.apiKey) {
-            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-        }
-
-        const response = await this.request({
-            path: `/security/user/revokeUserRole`,
-            method: 'POST',
-            headers: headerParameters,
-            query: queryParameters,
-            body: ReqRevokeUserRoleToJSON(requestParameters.reqRevokeUserRole),
-        }, initOverrides);
-
-        return new runtime.JSONApiResponse(response, (jsonValue) => RespChangeCountFromJSON(jsonValue));
-    }
-
-    /**
-     * Revoke a previously granted role from a user. No action is taken if the user is not currently assigned the role. This request is idempotent.  This request is authorized only if the requestor is the role owner or an administrator.
-     */
-    async revokeUserRole(requestParameters: RevokeUserRoleRequest, initOverrides?: RequestInit): Promise<RespChangeCount> {
-        const response = await this.revokeUserRoleRaw(requestParameters, initOverrides);
-        return await response.value();
-    }
-
 }