@or-sdk/files 0.20.1-createfilespackage.2 → 0.20.1-createfilespackage.20

package/dist/cjs/Files.js

@@ -70,18 +70,21 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Files = void 0;
+var axios_1 = __importDefault(require("axios"));
 var base_1 = require("@or-sdk/base");
 var constants_1 = require("./constants");
 var Files = (function (_super) {
     __extends(Files, _super);
     function Files(params) {
-        var token = params.token, discoveryUrl = params.discoveryUrl, accountId = params.accountId, serviceUrl = params.serviceUrl;
+        var token = params.token, discoveryUrl = params.discoveryUrl, serviceUrl = params.serviceUrl;
         return _super.call(this, {
             token: token,
             discoveryUrl: discoveryUrl,
-            accountId: accountId,
             serviceUrl: serviceUrl,
             serviceKey: constants_1.SERVICE_KEY,
         }) || this;
@@ -92,7 +95,7 @@ var Files = (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.callApi({
-                            method: 'GET',
+                            method: 'get',
                             route: 'api/folder',
                             params: { key: key },
                         })];
@@ -103,7 +106,7 @@ var Files = (function (_super) {
             });
         });
     };
-    Files.prototype.getItemsList = function (isPublic, prefix) {
+    Files.prototype.getItemsList = function (isPublic, treePrefix) {
         return __awaiter(this, void 0, void 0, function () {
             var nextToken, totalItems, queryParams, _a, items, nextTokenResponse;
             return __generator(this, function (_b) {
@@ -115,7 +118,7 @@ var Files = (function (_super) {
                     case 1:
                         queryParams = {
                             isPublic: isPublic,
-                            prefix: prefix,
+                            prefix: treePrefix,
                         };
                         if (nextToken)
                             queryParams.nextToken = nextToken;
@@ -137,6 +140,40 @@ var Files = (function (_super) {
             });
         });
     };
+    Files.prototype.search = function (isPublic, term) {
+        return __awaiter(this, void 0, void 0, function () {
+            var nextToken, totalItems, queryParams, _a, files, nextTokenResponse;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        nextToken = null;
+                        totalItems = [];
+                        _b.label = 1;
+                    case 1:
+                        queryParams = {
+                            isPublic: isPublic,
+                            term: term,
+                        };
+                        if (nextToken)
+                            queryParams.nextToken = nextToken;
+                        return [4, this.callApi({
+                                method: 'GET',
+                                route: 'api/files/search',
+                                params: queryParams,
+                            })];
+                    case 2:
+                        _a = _b.sent(), files = _a.files, nextTokenResponse = _a.nextTokenResponse;
+                        totalItems = __spreadArray(__spreadArray([], totalItems, true), files, true);
+                        nextToken = nextTokenResponse;
+                        _b.label = 3;
+                    case 3:
+                        if (nextToken) return [3, 1];
+                        _b.label = 4;
+                    case 4: return [2, totalItems];
+                }
+            });
+        });
+    };
     Files.prototype.createFolder = function (folderName) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -144,7 +181,7 @@ var Files = (function (_super) {
                     case 0: return [4, this.callApi({
                             method: 'post',
                             route: 'api/files',
-                            data: { key: folderName + '/' },
+                            data: { key: folderName },
                         })];
                     case 1:
                         _a.sent();
@@ -173,18 +210,18 @@ var Files = (function (_super) {
             });
         });
     };
-    Files.prototype.changePrivacy = function (key, newPrivacy, isPublic) {
+    Files.prototype.duplicateFile = function (key, newKey, isPublic) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.callApi({
-                            method: 'patch',
-                            route: 'api/files',
+                            method: 'put',
+                            route: 'api/files/duplicate',
                             params: {
                                 key: key,
                                 isPublic: isPublic,
                             },
-                            data: { newPrivacy: newPrivacy },
+                            data: { newKey: newKey },
                         })];
                     case 1:
                         _a.sent();
@@ -193,17 +230,18 @@ var Files = (function (_super) {
             });
         });
     };
-    Files.prototype.deleteFile = function (key, isPublic) {
+    Files.prototype.changePrivacy = function (key, newPrivacy, isPublic) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.callApi({
-                            method: 'delete',
+                            method: 'patch',
                             route: 'api/files',
                             params: {
                                 key: key,
                                 isPublic: isPublic,
                             },
+                            data: { newPrivacy: newPrivacy },
                         })];
                     case 1:
                         _a.sent();
@@ -212,14 +250,17 @@ var Files = (function (_super) {
             });
         });
     };
-    Files.prototype.deleteFolder = function (key) {
+    Files.prototype.deleteFile = function (key, isPublic) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.callApi({
                             method: 'delete',
-                            route: 'api/folder',
-                            data: { key: key },
+                            route: 'api/files',
+                            params: {
+                                key: key,
+                                isPublic: isPublic,
+                            },
                         })];
                     case 1:
                         _a.sent();
@@ -228,17 +269,14 @@ var Files = (function (_super) {
             });
         });
     };
-    Files.prototype.getObjectSize = function (key, isPublic) {
+    Files.prototype.deleteFolder = function (key) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.callApi({
-                            method: 'get',
+                            method: 'delete',
                             route: 'api/folder',
-                            params: {
-                                key: key,
-                                isPublic: isPublic,
-                            },
+                            data: { key: key },
                         })];
                     case 1:
                         _a.sent();
@@ -264,74 +302,59 @@ var Files = (function (_super) {
             });
         });
     };
-    Files.prototype.getUploadUrl = function (data, isPublic) {
+    Files.prototype.getObjectInfo = function (key, isPublic) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4, this.callApi({
-                            method: 'post',
-                            route: 'api/url',
+                            method: 'get',
+                            route: 'api/file',
                             params: {
+                                key: key,
                                 isPublic: isPublic,
                             },
-                            data: __assign({}, data),
                         })];
                     case 1: return [2, _a.sent()];
                 }
             });
         });
     };
-    Files.prototype.getSystemUploadUrl = function (postfix, files) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4, this.callApi({
-                            method: 'post',
-                            route: 'uploadfile',
-                            data: {
-                                postfix: postfix,
-                                files: files,
-                            },
-                        })];
-                    case 1: return [2, _a.sent()];
-                }
-            });
+    Files.prototype.getUploadUrl = function (data, isPublic) {
+        return this.callApi({
+            method: 'post',
+            route: 'api/url',
+            params: {
+                isPublic: isPublic,
+                prefix: '',
+            },
+            data: __assign({}, data),
         });
     };
     Files.prototype.uploadFile = function (file) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, type, name, contentType, cacheControl, _b, url, fields, FormDataLib, formData;
+            var _a, type, name, contentType, _b, url, fields, formData;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         _a = file.fileModel, type = _a.type, name = _a.name;
                         contentType = type || 'binary/octet-stream';
-                        cacheControl = file.ttl ? "max-age=".concat(file.ttl) : 'no-cache';
                         return [4, this.getUploadUrl({
                                 contentType: contentType,
                                 key: file.prefix + name,
-                                maxFileSize: file.maxFileSize,
-                                cacheControl: cacheControl,
+                                cacheControl: 'no-cache',
                             }, file.isPublic)];
                     case 1:
                         _b = _c.sent(), url = _b.url, fields = _b.fields;
-                        FormDataLib = FormData;
-                        formData = new FormDataLib();
-                        fields.forEach(function (field) {
-                            formData.append(field.key, field.value);
+                        formData = new FormData();
+                        Object.entries(fields).forEach(function (value) {
+                            formData.append(value[0], value[1]);
                         });
-                        formData.append('cache-control', cacheControl);
+                        formData.append('cache-control', 'no-cache');
                         formData.append('content-type', contentType);
-                        formData.append('File', file.fileModel.file, name);
-                        return [4, this.callApi({
-                                method: 'post',
-                                route: url,
-                                params: {
-                                    isPublic: file.isPublic,
-                                },
-                                data: { formData: formData },
+                        formData.append('File', file.fileModel, name);
+                        return [2, axios_1.default.post(url, formData, {
+                                onUploadProgress: function (event) { return file.progress(event, name); },
                             })];
-                    case 2: return [2, _c.sent()];
                 }
             });
         });

package/dist/cjs/Files.js.map

@@ -1 +1 @@
-{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAoC;AAEpC,yCAA0C;AAS1C;IAA2B,yBAAI;IAO7B,eAAY,MAAmB;QACrB,IAAA,KAAK,GAA0C,MAAM,MAAhD,EAAE,YAAY,GAA4B,MAAM,aAAlC,EAAE,SAAS,GAAiB,MAAM,UAAvB,EAAE,UAAU,GAAK,MAAM,WAAX,CAAY;eAE9D,kBAAM;YACJ,KAAK,OAAA;YACL,YAAY,cAAA;YACZ,SAAS,WAAA;YACT,UAAU,YAAA;YACV,UAAU,EAAE,uBAAW;SACxB,CAAC;IACJ,CAAC;IAMK,6BAAa,GAAnB,UAAoB,GAAW;;;;;4BACZ,WAAM,IAAI,CAAC,OAAO,CAAC;4BAClC,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,YAAY;4BACnB,MAAM,EAAE,EAAE,GAAG,KAAA,EAAE;yBAChB,CAAC,EAAA;;wBAJM,IAAI,GAAK,CAAA,SAIf,CAAA,KAJU;wBAMZ,WAAO,IAAI,EAAC;;;;KACb;IACK,4BAAY,GAAlB,UAAmB,QAAiB,EAAE,MAAc;;;;;;wBAC9C,SAAS,GAAkB,IAAI,CAAC;wBAChC,UAAU,GAAe,EAAE,CAAC;;;wBAGxB,WAAW,GAAY;4BAC3B,QAAQ,UAAA;4BACR,MAAM,QAAA;yBACP,CAAC;wBACF,IAAI,SAAS;4BAAE,WAAW,CAAC,SAAS,GAAG,SAAS,CAAC;wBAEU,WAAM,IAAI,CAAC,OAAO,CAAC;gCAC5E,MAAM,EAAE,KAAK;gCACb,KAAK,EAAE,WAAW;gCAClB,MAAM,EAAE,WAAW;6BACpB,CAAC,EAAA;;wBAJI,KAAqD,SAIzD,EAJM,KAAK,WAAA,EAAE,iBAAiB,uBAAA;wBAKhC,UAAU,mCAAO,UAAU,SAAK,KAAK,OAAC,CAAC;wBAEvC,SAAS,GAAG,iBAAiB,CAAC;;;4BACvB,SAAS;;4BAElB,WAAO,UAAU,EAAC;;;;KACnB;IAEK,4BAAY,GAAlB,UAAmB,UAAkB;;;;4BACnC,WAAM,IAAI,CAAC,OAAO,CAAC;4BACjB,MAAM,EAAE,MAAM;4BACd,KAAK,EAAE,WAAW;4BAClB,IAAI,EAAE,EAAE,GAAG,EAAE,UAAU,GAAG,GAAG,EAAE;yBAChC,CAAC,EAAA;;wBAJF,SAIE,CAAC;;;;;KACJ;IAEK,0BAAU,GAAhB,UAAiB,GAAW,EAAE,MAAc,EAAE,QAAiB;;;;4BAC7D,WAAM,IAAI,CAAC,OAAO,CAAC;4BACjB,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,WAAW;4BAClB,MAAM,EAAE;gCACN,GAAG,KAAA;gCACH,QAAQ,UAAA;6BACT;4BACD,IAAI,EAAE,EAAE,MAAM,QAAA,EAAE;yBACjB,CAAC,EAAA;;wBARF,SAQE,CAAC;;;;;KACJ;IAEK,6BAAa,GAAnB,UAAoB,GAAW,EAAE,UAAkB,EAAE,QAAiB;;;;4BACpE,WAAM,IAAI,CAAC,OAAO,CAAC;4BACjB,MAAM,EAAE,OAAO;4BACf,KAAK,EAAE,WAAW;4BAClB,MAAM,EAAE;gCACN,GAAG,KAAA;gCACH,QAAQ,UAAA;6BACT;4BACD,IAAI,EAAE,EAAE,UAAU,YAAA,EAAE;yBACrB,CAAC,EAAA;;wBARF,SAQE,CAAC;;;;;KACJ;IAEK,0BAAU,GAAhB,UAAiB,GAAW,EAAE,QAAiB;;;;4BAC7C,WAAM,IAAI,CAAC,OAAO,CAAC;4BACjB,MAAM,EAAE,QAAQ;4BAChB,KAAK,EAAE,WAAW;4BAClB,MAAM,EAAE;gCACN,GAAG,KAAA;gCACH,QAAQ,UAAA;6BACT;yBACF,CAAC,EAAA;;wBAPF,SAOE,CAAC;;;;;KACJ;IAEK,4BAAY,GAAlB,UAAmB,GAAW;;;;4BAC5B,WAAM,IAAI,CAAC,OAAO,CAAC;4BACjB,MAAM,EAAE,QAAQ;4BAChB,KAAK,EAAE,YAAY;4BACnB,IAAI,EAAE,EAAE,GAAG,KAAA,EAAE;yBACd,CAAC,EAAA;;wBAJF,SAIE,CAAC;;;;;KACJ;IAEK,6BAAa,GAAnB,UAAoB,GAAW,EAAE,QAAiB;;;;4BAChD,WAAM,IAAI,CAAC,OAAO,CAAC;4BACjB,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,YAAY;4BACnB,MAAM,EAAE;gCACN,GAAG,KAAA;gCACH,QAAQ,UAAA;6BACT;yBACF,CAAC,EAAA;;wBAPF,SAOE,CAAC;;;;;KACJ;IAEK,8BAAc,GAApB,UAAqB,GAAW,EAAE,QAAiB;;;;4BAE1C,WAAM,IAAI,CAAC,OAAO,CAAC;4BACxB,MAAM,EAAE,KAAK;4BACb,KAAK,EAAE,SAAS;4BAChB,MAAM,EAAE;gCACN,GAAG,KAAA;gCACH,QAAQ,UAAA;6BACT;yBACF,CAAC,EAAA;4BAPF,WAAO,SAOL,EAAC;;;;KACJ;IAEK,4BAAY,GAAlB,UAAmB,IAAoB,EAAE,QAAiB;;;;4BACjD,WAAM,IAAI,CAAC,OAAO,CAAC;4BACxB,MAAM,EAAE,MAAM;4BACd,KAAK,EAAE,SAAS;4BAChB,MAAM,EAAE;gCACN,QAAQ,UAAA;6BACT;4BACD,IAAI,eAAO,IAAI,CAAE;yBAClB,CAAC,EAAA;4BAPF,WAAO,SAOL,EAAC;;;;KACJ;IAEK,kCAAkB,GAAxB,UAAyB,OAAe,EAAE,KAAmB;;;;4BACpD,WAAM,IAAI,CAAC,OAAO,CAAC;4BACxB,MAAM,EAAE,MAAM;4BACd,KAAK,EAAE,YAAY;4BACnB,IAAI,EAAE;gCACJ,OAAO,SAAA;gCACP,KAAK,OAAA;6BAIN;yBACF,CAAC,EAAA;4BAVF,WAAO,SAUL,EAAC;;;;KACJ;IAEK,0BAAU,GAAhB,UAAiB,IAAqB;;;;;;wBAC9B,KAAiB,IAAI,CAAC,SAAS,EAA7B,IAAI,UAAA,EAAE,IAAI,UAAA,CAAoB;wBAChC,WAAW,GAAG,IAAI,IAAI,qBAAqB,CAAC;wBAC5C,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAW,IAAI,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,UAAU,CAAC;wBAE3C,WAAM,IAAI,CAAC,YAAY,CAAC;gCAC9C,WAAW,aAAA;gCACX,GAAG,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI;gCACvB,WAAW,EAAE,IAAI,CAAC,WAAW;gCAC7B,YAAY,cAAA;6BACb,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAA;;wBALX,KAAkB,SAKP,EALT,GAAG,SAAA,EAAE,MAAM,YAAA;wBAOb,WAAW,GAAG,QAAQ,CAAC;wBACvB,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;wBAEnC,MAAM,CAAC,OAAO,CAAC,UAAA,KAAK;4BAClB,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC1C,CAAC,CAAC,CAAC;wBAEH,QAAQ,CAAC,MAAM,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;wBAC/C,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;wBAC7C,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;wBAG5C,WAAM,IAAI,CAAC,OAAO,CAAC;gCACxB,MAAM,EAAE,MAAM;gCACd,KAAK,EAAE,GAAG;gCACV,MAAM,EAAE;oCACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;iCACxB;gCACD,IAAI,EAAE,EAAE,QAAQ,UAAA,EAAE;6BACnB,CAAC,EAAA;4BAPF,WAAO,SAOL,EAAC;;;;KACJ;IACH,YAAC;AAAD,CAAC,AA5LD,CAA2B,WAAI,GA4L9B;AA5LY,sBAAK"}
+{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":"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"}

package/dist/esm/Files.js

@@ -7,15 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import axios from 'axios';
 import { Base } from '@or-sdk/base';
 import { SERVICE_KEY } from './constants';
 export class Files extends Base {
     constructor(params) {
-        const { token, discoveryUrl, accountId, serviceUrl } = params;
+        const { token, discoveryUrl, serviceUrl } = params;
         super({
             token,
             discoveryUrl,
-            accountId,
             serviceUrl,
             serviceKey: SERVICE_KEY,
         });
@@ -23,21 +23,21 @@ export class Files extends Base {
     getFolderSize(key) {
         return __awaiter(this, void 0, void 0, function* () {
             const { size } = yield this.callApi({
-                method: 'GET',
+                method: 'get',
                 route: 'api/folder',
                 params: { key },
             });
             return size;
         });
     }
-    getItemsList(isPublic, prefix) {
+    getItemsList(isPublic, treePrefix) {
         return __awaiter(this, void 0, void 0, function* () {
             let nextToken = null;
             let totalItems = [];
             do {
                 const queryParams = {
                     isPublic,
-                    prefix,
+                    prefix: treePrefix,
                 };
                 if (nextToken)
                     queryParams.nextToken = nextToken;
@@ -52,12 +52,34 @@ export class Files extends Base {
             return totalItems;
         });
     }
+    search(isPublic, term) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let nextToken = null;
+            let totalItems = [];
+            do {
+                const queryParams = {
+                    isPublic,
+                    term,
+                };
+                if (nextToken)
+                    queryParams.nextToken = nextToken;
+                const { files, nextTokenResponse } = yield this.callApi({
+                    method: 'GET',
+                    route: 'api/files/search',
+                    params: queryParams,
+                });
+                totalItems = [...totalItems, ...files];
+                nextToken = nextTokenResponse;
+            } while (nextToken);
+            return totalItems;
+        });
+    }
     createFolder(folderName) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.callApi({
                 method: 'post',
                 route: 'api/files',
-                data: { key: folderName + '/' },
+                data: { key: folderName },
             });
         });
     }
@@ -74,6 +96,19 @@ export class Files extends Base {
             });
         });
     }
+    duplicateFile(key, newKey, isPublic) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.callApi({
+                method: 'put',
+                route: 'api/files/duplicate',
+                params: {
+                    key,
+                    isPublic,
+                },
+                data: { newKey },
+            });
+        });
+    }
     changePrivacy(key, newPrivacy, isPublic) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.callApi({
@@ -108,18 +143,6 @@ export class Files extends Base {
             });
         });
     }
-    getObjectSize(key, isPublic) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.callApi({
-                method: 'get',
-                route: 'api/folder',
-                params: {
-                    key,
-                    isPublic,
-                },
-            });
-        });
-    }
     getDownloadUrl(key, isPublic) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.callApi({
@@ -132,56 +155,47 @@ export class Files extends Base {
             });
         });
     }
-    getUploadUrl(data, isPublic) {
+    getObjectInfo(key, isPublic) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.callApi({
-                method: 'post',
-                route: 'api/url',
+                method: 'get',
+                route: 'api/file',
                 params: {
+                    key,
                     isPublic,
                 },
-                data: Object.assign({}, data),
             });
         });
     }
-    getSystemUploadUrl(postfix, files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.callApi({
-                method: 'post',
-                route: 'uploadfile',
-                data: {
-                    postfix,
-                    files,
-                },
-            });
+    getUploadUrl(data, isPublic) {
+        return this.callApi({
+            method: 'post',
+            route: 'api/url',
+            params: {
+                isPublic,
+                prefix: '',
+            },
+            data: Object.assign({}, data),
         });
     }
     uploadFile(file) {
         return __awaiter(this, void 0, void 0, function* () {
             const { type, name } = file.fileModel;
             const contentType = type || 'binary/octet-stream';
-            const cacheControl = file.ttl ? `max-age=${file.ttl}` : 'no-cache';
             const { url, fields } = yield this.getUploadUrl({
                 contentType,
                 key: file.prefix + name,
-                maxFileSize: file.maxFileSize,
-                cacheControl,
+                cacheControl: 'no-cache',
             }, file.isPublic);
-            const FormDataLib = FormData;
-            const formData = new FormDataLib();
-            fields.forEach(field => {
-                formData.append(field.key, field.value);
+            const formData = new FormData();
+            Object.entries(fields).forEach(value => {
+                formData.append(value[0], value[1]);
             });
-            formData.append('cache-control', cacheControl);
+            formData.append('cache-control', 'no-cache');
             formData.append('content-type', contentType);
-            formData.append('File', file.fileModel.file, name);
-            return yield this.callApi({
-                method: 'post',
-                route: url,
-                params: {
-                    isPublic: file.isPublic,
-                },
-                data: { formData },
+            formData.append('File', file.fileModel, name);
+            return axios.post(url, formData, {
+                onUploadProgress: event => file.progress(event, name),
             });
         });
     }

package/dist/esm/Files.js.map

@@ -1 +1 @@
-{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Files.js","sourceRoot":"","sources":["../../src/Files.ts"],"names":[],"mappings":"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"}

package/dist/types/Files.d.ts

@@ -1,17 +1,18 @@
 import { Base } from '@or-sdk/base';
-import { FilesConfig, FileItem, UploadUrlProps, UploadFile, UploadFileProps, UploadUrlResponse } from './types';
+import { FilesConfig, FileItem, UploadFileProps, HeadData } from './types';
 export declare class Files extends Base {
     constructor(params: FilesConfig);
     getFolderSize(key: string): Promise<number>;
-    getItemsList(isPublic: boolean, prefix: string): Promise<FileItem[]>;
+    getItemsList(isPublic: boolean, treePrefix: string): Promise<FileItem[]>;
+    search(isPublic: boolean, term: string): Promise<FileItem[]>;
     createFolder(folderName: string): Promise<void>;
     renameFile(key: string, newKey: string, isPublic: boolean): Promise<void>;
-    changePrivacy(key: string, newPrivacy: string, isPublic: boolean): Promise<void>;
+    duplicateFile(key: string, newKey: string, isPublic: boolean): Promise<void>;
+    changePrivacy(key: string, newPrivacy: 'private' | 'public', isPublic: boolean): Promise<void>;
     deleteFile(key: string, isPublic: boolean): Promise<void>;
     deleteFolder(key: string): Promise<void>;
-    getObjectSize(key: string, isPublic: boolean): Promise<void>;
     getDownloadUrl(key: string, isPublic: boolean): Promise<string>;
-    getUploadUrl(data: UploadUrlProps, isPublic: boolean): Promise<UploadUrlResponse>;
-    getSystemUploadUrl(postfix: string, files: UploadFile[]): Promise<unknown>;
-    uploadFile(file: UploadFileProps): Promise<unknown>;
+    getObjectInfo(key: string, isPublic: boolean): Promise<HeadData>;
+    private getUploadUrl;
+    uploadFile(file: UploadFileProps): Promise<void>;
 }

package/dist/types/types.d.ts

@@ -5,14 +5,20 @@ export declare type FilesConfig = {
     accountId?: string;
     serviceUrl?: string;
 };
-export declare type LsQuery = {
+export declare type GetItemsQuery = {
     isPublic: boolean;
     prefix: string;
     nextToken?: string;
 };
+export declare type SearchQuery = {
+    isPublic: boolean;
+    term: string;
+    nextToken?: string;
+};
 export declare type FileItem = {
     key: string;
     size?: number;
+    lastModified?: string;
 };
 export declare type FilesPageState = {
     filesInstance: any;
@@ -22,42 +28,45 @@ export declare type FilesPageState = {
     accountId: string;
     renameFrom: string;
     renameTo: string;
+    searchString: string;
     items: FileItem[];
+    searchItems: FileItem[];
+};
+export declare type HeadData = {
+    contentLength: number;
+    contentType: string;
+    metaData: object;
 };
-export declare type getItemsListResponse = {
+export declare type GetItemsListResponse = {
     items: FileItem[];
     nextTokenResponse: string | null;
 };
+export declare type SearchItemsListResponse = {
+    files: FileItem[];
+    nextTokenResponse: string | null;
+};
 export declare type UploadUrlProps = {
     key: string;
     contentType: string;
-    maxFileSize: number;
+    maxFileSize?: number;
     cacheControl: string;
 };
 export declare type UploadUrlResponse = {
     url: string;
     fields: {
         key: string;
-        value: any;
+        bucket: string;
+        Policy: string;
+        'X-Amz-Date': string;
+        'X-Amz-Signature': string;
+        'X-Amz-Algorithm': string;
+        'X-Amz-Credential': string;
+        'X-Amz-Security-Token': string;
     }[];
 };
-export declare type UploadFile = {
-    name: string;
-    size: number;
-    contentType: string;
-    cacheControl: string;
-    ttl: number;
-};
 export declare type UploadFileProps = {
-    fileModel: {
-        type: string;
-        name: string;
-        file: any;
-    };
+    fileModel: File;
     prefix: string;
     isPublic: boolean;
-    expires: any;
-    progress: any;
-    maxFileSize: number;
-    ttl: number;
+    progress: (event: ProgressEvent, name: string) => void;
 };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.20.1-createfilespackage.2",
+  "version": "0.20.1-createfilespackage.20",
   "name": "@or-sdk/files",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -23,7 +23,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@or-sdk/base": "^0.20.1-createfilespackage.2"
+    "@or-sdk/base": "^0.20.1-createfilespackage.20",
+    "axios": "^0.24.0"
   },
-  "gitHead": "ad802277a99d7af5b7a92856f4917c0c6f4c9604"
+  "gitHead": "91f4845ec94874576bcb803cfce781b689ffee68"
 }

package/src/Files.ts

@@ -1,6 +1,10 @@
+import axios from 'axios';
 import { Base } from '@or-sdk/base';
-import { FilesConfig, LsQuery, FileItem, getItemsListResponse, UploadUrlProps, UploadFile, UploadFileProps, UploadUrlResponse } from './types';
 import { SERVICE_KEY } from './constants';
+import {
+  FilesConfig, GetItemsQuery, SearchItemsListResponse, SearchQuery, FileItem,
+  GetItemsListResponse, UploadUrlProps, UploadFileProps, UploadUrlResponse, HeadData,
+} from './types';
 
 /**
  * OneReach Files service client
@@ -17,12 +21,11 @@ export class Files extends Base {
    * ```
    */
   constructor(params: FilesConfig) {
-    const { token, discoveryUrl, accountId, serviceUrl } = params;
+    const { token, discoveryUrl, serviceUrl } = params;
 
     super({
       token,
       discoveryUrl,
-      accountId,
       serviceUrl,
       serviceKey: SERVICE_KEY,
     });
@@ -31,28 +34,36 @@ export class Files extends Base {
   /**
    * Get folder size
    * @param key the name of folder
+   * @return total folder size in bytes
    */
   async getFolderSize(key: string): Promise<number> {
     const { size } = await this.callApi({
-      method: 'GET',
+      method: 'get',
       route: 'api/folder',
       params: { key },
     });
 
     return size;
   }
-  async getItemsList(isPublic: boolean, prefix: string): Promise<FileItem[]> {
+
+  /**
+   * Get list of public/private FileItems from api
+   * @param isPublic does this file public or private
+   * @param treePrefix the folder path where GET FileItems, for Root use ''
+   * @return list of FileItems
+   */
+  async getItemsList(isPublic: boolean, treePrefix: string): Promise<FileItem[]> {
     let nextToken: null | string = null;
     let totalItems: FileItem[] = [];
 
     do {
-      const queryParams: LsQuery = {
+      const queryParams: GetItemsQuery = {
         isPublic,
-        prefix,
+        prefix: treePrefix,
       };
       if (nextToken) queryParams.nextToken = nextToken;
 
-      const { items, nextTokenResponse }: getItemsListResponse = await this.callApi({
+      const { items, nextTokenResponse }: GetItemsListResponse = await this.callApi({
         method: 'GET',
         route: 'api/files',
         params: queryParams,
@@ -65,15 +76,51 @@ export class Files extends Base {
     return totalItems;
   }
 
-  async createFolder(folderName: string) {
+  async search(isPublic: boolean, term: string): Promise<FileItem[]> {
+    let nextToken = null;
+    let totalItems: FileItem[] = [];
+
+    do {
+      const queryParams: SearchQuery = {
+        isPublic,
+        term,
+      };
+
+      if (nextToken) queryParams.nextToken = nextToken;
+
+      const { files, nextTokenResponse }: SearchItemsListResponse = await this.callApi({
+        method: 'GET',
+        route: 'api/files/search',
+        params: queryParams,
+      });
+
+      totalItems = [...totalItems, ...files];
+      nextToken = nextTokenResponse;
+
+    } while (nextToken);
+
+    return totalItems;
+  }
+
+  /**
+   * Create new folders
+   * @param folderName should have folder path + folder name, example: /main/New folder
+   */
+  async createFolder(folderName: string): Promise<void> {
     await this.callApi({
       method: 'post',
       route: 'api/files',
-      data: { key: folderName + '/' },
+      data: { key: folderName },
     });
   }
 
-  async renameFile(key: string, newKey: string, isPublic: boolean) {
+  /**
+   * Rename exist file
+   * @param key old file name
+   * @param newKey new file name
+   * @param isPublic does this file public or private
+   */
+  async renameFile(key: string, newKey: string, isPublic: boolean): Promise<void> {
     await this.callApi({
       method: 'put',
       route: 'api/files',
@@ -85,7 +132,31 @@ export class Files extends Base {
     });
   }
 
-  async changePrivacy(key: string, newPrivacy: string, isPublic: boolean) {
+  /**
+   * Duplicate file
+   * @param key target file name
+   * @param newKey new file name
+   * @param isPublic does this file public or private
+   */
+  async duplicateFile(key: string, newKey: string, isPublic: boolean): Promise<void> {
+    await this.callApi({
+      method: 'put',
+      route: 'api/files/duplicate',
+      params: {
+        key,
+        isPublic,
+      },
+      data: { newKey },
+    });
+  }
+
+  /**
+   * Change file privacy
+   * @param key file name
+   * @param newPrivacy new file privacy
+   * @param isPublic does this file public or private
+   */
+  async changePrivacy(key: string, newPrivacy: 'private' | 'public', isPublic: boolean): Promise<void> {
     await this.callApi({
       method: 'patch',
       route: 'api/files',
@@ -97,7 +168,13 @@ export class Files extends Base {
     });
   }
 
-  async deleteFile(key: string, isPublic: boolean) {
+  /**
+   * Delete file
+   * @param key file name
+   * @param isPublic does this file public or private
+   */
+  async deleteFile(key: string, isPublic: boolean): Promise<void> {
+    // TODO: add error handler and status response true
     await this.callApi({
       method: 'delete',
       route: 'api/files',
@@ -108,7 +185,12 @@ export class Files extends Base {
     });
   }
 
-  async deleteFolder(key: string) {
+  /**
+   * Delete folder
+   * @param key folder name
+   */
+  async deleteFolder(key: string): Promise<void> {
+    // TODO: add error handler and status response true
     await this.callApi({
       method: 'delete',
       route: 'api/folder',
@@ -116,10 +198,16 @@ export class Files extends Base {
     });
   }
 
-  async getObjectSize(key: string, isPublic: boolean) {
-    await this.callApi({
+  /**
+   * Get a link to download file, example: for preview
+   * @param key folder name
+   * @param isPublic does this file public or private
+   * @return file url
+   */
+  async getDownloadUrl(key: string, isPublic: boolean): Promise<string> {
+    return await this.callApi({
       method: 'get',
-      route: 'api/folder',
+      route: 'api/url',
       params: {
         key,
         isPublic,
@@ -127,11 +215,15 @@ export class Files extends Base {
     });
   }
 
-  async getDownloadUrl(key: string, isPublic: boolean): Promise<string> {
-    // TODO: test it, it's used in old-files-ui
+  /**
+   * Get object info
+   * @param key folder name
+   * @param isPublic does this file public or private
+   */
+  async getObjectInfo(key: string, isPublic: boolean): Promise<HeadData> {
     return await this.callApi({
       method: 'get',
-      route: 'api/url',
+      route: 'api/file',
       params: {
         key,
         isPublic,
@@ -139,62 +231,52 @@ export class Files extends Base {
     });
   }
 
-  async getUploadUrl(data: UploadUrlProps, isPublic: boolean): Promise<UploadUrlResponse> {
-    return await this.callApi({
+  /**
+   * Get a link for uploading specific file, JUST FOR INNER USE
+   * @param data has UploadUrlProps values inside
+   * @param isPublic does this file public or private
+   * @return uploading Url with different header Fields
+   */
+  private getUploadUrl(data: UploadUrlProps, isPublic: boolean): Promise<UploadUrlResponse> {
+    return this.callApi({
       method: 'post',
       route: 'api/url',
       params: {
         isPublic,
+        prefix: '',
       },
       data: { ...data },
     });
   }
 
-  async getSystemUploadUrl(postfix: string, files: UploadFile[]) {
-    return await this.callApi({
-      method: 'post',
-      route: 'uploadfile',
-      data: {
-        postfix,
-        files,
-        // old version
-        // files: _.map(files, file => _.omit(file, ['fileDescriptor'])),
-        // ...(!_.isEmpty(options) && options),
-      },
-    });
-  }
-
-  async uploadFile(file: UploadFileProps) {
+  /**
+   * Upload file to S3 bucket
+   * @param file file itself for uploading with prefix (path) and isPublic boolean
+   */
+  async uploadFile(file: UploadFileProps): Promise<void> {
     const { type, name } = file.fileModel;
     const contentType = type || 'binary/octet-stream';
-    const cacheControl = file.ttl ? `max-age=${file.ttl}` : 'no-cache';
 
     const { url, fields } = await this.getUploadUrl({
       contentType,
       key: file.prefix + name,
-      maxFileSize: file.maxFileSize,
-      cacheControl,
+      cacheControl: 'no-cache',
     }, file.isPublic);
 
-    const FormDataLib = FormData;
-    const formData = new FormDataLib();
+    const formData = new FormData();
 
-    fields.forEach(field => {
-      formData.append(field.key, field.value);
+    Object.entries(fields).forEach(value => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      formData.append(value[0], value[1]);
     });
 
-    formData.append('cache-control', cacheControl);
+    formData.append('cache-control', 'no-cache');
     formData.append('content-type', contentType);
-    formData.append('File', file.fileModel.file, name);
-
+    formData.append('File', file.fileModel, name);
 
-    return await this.callApi({
-      method: 'post',
-      route: url,
-      params: {
-        isPublic: file.isPublic,
-      },
-      data: { formData },
+    return axios.post(url, formData, {
+      onUploadProgress: event => file.progress(event, name),
     });
   }
 }

package/src/types.ts

@@ -19,15 +19,22 @@ export type FilesConfig = {
   serviceUrl?: string;
 };
 
-export type LsQuery = {
+export type GetItemsQuery = {
   isPublic: boolean;
   prefix: string;
   nextToken?: string;
 };
 
+export type SearchQuery = {
+  isPublic: boolean;
+  term: string;
+  nextToken?: string;
+};
+
 export type FileItem = {
   key: string;
   size?: number;
+  lastModified?: string;
 };
 
 export type FilesPageState = {
@@ -38,17 +45,31 @@ export type FilesPageState = {
   accountId: string;
   renameFrom: string;
   renameTo: string;
+  searchString: string;
   items: FileItem[];
+  searchItems: FileItem[];
 };
-export type getItemsListResponse = {
+
+export type HeadData = {
+  contentLength: number;
+  contentType: string;
+  metaData: object;
+};
+
+export type GetItemsListResponse = {
   items: FileItem[];
   nextTokenResponse: string | null;
 };
 
+export type SearchItemsListResponse = {
+  files: FileItem[];
+  nextTokenResponse: string | null;
+};
+
 export type UploadUrlProps = {
   key: string;
   contentType: string;
-  maxFileSize: number;
+  maxFileSize?: number;
   cacheControl: string;
 };
 
@@ -56,25 +77,20 @@ export type UploadUrlResponse = {
   url: string;
   fields: {
     key: string;
-    value: any;
+    bucket: string;
+    Policy: string;
+    'X-Amz-Date': string;
+    'X-Amz-Signature': string;
+    'X-Amz-Algorithm': string;
+    'X-Amz-Credential': string;
+    'X-Amz-Security-Token': string;
   }[];
 };
 
-export type UploadFile = {
-  name: string;
-  size: number;
-  contentType: string;
-  cacheControl: string;
-  ttl: number;
-};
-
 export type UploadFileProps = {
-  fileModel: { type: string; name: string; file: any; };
+  fileModel: File;
   prefix: string;
   isPublic: boolean;
-  expires: any;
-  progress: any;
-  maxFileSize: number;
-  ttl: number;
+  progress: (event: ProgressEvent, name: string) => void;
 };