@tblabs/storage 5.2.4 → 5.2.6

package/IStorageUser.d.ts

@@ -9,15 +9,18 @@ export interface IStorageUserPrivileges {
         Datasets: IEntitiesSet;
     };
     Update: {
+        Datasets: IEntitiesSet;
         Files: IEntitiesSet;
     };
     Delete: {
+        Datasets: IEntitiesSet;
         Files: IEntitiesSet;
     };
     List: {
         Datasets: IEntitiesSet;
     };
     Get: {
+        Datasets: IEntitiesSet;
         Files: IEntitiesSet;
     };
     Drop: {
@@ -44,7 +47,10 @@ export interface IStorageUser extends ISender {
     Name: string;
     Role: string;
     Icon: string;
+    Login: string;
     Password: string;
+    Email: string;
     Privileges: IStorageUserPrivileges;
     Tags: string[];
+    CreatedAt: Date;
 }

package/Messages/RegisterCommand.d.ts

@@ -2,5 +2,5 @@ import { IStorageUserPrivileges } from "../IStorageUser";
 import { Message } from "../MessageBus/Message";
 import { dir } from "../Types/dir";
 export declare class RegisterCommand extends Message {
-    constructor(Database: dir, Id: string, Role: string, Name: string, Password: string, Privileges: IStorageUserPrivileges, Icon?: string, Tags?: string[]);
+    constructor(Database: dir, Id: string, Role: string, Name: string, Login: string, Password: string, Email: string, Privileges: IStorageUserPrivileges, Icon?: string, Tags?: string[], CreatedAt?: Date);
 }

package/Messages/RegisterCommand.js

@@ -1,6 +1,6 @@
 import { Message } from "../MessageBus/Message";
 export class RegisterCommand extends Message {
-    constructor(Database, Id, Role, Name, Password, Privileges, Icon, Tags) {
-        super("Register", { Database, Id, Role, Icon, Name, Password, Privileges, Tags });
+    constructor(Database, Id, Role, Name, Login, Password, Email, Privileges, Icon, Tags, CreatedAt) {
+        super("Register", { Database, Id, Role, Name, Login, Password, Email, Privileges, Icon, Tags, CreatedAt });
     }
 }

package/OnlineStorage.d.ts

@@ -20,8 +20,8 @@ export declare class OnlineStorage {
     get User(): IStorageUser;
     Login(password: string): Promise<IStorageUser>;
     private SaveUserInLocalStorage;
-    OnUserChange(handler: (user: IStorageUser) => void): this;
-    Register(id: string, role: string, name: string, password: string, privileges: IStorageUserPrivileges, icon?: string, tags?: string[]): Promise<IStorageUser>;
+    OnUserChange(handler: (user: IStorageUser, isAuthorized: boolean, appStart: boolean) => void): this;
+    Register(id: string, role: string, name: string, login: string, password: string, email: string, privileges: IStorageUserPrivileges, icon?: string, tags?: string[]): Promise<IStorageUser>;
     Logout(): this;
     private CallOnUserChanged;
     get IsAuthorized(): boolean;

package/OnlineStorage.js

@@ -18,18 +18,18 @@ export class OnlineStorage {
         this.database = database;
         this._bus = bus || new MessageBus(server, sender);
         this.USER_LOCAL_STORAGE_KEY = "OnlineStorage:User:" + this.database;
-        this.LoadUserFromLocalStorage();
+        this.LoadUserFromLocalStorage(true);
     }
     IsBrowserEnvironment() {
         return typeof window !== "undefined" && typeof window.localStorage !== "undefined";
     }
-    LoadUserFromLocalStorage() {
+    LoadUserFromLocalStorage(appStart) {
         if (this.IsBrowserEnvironment()) {
             const user = window.localStorage.getItem(this.USER_LOCAL_STORAGE_KEY);
             if (user) {
                 this.user = JSON.parse(user);
                 this.SetUser(this.user || this.ANONYMOUS_USER);
-                this.CallOnUserChanged();
+                this.CallOnUserChanged(appStart);
             }
         }
     }
@@ -44,7 +44,7 @@ export class OnlineStorage {
         this.user = result.Result || this.ANONYMOUS_USER;
         this.SetUser(this.user);
         this.SaveUserInLocalStorage();
-        this.CallOnUserChanged();
+        this.CallOnUserChanged(false);
         return this.user;
     }
     SaveUserInLocalStorage() {
@@ -54,11 +54,12 @@ export class OnlineStorage {
     }
     OnUserChange(handler) {
         this.onUserChange.push(handler);
-        handler(this.user);
+        handler(this.user, this.IsAuthorized, true);
         return this;
     }
-    async Register(id, role, name, password, privileges, icon, tags) {
-        const result = await this._bus.SendMessage(new RegisterCommand(this.DatabaseDir, id, role, name, password, privileges, icon, tags));
+    async Register(id, role, name, login, password, email, privileges, icon, tags) {
+        const createdAt = new Date();
+        const result = await this._bus.SendMessage(new RegisterCommand(this.DatabaseDir, id, role, name, login, password, email, privileges, icon, tags, createdAt));
         if (!result.IsSuccess) {
             throw new Error(`Could not register: ${result.ErrorMessage}`);
         }
@@ -68,11 +69,11 @@ export class OnlineStorage {
     Logout() {
         this.SetUser(this.ANONYMOUS_USER);
         this.SaveUserInLocalStorage();
-        this.CallOnUserChanged();
+        this.CallOnUserChanged(false);
         return this;
     }
-    CallOnUserChanged() {
-        this.onUserChange.forEach(handler => handler(this.user));
+    CallOnUserChanged(appStart) {
+        this.onUserChange.forEach(handler => handler(this.user, this.IsAuthorized, appStart));
     }
     get IsAuthorized() {
         return this.user.Id !== this.ANONYMOUS_USER.Id;
@@ -92,7 +93,7 @@ export class OnlineStorage {
     }
     Log(...message) {
         if (this.logEnabled) {
-            console.log('[Storage]', ...message);
+            console.log('[OnlineStorage]', ...message);
         }
     }
     async Ping() {

package/package.json

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