@tblabs/storage 5.13.0 → 5.13.2

package/Datasets/Picture/PicturesDataset.js

@@ -58,6 +58,7 @@ export class PicturesDataset extends DatasetBase {
             formData.append('database', this._db.DatabaseDir);
             formData.append('dataset', this.dataset);
             formData.append('config', JSON.stringify(this.picsConfig));
+            formData.append('userId', this._db.User.Id);
             let serverUrl = this._db.Server;
             if (serverUrl.endsWith("/")) // Because for local env we use ".../src/" but for prod ".../v5"
              {

package/Services/OnlineStorage.d.ts

@@ -18,14 +18,17 @@ import { PicsConfig } from "../Datasets/Picture/PicsConfig";
 export declare class OnlineStorage {
     private server;
     private database;
+    private sender;
     private ANONYMOUS_USER;
     private user;
     private logEnabled;
     private readonly _bus;
     private onUserChange;
-    private USER_LOCAL_STORAGE_KEY;
+    private USER_LOCAL_STORAGE_KEY_PREFIX;
+    private userLocalStorageKey;
     get Server(): string;
     get DatabaseDir(): dir;
+    get User(): IStorageUser;
     constructor(server: url, database: dir, sender?: ISender, bus?: MessageBus);
     SetServer(server: url): this;
     SetDatabase(database: dir): this;
@@ -35,12 +38,11 @@ export declare class OnlineStorage {
     AddUser(user: IStorageUser): Promise<void>;
     UpdateUser(user: IStorageUser): Promise<void>;
     DeleteUser(user: IStorageUser): Promise<void>;
-    GetObjectDataset<T extends object>(datasetName: string, converter: IConverter<any, T>): ObjectDataset<T>;
+    GetObjectDataset<T extends object>(datasetName: string, converter?: IConverter<any, T>): ObjectDataset<T>;
     GetTextDataset(datasetName: string, converter?: ITextConverter<any>): TextDataset<any> | RawTextDataset;
     GetPicturesDataset(datasetName: string, picsConfig?: PicsConfig): PicturesDataset;
     private IsBrowserEnvironment;
     private LoadUserFromLocalStorage;
-    get User(): IStorageUser;
     Login(password: string, login?: string): Promise<IStorageUser>;
     private SaveUserInLocalStorage;
     OnUserChange(handler: (user: IStorageUser, isAuthorized: boolean, appStart: boolean) => void): this;

package/Services/OnlineStorage.js

@@ -22,23 +22,29 @@ import { PicturesDataset } from "../Datasets/Picture/PicturesDataset";
 export class OnlineStorage {
     server;
     database;
+    sender;
     ANONYMOUS_USER = { Id: "Anonymous" };
     user = this.ANONYMOUS_USER;
     logEnabled = false;
     _bus;
     onUserChange = [];
-    USER_LOCAL_STORAGE_KEY = "";
+    USER_LOCAL_STORAGE_KEY_PREFIX = "OnlineStorage:User:";
+    userLocalStorageKey = "";
     get Server() {
         return this.server;
     }
     get DatabaseDir() {
         return this.database;
     }
+    get User() {
+        return this.user;
+    }
     constructor(server, database, sender = this.ANONYMOUS_USER, bus) {
         this.server = server;
         this.database = database;
+        this.sender = sender;
         this._bus = bus || new MessageBus(server, sender);
-        this.USER_LOCAL_STORAGE_KEY = "OnlineStorage:User:" + this.database;
+        this.userLocalStorageKey = this.USER_LOCAL_STORAGE_KEY_PREFIX + this.database;
         if (this.LoadUserFromLocalStorage()) {
             this.CallOnUserChanged(true);
         }
@@ -50,7 +56,7 @@ export class OnlineStorage {
     }
     SetDatabase(database) {
         this.database = database;
-        this.USER_LOCAL_STORAGE_KEY = "OnlineStorage:User:" + this.database;
+        this.userLocalStorageKey = this.USER_LOCAL_STORAGE_KEY_PREFIX + this.database;
         return this;
     }
     async ListDatasets() {
@@ -117,7 +123,7 @@ export class OnlineStorage {
     }
     LoadUserFromLocalStorage() {
         if (this.IsBrowserEnvironment()) {
-            const user = window.localStorage.getItem(this.USER_LOCAL_STORAGE_KEY);
+            const user = window.localStorage.getItem(this.userLocalStorageKey);
             if (user) {
                 this.user = JSON.parse(user);
                 this.SetUser(this.user || this.ANONYMOUS_USER);
@@ -126,9 +132,6 @@ export class OnlineStorage {
         }
         return false;
     }
-    get User() {
-        return this.user;
-    }
     async Login(password, login) {
         const result = await this._bus.SendMessage(new LoginUserQuery(this.DatabaseDir, password, login));
         if (!result.IsSuccess) {
@@ -142,7 +145,7 @@ export class OnlineStorage {
     }
     SaveUserInLocalStorage() {
         if (this.IsBrowserEnvironment()) {
-            window.localStorage.setItem(this.USER_LOCAL_STORAGE_KEY, JSON.stringify(this.user));
+            window.localStorage.setItem(this.userLocalStorageKey, JSON.stringify(this.user));
         }
     }
     OnUserChange(handler) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tblabs/storage",
-  "version": "5.13.0",
+  "version": "5.13.2",
   "description": "online storage module with auth",
   "license": "beerware",
   "main": "index.js",