@tapis/tapis-typescript-sk 0.0.2 → 0.0.3

package/dist/apis/UserApi.js

@@ -3,9 +3,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).
@@ -13,30 +13,36 @@
  * Do not edit the class manually.
  */
 var __extends = (this && this.__extends) || (function () {
-    var extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
     return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
         extendStatics(d, b);
         function __() { this.constructor = d; }
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
         function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
         function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -58,8 +64,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserApi = void 0;
 var runtime = require("../runtime");
-var models_1 = require("../models");
+var index_1 = require("../models/index");
 /**
  *
  */
@@ -69,40 +76,41 @@ var UserApi = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     /**
-     * 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.
      */
     UserApi.prototype.getAdminsRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.tenant === null || requestParameters.tenant === undefined) {
-                            throw new runtime.RequiredError('tenant', 'Required parameter requestParameters.tenant was null or undefined when calling getAdmins.');
+                        if (requestParameters['tenant'] == null) {
+                            throw new runtime.RequiredError('tenant', 'Required parameter "tenant" was null or undefined when calling getAdmins().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/admins/{tenant}".replace("{" + "tenant" + "}", encodeURIComponent(String(requestParameters.tenant))),
-                                method: 'GET',
-                                headers: headerParameters,
-                                query: queryParameters,
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespNameArrayFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/admins/{tenant}".replace("{".concat("tenant", "}"), encodeURIComponent(String(requestParameters['tenant']))),
+                            method: 'GET',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.RespNameArrayFromJSON)(jsonValue); })];
                 }
             });
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getAdmins = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -119,37 +127,41 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getDefaultUserRole1Raw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.user === null || requestParameters.user === undefined) {
-                            throw new runtime.RequiredError('user', 'Required parameter requestParameters.user was null or undefined when calling getDefaultUserRole1.');
+                        if (requestParameters['user'] == null) {
+                            throw new runtime.RequiredError('user', 'Required parameter "user" was null or undefined when calling getDefaultUserRole1().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/defaultRole/{user}".replace("{" + "user" + "}", encodeURIComponent(String(requestParameters.user))),
-                                method: 'GET',
-                                headers: headerParameters,
-                                query: queryParameters,
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespNameFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/defaultRole/{user}".replace("{".concat("user", "}"), encodeURIComponent(String(requestParameters['user']))),
+                            method: 'GET',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.RespNameFromJSON)(jsonValue); })];
                 }
             });
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getDefaultUserRole1 = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -166,44 +178,46 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUserNamesRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         queryParameters = {};
-                        if (requestParameters.tenant !== undefined) {
-                            queryParameters['tenant'] = requestParameters.tenant;
-                        }
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
+                        if (requestParameters['tenant'] != null) {
+                            queryParameters['tenant'] = requestParameters['tenant'];
                         }
                         headerParameters = {};
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user",
-                                method: 'GET',
-                                headers: headerParameters,
-                                query: queryParameters,
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespNameArrayFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user",
+                            method: 'GET',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.RespNameArrayFromJSON)(jsonValue); })];
                 }
             });
         });
     };
     /**
-     * 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.
      */
-    UserApi.prototype.getUserNames = function (requestParameters, initOverrides) {
-        return __awaiter(this, void 0, void 0, function () {
+    UserApi.prototype.getUserNames = function () {
+        return __awaiter(this, arguments, void 0, function (requestParameters, initOverrides) {
             var response;
+            if (requestParameters === void 0) { requestParameters = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getUserNamesRaw(requestParameters, initOverrides)];
@@ -216,49 +230,50 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUserPermsRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.user === null || requestParameters.user === undefined) {
-                            throw new runtime.RequiredError('user', 'Required parameter requestParameters.user was null or undefined when calling getUserPerms.');
+                        if (requestParameters['user'] == null) {
+                            throw new runtime.RequiredError('user', 'Required parameter "user" was null or undefined when calling getUserPerms().');
                         }
                         queryParameters = {};
-                        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'];
                         }
                         headerParameters = {};
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/perms/{user}".replace("{" + "user" + "}", encodeURIComponent(String(requestParameters.user))),
-                                method: 'GET',
-                                headers: headerParameters,
-                                query: queryParameters,
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespNameArrayFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/perms/{user}".replace("{".concat("user", "}"), encodeURIComponent(String(requestParameters['user']))),
+                            method: 'GET',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.RespNameArrayFromJSON)(jsonValue); })];
                 }
             });
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUserPerms = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -275,43 +290,44 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUserRolesRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.user === null || requestParameters.user === undefined) {
-                            throw new runtime.RequiredError('user', 'Required parameter requestParameters.user was null or undefined when calling getUserRoles.');
+                        if (requestParameters['user'] == null) {
+                            throw new runtime.RequiredError('user', 'Required parameter "user" was null or undefined when calling getUserRoles().');
                         }
                         queryParameters = {};
-                        if (requestParameters.tenant !== undefined) {
-                            queryParameters['tenant'] = requestParameters.tenant;
-                        }
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
+                        if (requestParameters['tenant'] != null) {
+                            queryParameters['tenant'] = requestParameters['tenant'];
                         }
                         headerParameters = {};
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/roles/{user}".replace("{" + "user" + "}", encodeURIComponent(String(requestParameters.user))),
-                                method: 'GET',
-                                headers: headerParameters,
-                                query: queryParameters,
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespNameArrayFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/roles/{user}".replace("{".concat("user", "}"), encodeURIComponent(String(requestParameters['user']))),
+                            method: 'GET',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.RespNameArrayFromJSON)(jsonValue); })];
                 }
             });
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUserRoles = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -328,43 +344,44 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUsersWithPermissionRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.permSpec === null || requestParameters.permSpec === undefined) {
-                            throw new runtime.RequiredError('permSpec', 'Required parameter requestParameters.permSpec was null or undefined when calling getUsersWithPermission.');
+                        if (requestParameters['permSpec'] == null) {
+                            throw new runtime.RequiredError('permSpec', 'Required parameter "permSpec" was null or undefined when calling getUsersWithPermission().');
                         }
                         queryParameters = {};
-                        if (requestParameters.tenant !== undefined) {
-                            queryParameters['tenant'] = requestParameters.tenant;
-                        }
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
+                        if (requestParameters['tenant'] != null) {
+                            queryParameters['tenant'] = requestParameters['tenant'];
                         }
                         headerParameters = {};
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/withPermission/{permSpec}".replace("{" + "permSpec" + "}", encodeURIComponent(String(requestParameters.permSpec))),
-                                method: 'GET',
-                                headers: headerParameters,
-                                query: queryParameters,
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespNameArrayFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/withPermission/{permSpec}".replace("{".concat("permSpec", "}"), encodeURIComponent(String(requestParameters['permSpec']))),
+                            method: 'GET',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.RespNameArrayFromJSON)(jsonValue); })];
                 }
             });
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUsersWithPermission = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -381,43 +398,47 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUsersWithRoleRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.roleName === null || requestParameters.roleName === undefined) {
-                            throw new runtime.RequiredError('roleName', 'Required parameter requestParameters.roleName was null or undefined when calling getUsersWithRole.');
+                        if (requestParameters['roleName'] == null) {
+                            throw new runtime.RequiredError('roleName', 'Required parameter "roleName" was null or undefined when calling getUsersWithRole().');
                         }
                         queryParameters = {};
-                        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'];
                         }
                         headerParameters = {};
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/withRole/{roleName}".replace("{" + "roleName" + "}", encodeURIComponent(String(requestParameters.roleName))),
-                                method: 'GET',
-                                headers: headerParameters,
-                                query: queryParameters,
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespNameArrayFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/withRole/{roleName}".replace("{".concat("roleName", "}"), encodeURIComponent(String(requestParameters['roleName']))),
+                            method: 'GET',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.RespNameArrayFromJSON)(jsonValue); })];
                 }
             });
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.getUsersWithRole = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -434,94 +455,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
-     */
-    UserApi.prototype.grantAdminRoleRaw = function (requestParameters, initOverrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (requestParameters.reqGrantAdminRole === null || requestParameters.reqGrantAdminRole === undefined) {
-                            throw new runtime.RequiredError('reqGrantAdminRole', 'Required parameter requestParameters.reqGrantAdminRole was null or undefined when calling grantAdminRole.');
-                        }
-                        queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
-                        headerParameters = {};
-                        headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/grantAdminRole",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqGrantAdminRoleToJSON(requestParameters.reqGrantAdminRole),
-                            }, initOverrides)];
-                    case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.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.
-     */
-    UserApi.prototype.grantAdminRole = function (requestParameters, initOverrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.grantAdminRoleRaw(requestParameters, initOverrides)];
-                    case 1:
-                        response = _a.sent();
-                        return [4 /*yield*/, response.value()];
-                    case 2: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
-    /**
-     * 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.
      */
     UserApi.prototype.grantRoleRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqGrantUserRole === null || requestParameters.reqGrantUserRole === undefined) {
-                            throw new runtime.RequiredError('reqGrantUserRole', 'Required parameter requestParameters.reqGrantUserRole was null or undefined when calling grantRole.');
+                        if (requestParameters['reqGrantRole'] == null) {
+                            throw new runtime.RequiredError('reqGrantRole', 'Required parameter "reqGrantRole" was null or undefined when calling grantRole().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/grantRole",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqGrantUserRoleToJSON(requestParameters.reqGrantUserRole),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespChangeCountFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/grantRole",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqGrantRoleToJSON)(requestParameters['reqGrantRole']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.grantRole = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -538,42 +508,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.grantRoleWithPermissionRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqGrantUserRoleWithPermission === null || requestParameters.reqGrantUserRoleWithPermission === undefined) {
-                            throw new runtime.RequiredError('reqGrantUserRoleWithPermission', 'Required parameter requestParameters.reqGrantUserRoleWithPermission was null or undefined when calling grantRoleWithPermission.');
+                        if (requestParameters['reqGrantRoleWithPermission'] == null) {
+                            throw new runtime.RequiredError('reqGrantRoleWithPermission', 'Required parameter "reqGrantRoleWithPermission" was null or undefined when calling grantRoleWithPermission().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/grantRoleWithPerm",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqGrantUserRoleWithPermissionToJSON(requestParameters.reqGrantUserRoleWithPermission),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespChangeCountFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/grantRoleWithPerm",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqGrantRoleWithPermissionToJSON)(requestParameters['reqGrantRoleWithPermission']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.grantRoleWithPermission = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -590,42 +561,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.grantUserPermissionRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqGrantUserPermission === null || requestParameters.reqGrantUserPermission === undefined) {
-                            throw new runtime.RequiredError('reqGrantUserPermission', 'Required parameter requestParameters.reqGrantUserPermission was null or undefined when calling grantUserPermission.');
+                        if (requestParameters['reqGrantUserPermission'] == null) {
+                            throw new runtime.RequiredError('reqGrantUserPermission', 'Required parameter "reqGrantUserPermission" was null or undefined when calling grantUserPermission().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/grantUserPermission",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqGrantUserPermissionToJSON(requestParameters.reqGrantUserPermission),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespChangeCountFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/grantUserPermission",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqGrantUserPermissionToJSON)(requestParameters['reqGrantUserPermission']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.grantUserPermission = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -642,42 +614,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.hasRoleRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqUserHasRole === null || requestParameters.reqUserHasRole === undefined) {
-                            throw new runtime.RequiredError('reqUserHasRole', 'Required parameter requestParameters.reqUserHasRole was null or undefined when calling hasRole.');
+                        if (requestParameters['reqUserHasRole'] == null) {
+                            throw new runtime.RequiredError('reqUserHasRole', 'Required parameter "reqUserHasRole" was null or undefined when calling hasRole().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/hasRole",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqUserHasRoleToJSON(requestParameters.reqUserHasRole),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespAuthorizedFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/hasRole",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqUserHasRoleToJSON)(requestParameters['reqUserHasRole']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.hasRole = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -694,42 +667,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.hasRoleAllRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqUserHasRoleMulti === null || requestParameters.reqUserHasRoleMulti === undefined) {
-                            throw new runtime.RequiredError('reqUserHasRoleMulti', 'Required parameter requestParameters.reqUserHasRoleMulti was null or undefined when calling hasRoleAll.');
+                        if (requestParameters['reqUserHasRoleMulti'] == null) {
+                            throw new runtime.RequiredError('reqUserHasRoleMulti', 'Required parameter "reqUserHasRoleMulti" was null or undefined when calling hasRoleAll().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/hasRoleAll",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqUserHasRoleMultiToJSON(requestParameters.reqUserHasRoleMulti),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespAuthorizedFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/hasRoleAll",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqUserHasRoleMultiToJSON)(requestParameters['reqUserHasRoleMulti']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.hasRoleAll = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -746,42 +720,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.hasRoleAnyRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqUserHasRoleMulti === null || requestParameters.reqUserHasRoleMulti === undefined) {
-                            throw new runtime.RequiredError('reqUserHasRoleMulti', 'Required parameter requestParameters.reqUserHasRoleMulti was null or undefined when calling hasRoleAny.');
+                        if (requestParameters['reqUserHasRoleMulti'] == null) {
+                            throw new runtime.RequiredError('reqUserHasRoleMulti', 'Required parameter "reqUserHasRoleMulti" was null or undefined when calling hasRoleAny().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/hasRoleAny",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqUserHasRoleMultiToJSON(requestParameters.reqUserHasRoleMulti),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespAuthorizedFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/hasRoleAny",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqUserHasRoleMultiToJSON)(requestParameters['reqUserHasRoleMulti']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.hasRoleAny = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -798,42 +773,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.isAdminRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqUserIsAdmin === null || requestParameters.reqUserIsAdmin === undefined) {
-                            throw new runtime.RequiredError('reqUserIsAdmin', 'Required parameter requestParameters.reqUserIsAdmin was null or undefined when calling isAdmin.');
+                        if (requestParameters['reqUserIsAdmin'] == null) {
+                            throw new runtime.RequiredError('reqUserIsAdmin', 'Required parameter "reqUserIsAdmin" was null or undefined when calling isAdmin().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/isAdmin",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqUserIsAdminToJSON(requestParameters.reqUserIsAdmin),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespAuthorizedFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/isAdmin",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqUserIsAdminToJSON)(requestParameters['reqUserIsAdmin']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.isAdmin = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -850,42 +826,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.isPermittedRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqUserIsPermitted === null || requestParameters.reqUserIsPermitted === undefined) {
-                            throw new runtime.RequiredError('reqUserIsPermitted', 'Required parameter requestParameters.reqUserIsPermitted was null or undefined when calling isPermitted.');
+                        if (requestParameters['reqUserIsPermitted'] == null) {
+                            throw new runtime.RequiredError('reqUserIsPermitted', 'Required parameter "reqUserIsPermitted" was null or undefined when calling isPermitted().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/isPermitted",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqUserIsPermittedToJSON(requestParameters.reqUserIsPermitted),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespAuthorizedFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/isPermitted",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqUserIsPermittedToJSON)(requestParameters['reqUserIsPermitted']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.isPermitted = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -902,42 +879,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.isPermittedAllRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqUserIsPermittedMulti === null || requestParameters.reqUserIsPermittedMulti === undefined) {
-                            throw new runtime.RequiredError('reqUserIsPermittedMulti', 'Required parameter requestParameters.reqUserIsPermittedMulti was null or undefined when calling isPermittedAll.');
+                        if (requestParameters['reqUserIsPermittedMulti'] == null) {
+                            throw new runtime.RequiredError('reqUserIsPermittedMulti', 'Required parameter "reqUserIsPermittedMulti" was null or undefined when calling isPermittedAll().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/isPermittedAll",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqUserIsPermittedMultiToJSON(requestParameters.reqUserIsPermittedMulti),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespAuthorizedFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/isPermittedAll",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqUserIsPermittedMultiToJSON)(requestParameters['reqUserIsPermittedMulti']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.isPermittedAll = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -954,42 +932,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.isPermittedAnyRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqUserIsPermittedMulti === null || requestParameters.reqUserIsPermittedMulti === undefined) {
-                            throw new runtime.RequiredError('reqUserIsPermittedMulti', 'Required parameter requestParameters.reqUserIsPermittedMulti was null or undefined when calling isPermittedAny.');
+                        if (requestParameters['reqUserIsPermittedMulti'] == null) {
+                            throw new runtime.RequiredError('reqUserIsPermittedMulti', 'Required parameter "reqUserIsPermittedMulti" was null or undefined when calling isPermittedAny().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/isPermittedAny",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqUserIsPermittedMultiToJSON(requestParameters.reqUserIsPermittedMulti),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespAuthorizedFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/isPermittedAny",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqUserIsPermittedMultiToJSON)(requestParameters['reqUserIsPermittedMulti']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.isPermittedAny = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -1006,49 +985,50 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
-    UserApi.prototype.revokeAdminRoleRaw = function (requestParameters, initOverrides) {
+    UserApi.prototype.revokeRoleRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqRevokeAdminRole === null || requestParameters.reqRevokeAdminRole === undefined) {
-                            throw new runtime.RequiredError('reqRevokeAdminRole', 'Required parameter requestParameters.reqRevokeAdminRole was null or undefined when calling revokeAdminRole.');
+                        if (requestParameters['reqRevokeRole'] == null) {
+                            throw new runtime.RequiredError('reqRevokeRole', 'Required parameter "reqRevokeRole" was null or undefined when calling revokeRole().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/revokeAdminRole",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqRevokeAdminRoleToJSON(requestParameters.reqRevokeAdminRole),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespChangeCountFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/revokeRole",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqRevokeRoleToJSON)(requestParameters['reqRevokeRole']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
-    UserApi.prototype.revokeAdminRole = function (requestParameters, initOverrides) {
+    UserApi.prototype.revokeRole = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
             var response;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.revokeAdminRoleRaw(requestParameters, initOverrides)];
+                    case 0: return [4 /*yield*/, this.revokeRoleRaw(requestParameters, initOverrides)];
                     case 1:
                         response = _a.sent();
                         return [4 /*yield*/, response.value()];
@@ -1058,42 +1038,43 @@ var UserApi = /** @class */ (function (_super) {
         });
     };
     /**
-     * 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.
      */
     UserApi.prototype.revokeUserPermissionRaw = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var queryParameters, headerParameters, _a, _b, response;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (requestParameters.reqRevokeUserPermission === null || requestParameters.reqRevokeUserPermission === undefined) {
-                            throw new runtime.RequiredError('reqRevokeUserPermission', 'Required parameter requestParameters.reqRevokeUserPermission was null or undefined when calling revokeUserPermission.');
+                        if (requestParameters['reqRevokeUserPermission'] == null) {
+                            throw new runtime.RequiredError('reqRevokeUserPermission', 'Required parameter "reqRevokeUserPermission" was null or undefined when calling revokeUserPermission().');
                         }
                         queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
                         headerParameters = {};
                         headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/revokeUserPermission",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqRevokeUserPermissionToJSON(requestParameters.reqRevokeUserPermission),
-                            }, initOverrides)];
+                        if (!(this.configuration && this.configuration.apiKey)) return [3 /*break*/, 2];
+                        _a = headerParameters;
+                        _b = "X-Tapis-Token";
+                        return [4 /*yield*/, this.configuration.apiKey("X-Tapis-Token")];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.RespChangeCountFromJSON(jsonValue); })];
+                        _a[_b] = _c.sent(); // TapisJWT authentication
+                        _c.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/security/user/revokeUserPermission",
+                            method: 'POST',
+                            headers: headerParameters,
+                            query: queryParameters,
+                            body: (0, index_1.ReqRevokeUserPermissionToJSON)(requestParameters['reqRevokeUserPermission']),
+                        }, initOverrides)];
+                    case 3:
+                        response = _c.sent();
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.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.
      */
     UserApi.prototype.revokeUserPermission = function (requestParameters, initOverrides) {
         return __awaiter(this, void 0, void 0, function () {
@@ -1109,58 +1090,6 @@ var UserApi = /** @class */ (function (_super) {
             });
         });
     };
-    /**
-     * 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.
-     */
-    UserApi.prototype.revokeUserRoleRaw = function (requestParameters, initOverrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var queryParameters, headerParameters, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (requestParameters.reqRevokeUserRole === null || requestParameters.reqRevokeUserRole === undefined) {
-                            throw new runtime.RequiredError('reqRevokeUserRole', 'Required parameter requestParameters.reqRevokeUserRole was null or undefined when calling revokeUserRole.');
-                        }
-                        queryParameters = {};
-                        if (requestParameters.pretty !== undefined) {
-                            queryParameters['pretty'] = requestParameters.pretty;
-                        }
-                        headerParameters = {};
-                        headerParameters['Content-Type'] = 'application/json';
-                        if (this.configuration && this.configuration.apiKey) {
-                            headerParameters["X-Tapis-Token"] = this.configuration.apiKey("X-Tapis-Token"); // TapisJWT authentication
-                        }
-                        return [4 /*yield*/, this.request({
-                                path: "/security/user/revokeUserRole",
-                                method: 'POST',
-                                headers: headerParameters,
-                                query: queryParameters,
-                                body: models_1.ReqRevokeUserRoleToJSON(requestParameters.reqRevokeUserRole),
-                            }, initOverrides)];
-                    case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return models_1.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.
-     */
-    UserApi.prototype.revokeUserRole = function (requestParameters, initOverrides) {
-        return __awaiter(this, void 0, void 0, function () {
-            var response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.revokeUserRoleRaw(requestParameters, initOverrides)];
-                    case 1:
-                        response = _a.sent();
-                        return [4 /*yield*/, response.value()];
-                    case 2: return [2 /*return*/, _a.sent()];
-                }
-            });
-        });
-    };
     return UserApi;
 }(runtime.BaseAPI));
 exports.UserApi = UserApi;