@api-client/core 0.10.13 → 0.11.1

package/src/runtime/store/FilesSdk.ts

@@ -1,32 +1,33 @@
-import { 
-  SdkBase, 
-  E_RESPONSE_STATUS, E_RESPONSE_NO_VALUE, E_INVALID_JSON, E_RESPONSE_UNKNOWN, 
-  ISdkRequestOptions, E_RESPONSE_LOCATION } from './SdkBase.js';
-import { RouteBuilder } from './RouteBuilder.js';
-import { IUser } from '../../models/store/User.js';
-import { FileBreadcrumb, IFile } from '../../models/store/File.js';
-import { FolderKind, CertificateFileKind, DataNamespaceKind, ProjectKind } from '../../models/kinds.js';
-import { SdkError } from './Errors.js';
-import { 
-  ContextListResult, 
-  IPatchInfo, 
-  IPatchRevision, 
-  IAccessPatchInfo, 
-  ContextChangeRecord, 
-  IBulkOperationResult, 
+import {
+  SdkBase,
+  E_RESPONSE_STATUS,
+  E_RESPONSE_NO_VALUE,
+  E_INVALID_JSON,
+  E_RESPONSE_UNKNOWN,
+  SdkOptions,
+} from './SdkBase.js'
+import { RouteBuilder } from './RouteBuilder.js'
+import { IUser } from '../../models/store/User.js'
+import { FileBreadcrumb, IFile } from '../../models/store/File.js'
+import { FolderKind, CertificateFileKind, DataNamespaceKind, ProjectKind } from '../../models/kinds.js'
+import { SdkError } from './Errors.js'
+import {
+  ContextListResult,
+  ContextChangeRecord,
+  IBulkOperationResult,
   ContextListOptions,
-} from '../../events/BaseEvents.js';
-import { 
-  IAccessAddOperation, IAccessRemoveOperation, PermissionRole 
-} from '../..//models/store/Permission.js';
-import uuid from '../../lib/uuid.js';
+} from '../../events/BaseEvents.js'
+import { IAccessAddOperation, IAccessRemoveOperation, PermissionRole } from '../../models/store/Permission.js'
+import uuid from '../../lib/uuid.js'
+import { Folder, type IFolder } from '../../models/Folder.js'
+import type { AccessPatchInfo, MediaPatchInfo, MediaPatchRevision, PatchInfo } from '../../patch/types.js'
 
 export interface IMetaCreateOptions {
   /**
    * Optional parent file id.
    * When set it creates a file under this parent.
    */
-  parent?: string;
+  parent?: string
 }
 
 export interface IMediaCreateOptions {
@@ -34,493 +35,620 @@ export interface IMediaCreateOptions {
    * Optional contents mime type.
    * Default to `application/json`.
    */
-  mime?: string;
+  mime?: string
 }
 
-export interface IFileCreateOptions extends IMetaCreateOptions, IMediaCreateOptions {
+export interface IFileCreateOptions extends IMetaCreateOptions, IMediaCreateOptions {}
 
-}
-
-export type ListFileKind = typeof ProjectKind | typeof FolderKind | typeof DataNamespaceKind | typeof CertificateFileKind;
+export type ListFileKind =
+  | typeof ProjectKind
+  | typeof FolderKind
+  | typeof DataNamespaceKind
+  | typeof CertificateFileKind
 
 /**
  * In the store, the file is represented by the meta and the media.
- * 
- * The meta is used to represent the file in the UI when listing files or presenting their metadata (like name, last modified, etc).
+ *
+ * The meta is used to represent the file in the UI when listing files
+ * or presenting their metadata (like name, last modified, etc).
  * The media is the actual contents of the file and is only used by application specializing in this file modification.
  */
 export class FilesSdk extends SdkBase {
   /**
-   * Lists files (spaces, projects, etc) in the store.
-   * 
-   * @param space the parent space for files.
-   * @param kinds Optional list of kinds to limit the file types in the result. Spaces are always included.
+   * Lists files (organizations, projects, etc) in the store.
+   *
+   * @param organization the parent organization for files.
+   * @param kinds Optional list of kinds to limit the file types in the result. organizations are always included.
    * @param options Optional query options.
    * @param request Optional request options.
    */
-  async list(space: string, kinds?: ListFileKind[], options?: ContextListOptions, request: ISdkRequestOptions = {}): Promise<ContextListResult<IFile>> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.files(space));
-    this.sdk.appendListOptions(url, options);
-    if (Array.isArray(kinds)) {
-      kinds.forEach(k => url.searchParams.append('kind', k));
-    }
-    const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to list files. ';
+  async list(
+    organization: string,
+    kinds?: ListFileKind[],
+    options: ContextListOptions = {},
+    request: SdkOptions = {}
+  ): Promise<ContextListResult<IFile>> {
+    const { token } = request
+    const opts = { ...options }
+    const url = this.sdk.getUrl(RouteBuilder.files(organization))
+    if (kinds && kinds.length) {
+      opts.kinds = kinds
+    }
+    this.sdk.appendListOptions(url, opts)
+    const result = await this.sdk.http.get(url.toString(), { token })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to list files. '
     if (result.status !== 200) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
     }
-    let data: ContextListResult<IFile>;
+    let data: ContextListResult<IFile>
     try {
-      data = JSON.parse(result.body);
-    } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
     }
     if (!Array.isArray(data.items)) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
     }
-    return data;
+    return data
   }
 
   /**
    * Creates both the meta and the media for a file.
-   * 
+   *
    * @param meta The file meta
    * @param contents The file contents
-   * @param opts Meta and media create options. 
+   * @param opts Meta and media create options.
    * @param request Optional request details
    * @returns The id of the created file meta.
    */
-  async create(meta: IFile, contents: unknown, space: string, opts: IFileCreateOptions = {}, request: ISdkRequestOptions = {}): Promise<ContextChangeRecord<IFile>> {
-    const result = await this.createMeta(meta, space, opts, request);
-    await this.createMedia(contents, space, result.key, opts, request);
-    return result;
+  async create(
+    meta: IFile,
+    contents: unknown,
+    organization: string,
+    opts: IFileCreateOptions = {},
+    request: SdkOptions = {}
+  ): Promise<ContextChangeRecord<IFile>> {
+    const result = await this.createMeta(meta, organization, opts, request)
+    await this.createMedia(contents, organization, result.key, opts, request)
+    return result
   }
 
   /**
    * Creates a file in the store.
-   * 
+   *
    * @param file The definition of a file that extends the IFile interface.
    * @param opts Optional options when creating a file
    * @param request Optional request options.
    * @returns The key of the creates file.
    */
-  async createMeta(file: IFile, space: string, opts: IMetaCreateOptions = {}, request: ISdkRequestOptions = {}): Promise<ContextChangeRecord<IFile>> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.files(space));
+  async createMeta(
+    file: IFile,
+    organization: string,
+    opts: IMetaCreateOptions = {},
+    request: SdkOptions = {}
+  ): Promise<ContextChangeRecord<IFile>> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.files(organization))
     if (opts.parent) {
-      url.searchParams.set('parent', opts.parent);
+      url.searchParams.set('parent', opts.parent)
     }
-    const body = JSON.stringify(file);
-    const result = await this.sdk.http.post(url.toString(), { 
-      token, 
+    const body = JSON.stringify(file)
+    const result = await this.sdk.http.post(url.toString(), {
+      token,
       body,
       headers: {
-        'content-type': 'application/json'
+        'content-type': 'application/json',
       },
-    });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to create a file. ';
-    if (result.status !== 200) {
-      this.logInvalidResponse(result);
+    })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to create a file. '
+    if (result.status !== 201) {
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
-    
+
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
     }
-    let data: ContextChangeRecord<IFile>;
+    let data: ContextChangeRecord<IFile>
     try {
-      data = JSON.parse(result.body);
-    } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
     }
     if (!data.key) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
     }
-    return data;
+    return data
   }
 
   /**
    * Creates a file contents (the media) after the file meta was created.
-   * 
+   *
    * @param contents The file contents to upload to the server.
    * @param key The created file meta key.
    * @param opts Contents create options. You can define content's mime type here.
    * @param request Optional request.
    */
-  async createMedia(contents: unknown, space: string, key: string, opts: IMediaCreateOptions = {}, request: ISdkRequestOptions = {}): Promise<void> {
-    const token = request.token || this.sdk.token;
-    const path = RouteBuilder.file(space, key);
-    const url = this.sdk.getUrl(path);
-    url.searchParams.set('alt', 'media');
-    const mime = opts.mime || 'application/json';
-    let body: string;
+  async createMedia(
+    contents: unknown,
+    organization: string,
+    key: string,
+    opts: IMediaCreateOptions = {},
+    request: SdkOptions = {}
+  ): Promise<void> {
+    const { token } = request
+    const path = RouteBuilder.fileMedia(organization, key)
+    const url = this.sdk.getUrl(path)
+    const mime = opts.mime || 'application/json'
+    let body: string
     if (mime.includes('json')) {
-      body = JSON.stringify(contents);
+      body = JSON.stringify(contents)
     } else {
-      body = String(contents);
+      body = String(contents)
     }
-    const result = await this.sdk.http.put(url.toString(), { 
-      token, 
+    const result = await this.sdk.http.put(url.toString(), {
+      token,
       body,
       headers: {
-        'content-type': mime
+        'content-type': mime,
       },
-    });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to create a file. ';
-    if (result.status !== 204) {
-      this.logInvalidResponse(result);
+    })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to create a file. '
+    if (result.status !== 200) {
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
   }
 
-  /**
-   * Reads file metadata from the store.
-   * 
-   * @param key The file key
-   * @param request Optional request options.
-   * @returns THe file metadata
-   */
-  read(space: string, key: string, media: false, request?: ISdkRequestOptions): Promise<IFile>;
+  async createFolder(
+    name: string,
+    organization: string,
+    opts: IMetaCreateOptions = {},
+    request: SdkOptions = {}
+  ): Promise<IFolder> {
+    const file = Folder.fromName(name, organization)
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.files(organization))
+    if (opts.parent) {
+      url.searchParams.set('parent', opts.parent)
+    }
+    const body = JSON.stringify(file)
+    const result = await this.sdk.http.post(url.toString(), {
+      token,
+      body,
+      headers: {
+        'content-type': 'application/json',
+      },
+    })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to create a file. '
+    if (result.status !== 201) {
+      this.logInvalidResponse(result)
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
+      }
+      throw e
+    }
 
-  /**
-   * Reads file contents from the store.
-   * 
-   * @param key The file key
-   * @param request Optional request options.
-   * @returns THe file contents
-   */
-  read(space: string, key: string, media: true, request?: ISdkRequestOptions): Promise<unknown>;
+    if (!result.body) {
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
+    }
+    let data: IFolder
+    try {
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
+    }
+    if (!data.key) {
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
+    }
+    return data
+  }
 
   /**
-   * Reads a user file definition from the store.
-   * @param key The file key
-   * @param media When true it reads file contents rather than metadata.
+   * Reads a file from the store.
+   *
+   * @param oid Organization ID.
+   * @param fid The file key
    * @param request Optional request options.
    */
-  async read(space: string, key: string, media?: boolean, request: ISdkRequestOptions = {}): Promise<IFile | unknown> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.file(space, key));
-    if (media) {
-      url.searchParams.set('alt', 'media');
-    }
-    const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to read a file. ';
+  async read(oid: string, fid: string, request: SdkOptions = {}): Promise<IFile> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.file(oid, fid))
+    const result = await this.sdk.http.get(url.toString(), { token })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to read a file. '
     if (result.status !== 200) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
     }
-    let data: IFile;
+    let data: IFile
     try {
-      data = JSON.parse(result.body);
-    } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
+    }
+    if (!data.kind) {
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
     }
-    if (!media) {
-      if (!data.kind) {
-        throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+    return data
+  }
+
+  async readMedia(oid: string, fid: string, request: SdkOptions = {}): Promise<{ media: unknown; version: number }> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.fileMedia(oid, fid))
+    const result = await this.sdk.http.get(url.toString(), { token })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to read a file media. '
+    if (result.status !== 200) {
+      this.logInvalidResponse(result)
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
+      throw e
+    }
+    if (!result.body) {
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
+    }
+    let data: unknown
+    try {
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
+    }
+    const versionStr = result.headers.get('x-version')
+    if (!versionStr) {
+      throw new Error(`${E_PREFIX}The file media version was not sent by the server.`)
+    }
+    const version = Number(versionStr)
+    if (isNaN(version)) {
+      throw new Error(`${E_PREFIX}The file media version is not a number.`)
+    }
+    return {
+      media: data,
+      version,
     }
-    return data;
   }
 
   /**
    * Reads a number of files in a bulk operation.
-   * 
-   * @param keys The list of keys to read. When the user has no access to the file it returns undefined 
+   *
+   * @param keys The list of keys to read. When the user has no access to the file it returns undefined
    * in that place. It also inserts `undefined` in place of a file that doesn't exist.
    * @param request Optional request options.
    */
-  async readBulk(space: string, keys: string[], request: ISdkRequestOptions = {}): Promise<IBulkOperationResult<IFile>> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.filesBatch(space));
-    const body = JSON.stringify(keys);
-    const result = await this.sdk.http.post(url.toString(), { token, body });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to read files in bulk. ';
+  async readBulk(organization: string, keys: string[], request: SdkOptions = {}): Promise<IBulkOperationResult<IFile>> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.filesBatch(organization))
+    const body = JSON.stringify(keys)
+    const result = await this.sdk.http.post(url.toString(), { token, body })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to read files in bulk. '
     if (result.status !== 200) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
     }
-    let data: IBulkOperationResult<IFile>;
+    let data: IBulkOperationResult<IFile>
     try {
-      data = JSON.parse(result.body);
-    } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
     }
     if (!Array.isArray(data.items)) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
     }
-    return data;
+    return data
   }
 
   /**
-   * Patches file's meta in the store.
-   * 
-   * @param key The file key
-   * @param value The patch to apply.
-   * @param request Optional request options.
-   */
-  patch(space: string, key: string, value: IPatchInfo, media: false, request?: ISdkRequestOptions): Promise<IPatchRevision>;
-
-  /**
-   * Patches file's content in the store.
-   * 
-   * @param key The file key
-   * @param value The patch to apply.
+   * Patches a file in the store.
+   * @param fid The key of the file to patch
+   * @param info The JSON patch to be processed.
    * @param request Optional request options.
+   * @returns The updated file object after applying the patch
    */
-  patch(space: string, key: string, value: IPatchInfo, media: true, request?: ISdkRequestOptions): Promise<IPatchRevision>;
+  async patch(oid: string, fid: string, info: PatchInfo, request: SdkOptions = {}): Promise<IFile> {
+    const { token } = request
+    const path = RouteBuilder.file(oid, fid)
+    const url = this.sdk.getUrl(path)
+    const body = JSON.stringify(info)
+    const result = await this.sdk.http.patch(url.toString(), { token, body })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to patch a file. '
+    if (result.status !== 200) {
+      this.logInvalidResponse(result)
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
+      }
+      throw e
+    }
+    if (!result.body) {
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
+    }
+    let data: IFile
+    try {
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
+    }
+    if (!data.kind) {
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
+    }
+    return data
+  }
 
   /**
-   * Patches a file in the store.
-   * @param key The key of the file to patch
-   * @param value The JSON patch to be processed.
-   * @param request Optional request options.
-   * @returns The JSON patch to revert the change using the `@api-client/json` library
+   * Patches file media.
+   * @param oid Organization id
+   * @param fid File id
+   * @param info THe patch to send
+   * @param req Optional request
+   * @returns The server response.
    */
-  async patch(space: string, key: string, value: IPatchInfo, media?: boolean, request: ISdkRequestOptions = {}): Promise<IPatchRevision> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.file(space, key));
-    if (media) {
-      url.searchParams.set('alt', 'media');
-    }
-    const body = JSON.stringify(value);
-    const result = await this.sdk.http.patch(url.toString(), { token, body });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to patch a file. ';
+  async patchMedia(oid: string, fid: string, info: MediaPatchInfo, req: SdkOptions = {}): Promise<MediaPatchRevision> {
+    const { token } = req
+    const path = RouteBuilder.fileMedia(oid, fid)
+    const url = this.sdk.getUrl(path)
+    const body = JSON.stringify(info)
+    const result = await this.sdk.http.patch(url.toString(), { token, body })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to patch a file contents. '
     if (result.status !== 200) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
     }
-    let data: IPatchRevision;
+    let data: MediaPatchRevision
     try {
-      data = JSON.parse(result.body);
-    } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
-    }
-    // revert is added to the response
-    if (!data.revert) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
     }
-    return data;
+    return data
   }
 
   /**
    * Deletes the file in the store.
-   * 
-   * @param key The key of the file to delete.
+   *
+   * @param fid The key of the file to delete.
    * @param request Optional request options.
    * @returns The key of the created trash entry.
    */
-  async delete(space: string, key: string, request: ISdkRequestOptions = {}): Promise<string> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.file(space, key));
-    const result = await this.sdk.http.delete(url.toString(), { token });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to delete a file. ';
+  async delete(oid: string, fid: string, request: SdkOptions = {}): Promise<void> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.file(oid, fid))
+    const result = await this.sdk.http.delete(url.toString(), { token })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to trash a file. '
     if (result.status !== 204) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
-    const loc = result.headers.get('location');
-    if (!loc) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_LOCATION}`);
+  }
+
+  async deleteBulk(oid: string, fids: string[], request: SdkOptions = {}): Promise<void> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.files(oid))
+    const result = await this.sdk.http.delete(url.toString(), { token, body: JSON.stringify({ ids: fids }) })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to trash files. '
+    if (result.status !== 204) {
+      this.logInvalidResponse(result)
+      let e = this.createGenericSdkError(result.body)
+      if (!e) {
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
+      }
+      throw e
     }
-    return loc.replace(`${RouteBuilder.trash(space)}/`, '');
   }
 
   /**
    * Updates the sharing options of the file.
-   * 
-   * @param space The parent space key
-   * @param key The file key
-   * @param value The patch operation on the file's ACL
+   *
+   * @param oid The parent organization key
+   * @param fid The file key
+   * @param info The patch operation on the file's ACL
    * @param request Optional request options.
    */
-  async patchUsers(space: string, key: string, value: IAccessPatchInfo, request: ISdkRequestOptions = {}): Promise<void> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.fileUsers(space, key));
-    const body = JSON.stringify(value);
-    const result = await this.sdk.http.patch(url.toString(), { token, body });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to patch the file. ';
+  async patchUsers(oid: string, fid: string, info: AccessPatchInfo, request: SdkOptions = {}): Promise<void> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.fileUsers(oid, fid))
+    const body = JSON.stringify(info)
+    const result = await this.sdk.http.patch(url.toString(), { token, body })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to patch the file. '
     if (result.status !== 204) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
   }
 
   /**
    * A shorthand method to add access to the file to a single user.
-   * 
-   * @param space The parent space key
+   *
+   * @param organization The parent organization key
    * @param key The file key
-   * @param otherUserKey The key of the user that gets access to the space
+   * @param otherUserKey The key of the user that gets access to the organization
    * @param role The user role to grant
    * @param expires Optionally, when the permission expires.
    */
-  async addUser(space: string, key: string, otherUserKey: string, role: PermissionRole, expires?: number, request?: ISdkRequestOptions): Promise<void> {
+  async addUser(
+    organization: string,
+    key: string,
+    otherUserKey: string,
+    role: PermissionRole,
+    expires?: number,
+    request?: SdkOptions
+  ): Promise<void> {
     const op: IAccessAddOperation = {
       op: 'add',
       type: 'user',
       value: role,
       id: otherUserKey,
-    };
+    }
     if (typeof expires === 'number') {
-      op.expirationTime = expires;
+      op.expirationTime = expires
     }
-    const patch: IAccessPatchInfo = {
+    const patch: AccessPatchInfo = {
       patch: [op],
       id: uuid(),
-    };
-    return this.patchUsers(space, key, patch, request);
+    }
+    return this.patchUsers(organization, key, patch, request)
   }
 
   /**
-   * A shorthand method to remove access to the space to a single user.
-   * 
-   * @param space The space key to share
+   * A shorthand method to remove access to the organization to a single user.
+   *
+   * @param organization The organization key to share
    * @param key The file key
-   * @param otherUserKey The key of the user that gets access to the space
+   * @param otherUserKey The key of the user that gets access to the organization
    */
-  async removeUser(space: string, key: string, otherUserKey: string, request?: ISdkRequestOptions): Promise<void> {
+  async removeUser(organization: string, key: string, otherUserKey: string, request?: SdkOptions): Promise<void> {
     const op: IAccessRemoveOperation = {
       op: 'remove',
       type: 'user',
       id: otherUserKey,
-    };
-    const patch: IAccessPatchInfo = {
+    }
+    const patch: AccessPatchInfo = {
       patch: [op],
       id: uuid(),
-    };
-    return this.patchUsers(space, key, patch, request);
+    }
+    return this.patchUsers(organization, key, patch, request)
   }
 
   /**
    * Lists uses having access to the file.
-   * 
+   *
    * @param key The file key
    * @param request Optional request options.
    */
-  async listUsers(space: string, key: string, request: ISdkRequestOptions = {}): Promise<ContextListResult<IUser>> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.fileUsers(space, key));
-    const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to list users in the file. ';
+  async listUsers(organization: string, key: string, request: SdkOptions = {}): Promise<ContextListResult<IUser>> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.fileUsers(organization, key))
+    const result = await this.sdk.http.get(url.toString(), { token })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to list users in the file. '
     if (result.status !== 200) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
     }
-    let data: ContextListResult<IUser>;
+    let data: ContextListResult<IUser>
     try {
-      data = JSON.parse(result.body);
-    } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
     }
     if (!Array.isArray(data.items)) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
     }
-    return data;
+    return data
   }
 
   /**
    * Lists breadcrumbs to the file.
    * @param key The lowest file in the hierarchy
    */
-  async breadcrumbs(space: string, key: string, request: ISdkRequestOptions = {}): Promise<ContextListResult<FileBreadcrumb>> {
-    const token = request.token || this.sdk.token;
-    const url = this.sdk.getUrl(RouteBuilder.fileBreadcrumbs(space, key));
-    const result = await this.sdk.http.get(url.toString(), { token });
-    this.inspectCommonStatusCodes(result);
-    const E_PREFIX = 'Unable to read a file. ';
+  async breadcrumbs(
+    organization: string,
+    key: string,
+    request: SdkOptions = {}
+  ): Promise<ContextListResult<FileBreadcrumb>> {
+    const { token } = request
+    const url = this.sdk.getUrl(RouteBuilder.fileBreadcrumbs(organization, key))
+    const result = await this.sdk.http.get(url.toString(), { token })
+    this.inspectCommonStatusCodes(result)
+    const E_PREFIX = 'Unable to read a file. '
     if (result.status !== 200) {
-      this.logInvalidResponse(result);
+      this.logInvalidResponse(result)
       let e = this.createGenericSdkError(result.body)
       if (!e) {
-        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status);
-        e.response = result.body;
+        e = new SdkError(`${E_PREFIX}${E_RESPONSE_STATUS}${result.status}`, result.status)
+        e.response = result.body
       }
-      throw e;
+      throw e
     }
     if (!result.body) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_NO_VALUE}`)
     }
-    let data: ContextListResult<FileBreadcrumb>;
+    let data: ContextListResult<FileBreadcrumb>
     try {
-      data = JSON.parse(result.body);
-    } catch (e) {
-      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`);
+      data = JSON.parse(result.body)
+    } catch {
+      throw new Error(`${E_PREFIX}${E_INVALID_JSON}.`)
     }
     if (!Array.isArray(data.items)) {
-      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`);
+      throw new Error(`${E_PREFIX}${E_RESPONSE_UNKNOWN}.`)
     }
-    return data;
+    return data
   }
 }