@cirrobio/api-client 0.1.3 → 0.1.5

package/.openapi-generator/FILES

@@ -28,6 +28,7 @@ src/models/BillingAccountRequest.ts
 src/models/BillingMethod.ts
 src/models/BudgetPeriod.ts
 src/models/CloudAccount.ts
+src/models/CloudAccountType.ts
 src/models/ColumnDefinition.ts
 src/models/Contact.ts
 src/models/CreateNotebookInstanceRequest.ts
@@ -95,6 +96,8 @@ src/models/UpdateUserRequest.ts
 src/models/UploadDatasetCreateResponse.ts
 src/models/UploadDatasetRequest.ts
 src/models/User.ts
+src/models/UserDetail.ts
+src/models/UserProjectAssignment.ts
 src/models/ValidateFileRequirementsRequest.ts
 src/models/index.ts
 src/runtime.ts

package/README.md

@@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co
 _published:_
 
 ```
-npm install @cirrobio/api-client@0.1.3 --save
+npm install @cirrobio/api-client@0.1.5 --save
 ```
 
 _unPublished (not recommended):_

package/dist/apis/UsersApi.d.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 import * as runtime from '../runtime';
-import type { InviteUserRequest, InviteUserResponse, UpdateUserRequest, User } from '../models/index';
+import type { InviteUserRequest, InviteUserResponse, UpdateUserRequest, User, UserDetail } from '../models/index';
 export interface GetUserRequest {
     username: string;
 }
@@ -20,6 +20,9 @@ export interface GetUsersRequest {
 export interface InviteUserOperationRequest {
     inviteUserRequest: InviteUserRequest;
 }
+export interface SignOutUserRequest {
+    username: string;
+}
 export interface UpdateUserOperationRequest {
     username: string;
     updateUserRequest: UpdateUserRequest;
@@ -32,12 +35,12 @@ export declare class UsersApi extends runtime.BaseAPI {
      * Get user information
      * Get user
      */
-    getUserRaw(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<User>>;
+    getUserRaw(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<UserDetail>>;
     /**
      * Get user information
      * Get user
      */
-    getUser(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<User>;
+    getUser(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<UserDetail>;
     /**
      * Gets a list of users matching the username pattern
      * List users
@@ -58,6 +61,16 @@ export declare class UsersApi extends runtime.BaseAPI {
      * Invite user
      */
     inviteUser(requestParameters: InviteUserOperationRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<InviteUserResponse>;
+    /**
+     * Signs user out from all sessions
+     * Sign out user
+     */
+    signOutUserRaw(requestParameters: SignOutUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>>;
+    /**
+     * Signs user out from all sessions
+     * Sign out user
+     */
+    signOutUser(requestParameters: SignOutUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void>;
     /**
      * Update user information
      * Update user

package/dist/apis/UsersApi.js

@@ -107,7 +107,7 @@ var UsersApi = /** @class */ (function (_super) {
                         }, initOverrides)];
                     case 3:
                         response = _a.sent();
-                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.UserFromJSON)(jsonValue); })];
+                        return [2 /*return*/, new runtime.JSONApiResponse(response, function (jsonValue) { return (0, index_1.UserDetailFromJSON)(jsonValue); })];
                 }
             });
         });
@@ -245,6 +245,59 @@ var UsersApi = /** @class */ (function (_super) {
             });
         });
     };
+    /**
+     * Signs user out from all sessions
+     * Sign out user
+     */
+    UsersApi.prototype.signOutUserRaw = function (requestParameters, initOverrides) {
+        return __awaiter(this, void 0, void 0, function () {
+            var queryParameters, headerParameters, token, tokenString, response;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (requestParameters.username === null || requestParameters.username === undefined) {
+                            throw new runtime.RequiredError('username', 'Required parameter requestParameters.username was null or undefined when calling signOutUser.');
+                        }
+                        queryParameters = {};
+                        headerParameters = {};
+                        if (!(this.configuration && this.configuration.accessToken)) return [3 /*break*/, 2];
+                        token = this.configuration.accessToken;
+                        return [4 /*yield*/, token("accessToken", [])];
+                    case 1:
+                        tokenString = _a.sent();
+                        if (tokenString) {
+                            headerParameters["Authorization"] = "Bearer ".concat(tokenString);
+                        }
+                        _a.label = 2;
+                    case 2: return [4 /*yield*/, this.request({
+                            path: "/users/{username}:signOut".replace("{".concat("username", "}"), encodeURIComponent(String(requestParameters.username))),
+                            method: 'PUT',
+                            headers: headerParameters,
+                            query: queryParameters,
+                        }, initOverrides)];
+                    case 3:
+                        response = _a.sent();
+                        return [2 /*return*/, new runtime.VoidApiResponse(response)];
+                }
+            });
+        });
+    };
+    /**
+     * Signs user out from all sessions
+     * Sign out user
+     */
+    UsersApi.prototype.signOutUser = function (requestParameters, initOverrides) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.signOutUserRaw(requestParameters, initOverrides)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Update user information
      * Update user

package/dist/models/AuditEvent.d.ts

@@ -52,7 +52,7 @@ export interface AuditEvent {
      */
     eventDetail?: {
         [key: string]: any;
-    };
+    } | null;
     /**
      * The changes made to the entity (if applicable)
      * @type {{ [key: string]: string; }}
@@ -60,7 +60,7 @@ export interface AuditEvent {
      */
     changes?: {
         [key: string]: string;
-    };
+    } | null;
     /**
      * The username of the user who performed the action
      * @type {string}

package/dist/models/CloudAccount.d.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import type { CloudAccountType } from './CloudAccountType';
 /**
  *
  * @export
@@ -28,11 +29,17 @@ export interface CloudAccount {
      */
     accountName?: string;
     /**
-     * AWS Region Code
+     * AWS Region Code (defaults to region of Cirro app)
      * @type {string}
      * @memberof CloudAccount
      */
     regionName?: string;
+    /**
+     *
+     * @type {CloudAccountType}
+     * @memberof CloudAccount
+     */
+    accountType: CloudAccountType;
 }
 /**
  * Check if a given object implements the CloudAccount interface.

package/dist/models/CloudAccount.js

@@ -15,11 +15,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudAccountToJSON = exports.CloudAccountFromJSONTyped = exports.CloudAccountFromJSON = exports.instanceOfCloudAccount = void 0;
 var runtime_1 = require("../runtime");
+var CloudAccountType_1 = require("./CloudAccountType");
 /**
  * Check if a given object implements the CloudAccount interface.
  */
 function instanceOfCloudAccount(value) {
     var isInstance = true;
+    isInstance = isInstance && "accountType" in value;
     return isInstance;
 }
 exports.instanceOfCloudAccount = instanceOfCloudAccount;
@@ -35,6 +37,7 @@ function CloudAccountFromJSONTyped(json, ignoreDiscriminator) {
         'accountId': !(0, runtime_1.exists)(json, 'accountId') ? undefined : json['accountId'],
         'accountName': !(0, runtime_1.exists)(json, 'accountName') ? undefined : json['accountName'],
         'regionName': !(0, runtime_1.exists)(json, 'regionName') ? undefined : json['regionName'],
+        'accountType': (0, CloudAccountType_1.CloudAccountTypeFromJSON)(json['accountType']),
     };
 }
 exports.CloudAccountFromJSONTyped = CloudAccountFromJSONTyped;
@@ -49,6 +52,7 @@ function CloudAccountToJSON(value) {
         'accountId': value.accountId,
         'accountName': value.accountName,
         'regionName': value.regionName,
+        'accountType': (0, CloudAccountType_1.CloudAccountTypeToJSON)(value.accountType),
     };
 }
 exports.CloudAccountToJSON = CloudAccountToJSON;

package/dist/models/CloudAccountType.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/**
+ * Type of cloud account (Hosted by Cirro, or Bring your own account)
+ * @export
+ * @enum {string}
+ */
+export declare enum CloudAccountType {
+    Hosted = "HOSTED",
+    Byoa = "BYOA"
+}
+export declare function CloudAccountTypeFromJSON(json: any): CloudAccountType;
+export declare function CloudAccountTypeFromJSONTyped(json: any, ignoreDiscriminator: boolean): CloudAccountType;
+export declare function CloudAccountTypeToJSON(value?: CloudAccountType | null): any;

package/dist/models/CloudAccountType.js

@@ -0,0 +1,38 @@
+"use strict";
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudAccountTypeToJSON = exports.CloudAccountTypeFromJSONTyped = exports.CloudAccountTypeFromJSON = exports.CloudAccountType = void 0;
+/**
+ * Type of cloud account (Hosted by Cirro, or Bring your own account)
+ * @export
+ * @enum {string}
+ */
+var CloudAccountType;
+(function (CloudAccountType) {
+    CloudAccountType["Hosted"] = "HOSTED";
+    CloudAccountType["Byoa"] = "BYOA";
+})(CloudAccountType = exports.CloudAccountType || (exports.CloudAccountType = {}));
+function CloudAccountTypeFromJSON(json) {
+    return CloudAccountTypeFromJSONTyped(json, false);
+}
+exports.CloudAccountTypeFromJSON = CloudAccountTypeFromJSON;
+function CloudAccountTypeFromJSONTyped(json, ignoreDiscriminator) {
+    return json;
+}
+exports.CloudAccountTypeFromJSONTyped = CloudAccountTypeFromJSONTyped;
+function CloudAccountTypeToJSON(value) {
+    return value;
+}
+exports.CloudAccountTypeToJSON = CloudAccountTypeToJSON;

package/dist/models/ProjectSettings.d.ts

@@ -77,11 +77,11 @@ export interface ProjectSettings {
      */
     retentionPolicyDays?: number;
     /**
-     *
+     * List of service connections to enable
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
-    serviceConnections: Array<string>;
+    serviceConnections?: Array<string>;
     /**
      * VPC that the compute environment will use
      * @type {string}
@@ -89,11 +89,17 @@ export interface ProjectSettings {
      */
     vpcId?: string | null;
     /**
-     *
+     * List of subnets that the compute environment will use
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
     batchSubnets?: Array<string> | null;
+    /**
+     * List of subnets that the sagemaker instances will use
+     * @type {Array<string>}
+     * @memberof ProjectSettings
+     */
+    sagemakerSubnets?: Array<string> | null;
     /**
      * KMS Key ARN to encrypt S3 objects, if not provided, default bucket encryption will be used
      * @type {string}

package/dist/models/ProjectSettings.js

@@ -23,7 +23,6 @@ function instanceOfProjectSettings(value) {
     var isInstance = true;
     isInstance = isInstance && "budgetAmount" in value;
     isInstance = isInstance && "budgetPeriod" in value;
-    isInstance = isInstance && "serviceConnections" in value;
     return isInstance;
 }
 exports.instanceOfProjectSettings = instanceOfProjectSettings;
@@ -46,9 +45,10 @@ function ProjectSettingsFromJSONTyped(json, ignoreDiscriminator) {
         'maxF1VCPU': !(0, runtime_1.exists)(json, 'maxF1VCPU') ? undefined : json['maxF1VCPU'],
         'maxSpotVCPU': !(0, runtime_1.exists)(json, 'maxSpotVCPU') ? undefined : json['maxSpotVCPU'],
         'retentionPolicyDays': !(0, runtime_1.exists)(json, 'retentionPolicyDays') ? undefined : json['retentionPolicyDays'],
-        'serviceConnections': json['serviceConnections'],
+        'serviceConnections': !(0, runtime_1.exists)(json, 'serviceConnections') ? undefined : json['serviceConnections'],
         'vpcId': !(0, runtime_1.exists)(json, 'vpcId') ? undefined : json['vpcId'],
         'batchSubnets': !(0, runtime_1.exists)(json, 'batchSubnets') ? undefined : json['batchSubnets'],
+        'sagemakerSubnets': !(0, runtime_1.exists)(json, 'sagemakerSubnets') ? undefined : json['sagemakerSubnets'],
         'kmsArn': !(0, runtime_1.exists)(json, 'kmsArn') ? undefined : json['kmsArn'],
     };
 }
@@ -74,6 +74,7 @@ function ProjectSettingsToJSON(value) {
         'serviceConnections': value.serviceConnections,
         'vpcId': value.vpcId,
         'batchSubnets': value.batchSubnets,
+        'sagemakerSubnets': value.sagemakerSubnets,
         'kmsArn': value.kmsArn,
     };
 }

package/dist/models/SyncStatus.d.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 /**
- * Status of last sync
+ * Status of the last sync operation
  * @export
  * @enum {string}
  */

package/dist/models/SyncStatus.js

@@ -15,7 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SyncStatusToJSON = exports.SyncStatusFromJSONTyped = exports.SyncStatusFromJSON = exports.SyncStatus = void 0;
 /**
- * Status of last sync
+ * Status of the last sync operation
  * @export
  * @enum {string}
  */

package/dist/models/UserDetail.d.ts

@@ -0,0 +1,80 @@
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import type { UserProjectAssignment } from './UserProjectAssignment';
+/**
+ *
+ * @export
+ * @interface UserDetail
+ */
+export interface UserDetail {
+    /**
+     *
+     * @type {string}
+     * @memberof UserDetail
+     */
+    username: string;
+    /**
+     *
+     * @type {string}
+     * @memberof UserDetail
+     */
+    name: string;
+    /**
+     *
+     * @type {string}
+     * @memberof UserDetail
+     */
+    phone: string;
+    /**
+     *
+     * @type {string}
+     * @memberof UserDetail
+     */
+    email: string;
+    /**
+     *
+     * @type {string}
+     * @memberof UserDetail
+     */
+    organization: string;
+    /**
+     *
+     * @type {string}
+     * @memberof UserDetail
+     */
+    department: string;
+    /**
+     *
+     * @type {string}
+     * @memberof UserDetail
+     */
+    invitedBy: string;
+    /**
+     *
+     * @type {Date}
+     * @memberof UserDetail
+     */
+    signUpTime?: Date | null;
+    /**
+     *
+     * @type {Array<UserProjectAssignment>}
+     * @memberof UserDetail
+     */
+    projectAssignments: Array<UserProjectAssignment>;
+}
+/**
+ * Check if a given object implements the UserDetail interface.
+ */
+export declare function instanceOfUserDetail(value: object): boolean;
+export declare function UserDetailFromJSON(json: any): UserDetail;
+export declare function UserDetailFromJSONTyped(json: any, ignoreDiscriminator: boolean): UserDetail;
+export declare function UserDetailToJSON(value?: UserDetail | null): any;

package/dist/models/UserDetail.js

@@ -0,0 +1,75 @@
+"use strict";
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserDetailToJSON = exports.UserDetailFromJSONTyped = exports.UserDetailFromJSON = exports.instanceOfUserDetail = void 0;
+var runtime_1 = require("../runtime");
+var UserProjectAssignment_1 = require("./UserProjectAssignment");
+/**
+ * Check if a given object implements the UserDetail interface.
+ */
+function instanceOfUserDetail(value) {
+    var isInstance = true;
+    isInstance = isInstance && "username" in value;
+    isInstance = isInstance && "name" in value;
+    isInstance = isInstance && "phone" in value;
+    isInstance = isInstance && "email" in value;
+    isInstance = isInstance && "organization" in value;
+    isInstance = isInstance && "department" in value;
+    isInstance = isInstance && "invitedBy" in value;
+    isInstance = isInstance && "projectAssignments" in value;
+    return isInstance;
+}
+exports.instanceOfUserDetail = instanceOfUserDetail;
+function UserDetailFromJSON(json) {
+    return UserDetailFromJSONTyped(json, false);
+}
+exports.UserDetailFromJSON = UserDetailFromJSON;
+function UserDetailFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'username': json['username'],
+        'name': json['name'],
+        'phone': json['phone'],
+        'email': json['email'],
+        'organization': json['organization'],
+        'department': json['department'],
+        'invitedBy': json['invitedBy'],
+        'signUpTime': !(0, runtime_1.exists)(json, 'signUpTime') ? undefined : (json['signUpTime'] === null ? null : new Date(json['signUpTime'])),
+        'projectAssignments': (json['projectAssignments'].map(UserProjectAssignment_1.UserProjectAssignmentFromJSON)),
+    };
+}
+exports.UserDetailFromJSONTyped = UserDetailFromJSONTyped;
+function UserDetailToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'username': value.username,
+        'name': value.name,
+        'phone': value.phone,
+        'email': value.email,
+        'organization': value.organization,
+        'department': value.department,
+        'invitedBy': value.invitedBy,
+        'signUpTime': value.signUpTime === undefined ? undefined : (value.signUpTime === null ? null : value.signUpTime.toISOString()),
+        'projectAssignments': (value.projectAssignments.map(UserProjectAssignment_1.UserProjectAssignmentToJSON)),
+    };
+}
+exports.UserDetailToJSON = UserDetailToJSON;

package/dist/models/UserProjectAssignment.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+import type { ProjectRole } from './ProjectRole';
+/**
+ *
+ * @export
+ * @interface UserProjectAssignment
+ */
+export interface UserProjectAssignment {
+    /**
+     *
+     * @type {string}
+     * @memberof UserProjectAssignment
+     */
+    projectId: string;
+    /**
+     *
+     * @type {ProjectRole}
+     * @memberof UserProjectAssignment
+     */
+    role: ProjectRole;
+    /**
+     *
+     * @type {string}
+     * @memberof UserProjectAssignment
+     */
+    createdBy: string;
+    /**
+     *
+     * @type {Date}
+     * @memberof UserProjectAssignment
+     */
+    createdAt?: Date | null;
+}
+/**
+ * Check if a given object implements the UserProjectAssignment interface.
+ */
+export declare function instanceOfUserProjectAssignment(value: object): boolean;
+export declare function UserProjectAssignmentFromJSON(json: any): UserProjectAssignment;
+export declare function UserProjectAssignmentFromJSONTyped(json: any, ignoreDiscriminator: boolean): UserProjectAssignment;
+export declare function UserProjectAssignmentToJSON(value?: UserProjectAssignment | null): any;

package/dist/models/UserProjectAssignment.js

@@ -0,0 +1,60 @@
+"use strict";
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserProjectAssignmentToJSON = exports.UserProjectAssignmentFromJSONTyped = exports.UserProjectAssignmentFromJSON = exports.instanceOfUserProjectAssignment = void 0;
+var runtime_1 = require("../runtime");
+var ProjectRole_1 = require("./ProjectRole");
+/**
+ * Check if a given object implements the UserProjectAssignment interface.
+ */
+function instanceOfUserProjectAssignment(value) {
+    var isInstance = true;
+    isInstance = isInstance && "projectId" in value;
+    isInstance = isInstance && "role" in value;
+    isInstance = isInstance && "createdBy" in value;
+    return isInstance;
+}
+exports.instanceOfUserProjectAssignment = instanceOfUserProjectAssignment;
+function UserProjectAssignmentFromJSON(json) {
+    return UserProjectAssignmentFromJSONTyped(json, false);
+}
+exports.UserProjectAssignmentFromJSON = UserProjectAssignmentFromJSON;
+function UserProjectAssignmentFromJSONTyped(json, ignoreDiscriminator) {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        'projectId': json['projectId'],
+        'role': (0, ProjectRole_1.ProjectRoleFromJSON)(json['role']),
+        'createdBy': json['createdBy'],
+        'createdAt': !(0, runtime_1.exists)(json, 'createdAt') ? undefined : (json['createdAt'] === null ? null : new Date(json['createdAt'])),
+    };
+}
+exports.UserProjectAssignmentFromJSONTyped = UserProjectAssignmentFromJSONTyped;
+function UserProjectAssignmentToJSON(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        'projectId': value.projectId,
+        'role': (0, ProjectRole_1.ProjectRoleToJSON)(value.role),
+        'createdBy': value.createdBy,
+        'createdAt': value.createdAt === undefined ? undefined : (value.createdAt === null ? null : value.createdAt.toISOString()),
+    };
+}
+exports.UserProjectAssignmentToJSON = UserProjectAssignmentToJSON;

package/dist/models/index.d.ts

@@ -8,6 +8,7 @@ export * from './BillingAccountRequest';
 export * from './BillingMethod';
 export * from './BudgetPeriod';
 export * from './CloudAccount';
+export * from './CloudAccountType';
 export * from './ColumnDefinition';
 export * from './Contact';
 export * from './CreateNotebookInstanceRequest';
@@ -75,4 +76,6 @@ export * from './UpdateUserRequest';
 export * from './UploadDatasetCreateResponse';
 export * from './UploadDatasetRequest';
 export * from './User';
+export * from './UserDetail';
+export * from './UserProjectAssignment';
 export * from './ValidateFileRequirementsRequest';

package/dist/models/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./BillingAccountRequest"), exports);
 __exportStar(require("./BillingMethod"), exports);
 __exportStar(require("./BudgetPeriod"), exports);
 __exportStar(require("./CloudAccount"), exports);
+__exportStar(require("./CloudAccountType"), exports);
 __exportStar(require("./ColumnDefinition"), exports);
 __exportStar(require("./Contact"), exports);
 __exportStar(require("./CreateNotebookInstanceRequest"), exports);
@@ -93,4 +94,6 @@ __exportStar(require("./UpdateUserRequest"), exports);
 __exportStar(require("./UploadDatasetCreateResponse"), exports);
 __exportStar(require("./UploadDatasetRequest"), exports);
 __exportStar(require("./User"), exports);
+__exportStar(require("./UserDetail"), exports);
+__exportStar(require("./UserProjectAssignment"), exports);
 __exportStar(require("./ValidateFileRequirementsRequest"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cirrobio/api-client",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "API client for Cirro",
   "author": "CirroBio",
   "repository": {

package/src/apis/UsersApi.ts

@@ -19,6 +19,7 @@ import type {
   InviteUserResponse,
   UpdateUserRequest,
   User,
+  UserDetail,
 } from '../models/index';
 import {
     InviteUserRequestFromJSON,
@@ -29,6 +30,8 @@ import {
     UpdateUserRequestToJSON,
     UserFromJSON,
     UserToJSON,
+    UserDetailFromJSON,
+    UserDetailToJSON,
 } from '../models/index';
 
 export interface GetUserRequest {
@@ -43,6 +46,10 @@ export interface InviteUserOperationRequest {
     inviteUserRequest: InviteUserRequest;
 }
 
+export interface SignOutUserRequest {
+    username: string;
+}
+
 export interface UpdateUserOperationRequest {
     username: string;
     updateUserRequest: UpdateUserRequest;
@@ -57,7 +64,7 @@ export class UsersApi extends runtime.BaseAPI {
      * Get user information
      * Get user
      */
-    async getUserRaw(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<User>> {
+    async getUserRaw(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<UserDetail>> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUser.');
         }
@@ -81,14 +88,14 @@ export class UsersApi extends runtime.BaseAPI {
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => UserDetailFromJSON(jsonValue));
     }
 
     /**
      * Get user information
      * Get user
      */
-    async getUser(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<User> {
+    async getUser(requestParameters: GetUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<UserDetail> {
         const response = await this.getUserRaw(requestParameters, initOverrides);
         return await response.value();
     }
@@ -180,6 +187,45 @@ export class UsersApi extends runtime.BaseAPI {
         return await response.value();
     }
 
+    /**
+     * Signs user out from all sessions
+     * Sign out user
+     */
+    async signOutUserRaw(requestParameters: SignOutUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.username === null || requestParameters.username === undefined) {
+            throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling signOutUser.');
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.accessToken) {
+            const token = this.configuration.accessToken;
+            const tokenString = await token("accessToken", []);
+
+            if (tokenString) {
+                headerParameters["Authorization"] = `Bearer ${tokenString}`;
+            }
+        }
+        const response = await this.request({
+            path: `/users/{username}:signOut`.replace(`{${"username"}}`, encodeURIComponent(String(requestParameters.username))),
+            method: 'PUT',
+            headers: headerParameters,
+            query: queryParameters,
+        }, initOverrides);
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+    /**
+     * Signs user out from all sessions
+     * Sign out user
+     */
+    async signOutUser(requestParameters: SignOutUserRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<void> {
+        await this.signOutUserRaw(requestParameters, initOverrides);
+    }
+
     /**
      * Update user information
      * Update user

package/src/models/AuditEvent.ts

@@ -54,13 +54,13 @@ export interface AuditEvent {
      * @type {{ [key: string]: any; }}
      * @memberof AuditEvent
      */
-    eventDetail?: { [key: string]: any; };
+    eventDetail?: { [key: string]: any; } | null;
     /**
      * The changes made to the entity (if applicable)
      * @type {{ [key: string]: string; }}
      * @memberof AuditEvent
      */
-    changes?: { [key: string]: string; };
+    changes?: { [key: string]: string; } | null;
     /**
      * The username of the user who performed the action
      * @type {string}

package/src/models/CloudAccount.ts

@@ -13,6 +13,13 @@
  */
 
 import { exists, mapValues } from '../runtime';
+import type { CloudAccountType } from './CloudAccountType';
+import {
+    CloudAccountTypeFromJSON,
+    CloudAccountTypeFromJSONTyped,
+    CloudAccountTypeToJSON,
+} from './CloudAccountType';
+
 /**
  * 
  * @export
@@ -32,11 +39,17 @@ export interface CloudAccount {
      */
     accountName?: string;
     /**
-     * AWS Region Code
+     * AWS Region Code (defaults to region of Cirro app)
      * @type {string}
      * @memberof CloudAccount
      */
     regionName?: string;
+    /**
+     * 
+     * @type {CloudAccountType}
+     * @memberof CloudAccount
+     */
+    accountType: CloudAccountType;
 }
 
 /**
@@ -44,6 +57,7 @@ export interface CloudAccount {
  */
 export function instanceOfCloudAccount(value: object): boolean {
     let isInstance = true;
+    isInstance = isInstance && "accountType" in value;
 
     return isInstance;
 }
@@ -61,6 +75,7 @@ export function CloudAccountFromJSONTyped(json: any, ignoreDiscriminator: boolea
         'accountId': !exists(json, 'accountId') ? undefined : json['accountId'],
         'accountName': !exists(json, 'accountName') ? undefined : json['accountName'],
         'regionName': !exists(json, 'regionName') ? undefined : json['regionName'],
+        'accountType': CloudAccountTypeFromJSON(json['accountType']),
     };
 }
 
@@ -76,6 +91,7 @@ export function CloudAccountToJSON(value?: CloudAccount | null): any {
         'accountId': value.accountId,
         'accountName': value.accountName,
         'regionName': value.regionName,
+        'accountType': CloudAccountTypeToJSON(value.accountType),
     };
 }
 

package/src/models/CloudAccountType.ts

@@ -0,0 +1,37 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/**
+ * Type of cloud account (Hosted by Cirro, or Bring your own account)
+ * @export
+ * @enum {string}
+ */
+export enum CloudAccountType {
+    Hosted = 'HOSTED',
+    Byoa = 'BYOA'
+}
+
+
+export function CloudAccountTypeFromJSON(json: any): CloudAccountType {
+    return CloudAccountTypeFromJSONTyped(json, false);
+}
+
+export function CloudAccountTypeFromJSONTyped(json: any, ignoreDiscriminator: boolean): CloudAccountType {
+    return json as CloudAccountType;
+}
+
+export function CloudAccountTypeToJSON(value?: CloudAccountType | null): any {
+    return value as any;
+}
+

package/src/models/ProjectSettings.ts

@@ -87,11 +87,11 @@ export interface ProjectSettings {
      */
     retentionPolicyDays?: number;
     /**
-     * 
+     * List of service connections to enable
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
-    serviceConnections: Array<string>;
+    serviceConnections?: Array<string>;
     /**
      * VPC that the compute environment will use
      * @type {string}
@@ -99,11 +99,17 @@ export interface ProjectSettings {
      */
     vpcId?: string | null;
     /**
-     * 
+     * List of subnets that the compute environment will use
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
     batchSubnets?: Array<string> | null;
+    /**
+     * List of subnets that the sagemaker instances will use
+     * @type {Array<string>}
+     * @memberof ProjectSettings
+     */
+    sagemakerSubnets?: Array<string> | null;
     /**
      * KMS Key ARN to encrypt S3 objects, if not provided, default bucket encryption will be used
      * @type {string}
@@ -119,7 +125,6 @@ export function instanceOfProjectSettings(value: object): boolean {
     let isInstance = true;
     isInstance = isInstance && "budgetAmount" in value;
     isInstance = isInstance && "budgetPeriod" in value;
-    isInstance = isInstance && "serviceConnections" in value;
 
     return isInstance;
 }
@@ -144,9 +149,10 @@ export function ProjectSettingsFromJSONTyped(json: any, ignoreDiscriminator: boo
         'maxF1VCPU': !exists(json, 'maxF1VCPU') ? undefined : json['maxF1VCPU'],
         'maxSpotVCPU': !exists(json, 'maxSpotVCPU') ? undefined : json['maxSpotVCPU'],
         'retentionPolicyDays': !exists(json, 'retentionPolicyDays') ? undefined : json['retentionPolicyDays'],
-        'serviceConnections': json['serviceConnections'],
+        'serviceConnections': !exists(json, 'serviceConnections') ? undefined : json['serviceConnections'],
         'vpcId': !exists(json, 'vpcId') ? undefined : json['vpcId'],
         'batchSubnets': !exists(json, 'batchSubnets') ? undefined : json['batchSubnets'],
+        'sagemakerSubnets': !exists(json, 'sagemakerSubnets') ? undefined : json['sagemakerSubnets'],
         'kmsArn': !exists(json, 'kmsArn') ? undefined : json['kmsArn'],
     };
 }
@@ -173,6 +179,7 @@ export function ProjectSettingsToJSON(value?: ProjectSettings | null): any {
         'serviceConnections': value.serviceConnections,
         'vpcId': value.vpcId,
         'batchSubnets': value.batchSubnets,
+        'sagemakerSubnets': value.sagemakerSubnets,
         'kmsArn': value.kmsArn,
     };
 }

package/src/models/SyncStatus.ts

@@ -13,7 +13,7 @@
  */
 
 /**
- * Status of last sync
+ * Status of the last sync operation
  * @export
  * @enum {string}
  */

package/src/models/UserDetail.ts

@@ -0,0 +1,144 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import type { UserProjectAssignment } from './UserProjectAssignment';
+import {
+    UserProjectAssignmentFromJSON,
+    UserProjectAssignmentFromJSONTyped,
+    UserProjectAssignmentToJSON,
+} from './UserProjectAssignment';
+
+/**
+ * 
+ * @export
+ * @interface UserDetail
+ */
+export interface UserDetail {
+    /**
+     * 
+     * @type {string}
+     * @memberof UserDetail
+     */
+    username: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserDetail
+     */
+    name: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserDetail
+     */
+    phone: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserDetail
+     */
+    email: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserDetail
+     */
+    organization: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserDetail
+     */
+    department: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserDetail
+     */
+    invitedBy: string;
+    /**
+     * 
+     * @type {Date}
+     * @memberof UserDetail
+     */
+    signUpTime?: Date | null;
+    /**
+     * 
+     * @type {Array<UserProjectAssignment>}
+     * @memberof UserDetail
+     */
+    projectAssignments: Array<UserProjectAssignment>;
+}
+
+/**
+ * Check if a given object implements the UserDetail interface.
+ */
+export function instanceOfUserDetail(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "username" in value;
+    isInstance = isInstance && "name" in value;
+    isInstance = isInstance && "phone" in value;
+    isInstance = isInstance && "email" in value;
+    isInstance = isInstance && "organization" in value;
+    isInstance = isInstance && "department" in value;
+    isInstance = isInstance && "invitedBy" in value;
+    isInstance = isInstance && "projectAssignments" in value;
+
+    return isInstance;
+}
+
+export function UserDetailFromJSON(json: any): UserDetail {
+    return UserDetailFromJSONTyped(json, false);
+}
+
+export function UserDetailFromJSONTyped(json: any, ignoreDiscriminator: boolean): UserDetail {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'username': json['username'],
+        'name': json['name'],
+        'phone': json['phone'],
+        'email': json['email'],
+        'organization': json['organization'],
+        'department': json['department'],
+        'invitedBy': json['invitedBy'],
+        'signUpTime': !exists(json, 'signUpTime') ? undefined : (json['signUpTime'] === null ? null : new Date(json['signUpTime'])),
+        'projectAssignments': ((json['projectAssignments'] as Array<any>).map(UserProjectAssignmentFromJSON)),
+    };
+}
+
+export function UserDetailToJSON(value?: UserDetail | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'username': value.username,
+        'name': value.name,
+        'phone': value.phone,
+        'email': value.email,
+        'organization': value.organization,
+        'department': value.department,
+        'invitedBy': value.invitedBy,
+        'signUpTime': value.signUpTime === undefined ? undefined : (value.signUpTime === null ? null : value.signUpTime.toISOString()),
+        'projectAssignments': ((value.projectAssignments as Array<any>).map(UserProjectAssignmentToJSON)),
+    };
+}
+

package/src/models/UserProjectAssignment.ts

@@ -0,0 +1,99 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import type { ProjectRole } from './ProjectRole';
+import {
+    ProjectRoleFromJSON,
+    ProjectRoleFromJSONTyped,
+    ProjectRoleToJSON,
+} from './ProjectRole';
+
+/**
+ * 
+ * @export
+ * @interface UserProjectAssignment
+ */
+export interface UserProjectAssignment {
+    /**
+     * 
+     * @type {string}
+     * @memberof UserProjectAssignment
+     */
+    projectId: string;
+    /**
+     * 
+     * @type {ProjectRole}
+     * @memberof UserProjectAssignment
+     */
+    role: ProjectRole;
+    /**
+     * 
+     * @type {string}
+     * @memberof UserProjectAssignment
+     */
+    createdBy: string;
+    /**
+     * 
+     * @type {Date}
+     * @memberof UserProjectAssignment
+     */
+    createdAt?: Date | null;
+}
+
+/**
+ * Check if a given object implements the UserProjectAssignment interface.
+ */
+export function instanceOfUserProjectAssignment(value: object): boolean {
+    let isInstance = true;
+    isInstance = isInstance && "projectId" in value;
+    isInstance = isInstance && "role" in value;
+    isInstance = isInstance && "createdBy" in value;
+
+    return isInstance;
+}
+
+export function UserProjectAssignmentFromJSON(json: any): UserProjectAssignment {
+    return UserProjectAssignmentFromJSONTyped(json, false);
+}
+
+export function UserProjectAssignmentFromJSONTyped(json: any, ignoreDiscriminator: boolean): UserProjectAssignment {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'projectId': json['projectId'],
+        'role': ProjectRoleFromJSON(json['role']),
+        'createdBy': json['createdBy'],
+        'createdAt': !exists(json, 'createdAt') ? undefined : (json['createdAt'] === null ? null : new Date(json['createdAt'])),
+    };
+}
+
+export function UserProjectAssignmentToJSON(value?: UserProjectAssignment | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'projectId': value.projectId,
+        'role': ProjectRoleToJSON(value.role),
+        'createdBy': value.createdBy,
+        'createdAt': value.createdAt === undefined ? undefined : (value.createdAt === null ? null : value.createdAt.toISOString()),
+    };
+}
+

package/src/models/index.ts

@@ -10,6 +10,7 @@ export * from './BillingAccountRequest';
 export * from './BillingMethod';
 export * from './BudgetPeriod';
 export * from './CloudAccount';
+export * from './CloudAccountType';
 export * from './ColumnDefinition';
 export * from './Contact';
 export * from './CreateNotebookInstanceRequest';
@@ -77,4 +78,6 @@ export * from './UpdateUserRequest';
 export * from './UploadDatasetCreateResponse';
 export * from './UploadDatasetRequest';
 export * from './User';
+export * from './UserDetail';
+export * from './UserProjectAssignment';
 export * from './ValidateFileRequirementsRequest';