@tblabs/storage 5.2.5 → 5.2.7

package/Dataset.d.ts

@@ -2,6 +2,7 @@ import { OnlineStorage } from "./OnlineStorage";
 import { IConverter } from "./IConverter";
 import { IRepo } from "./IRepo";
 import { dir } from "./Types/dir";
+import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
 export declare class Dataset<T extends object> implements IRepo<T> {
     private _db;
     private _converter;
@@ -9,6 +10,7 @@ export declare class Dataset<T extends object> implements IRepo<T> {
     get Name(): string;
     constructor(_db: OnlineStorage, _converter: IConverter<any, T>, dataset: dir);
     private get DatasetPath();
+    CanUserDo(action: keyof IStorageUserPrivileges): boolean;
     GetOne(id: string): Promise<T>;
     FindOne(id: string): Promise<T | null>;
     GetAll(): Promise<T[]>;

package/Dataset.js

@@ -20,6 +20,21 @@ export class Dataset {
     get DatasetPath() {
         return this._db.DatabaseDir + "/Datasets/" + this.dataset;
     }
+    CanUserDo(action) {
+        // console.log("ACTION", action);
+        // console.log("PRIVILEGES", this._db.User.Privileges);
+        if (!this._db.User.Privileges) {
+            // console.warn("User not logged in (even if Anonymous)");
+            return false;
+        }
+        if (typeof this._db.User.Privileges[action] === "object" && this._db.User.Privileges[action]) {
+            return this._db.User.Privileges[action].Datasets == "all" || this._db.User.Privileges[action].Datasets.includes(this.dataset);
+        }
+        if (typeof this._db.User.Privileges[action] === "boolean" && this._db.User.Privileges[action]) {
+            return this._db.User.Privileges[action];
+        }
+        return false;
+    }
     async GetOne(id) {
         this._db.Log(`Fetching "${id}"...`);
         const queryResult = await this._db.Send(new GetQuery(this._db.DatabaseDir, this.dataset, id));

package/IStorageUser.d.ts

@@ -1,50 +1,15 @@
+import { IStorageUserPrivileges } from "./IStorageUserPrivileges";
 import { ISender } from "./MessageBus/ISender";
-export type IEntitiesSet = string[] | "all" | "none";
-export type ICommandPrivilege = {
-    Datasets?: IEntitiesSet;
-    Files?: IEntitiesSet;
-};
-export interface IStorageUserPrivileges {
-    Add: {
-        Datasets: IEntitiesSet;
-    };
-    Update: {
-        Files: IEntitiesSet;
-    };
-    Delete: {
-        Files: IEntitiesSet;
-    };
-    List: {
-        Datasets: IEntitiesSet;
-    };
-    Get: {
-        Files: IEntitiesSet;
-    };
-    Drop: {
-        Datasets: IEntitiesSet;
-    };
-    Move: {
-        Datasets: IEntitiesSet;
-        Files: IEntitiesSet;
-    };
-    Create: {
-        Datasets: IEntitiesSet;
-    };
-    Exists: {
-        Datasets: IEntitiesSet;
-    };
-    Remove: {
-        Datasets: IEntitiesSet;
-    };
-    Register: boolean;
-}
 export interface IStorageUser extends ISender {
     Id: string;
     Database: string;
     Name: string;
     Role: string;
     Icon: string;
+    Login: string;
     Password: string;
+    Email: string;
     Privileges: IStorageUserPrivileges;
     Tags: string[];
+    CreatedAt: Date;
 }

package/IStorageUser.js

@@ -1,2 +1 @@
-;
 export {};

package/IStorageUserPrivileges.d.ts

@@ -0,0 +1,38 @@
+export type IEntitiesSet = string[] | "all" | "none";
+export interface IStorageUserPrivileges {
+    Add: {
+        Datasets: IEntitiesSet;
+    };
+    Update: {
+        Datasets: IEntitiesSet;
+        Files: IEntitiesSet;
+    };
+    Delete: {
+        Datasets: IEntitiesSet;
+        Files: IEntitiesSet;
+    };
+    List: {
+        Datasets: IEntitiesSet;
+    };
+    Get: {
+        Datasets: IEntitiesSet;
+        Files: IEntitiesSet;
+    };
+    Drop: {
+        Datasets: IEntitiesSet;
+    };
+    Move: {
+        Datasets: IEntitiesSet;
+        Files: IEntitiesSet;
+    };
+    Create: {
+        Datasets: IEntitiesSet;
+    };
+    Exists: {
+        Datasets: IEntitiesSet;
+    };
+    Remove: {
+        Datasets: IEntitiesSet;
+    };
+    Register: boolean;
+}

package/IStorageUserPrivileges.js

@@ -0,0 +1 @@
+export {};

package/Messages/RegisterCommand.d.ts

@@ -1,6 +1,6 @@
-import { IStorageUserPrivileges } from "../IStorageUser";
+import { IStorageUserPrivileges } from "../IStorageUserPrivileges";
 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

@@ -4,7 +4,7 @@ import { ISender } from "./MessageBus/ISender";
 import { MessageBus } from "./MessageBus/MessageBus";
 import { MessageBusResponse } from "./MessageBus/MessageBusResponse";
 import { Dataset } from "./Dataset";
-import { IStorageUser, IStorageUserPrivileges } from "./IStorageUser";
+import { IStorageUser } from "./IStorageUser";
 export declare class OnlineStorage {
     private database;
     private ANONYMOUS_USER;
@@ -15,13 +15,14 @@ export declare class OnlineStorage {
     private readonly USER_LOCAL_STORAGE_KEY;
     get DatabaseDir(): dir;
     constructor(server: url, database: dir, sender?: ISender, bus?: MessageBus);
+    private WasAnonymousUserEverLoaded;
+    InitOnce(): Promise<void>;
     private IsBrowserEnvironment;
     private LoadUserFromLocalStorage;
     get User(): IStorageUser;
     Login(password: string): Promise<IStorageUser>;
     private SaveUserInLocalStorage;
-    OnUserChange(handler: (user: IStorageUser, isAuthorized: boolean) => 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;
     Logout(): this;
     private CallOnUserChanged;
     get IsAuthorized(): boolean;

package/OnlineStorage.js

@@ -2,7 +2,6 @@ import { MessageBus } from "./MessageBus/MessageBus";
 import { CreateCommand, ExistsCommand, RemoveCommand } from "./Messages/AddDirCommand";
 import { MoveCommand } from "./Messages/MoveCommand";
 import { LoginQuery } from "./Messages/LoginQuery";
-import { RegisterCommand } from "./Messages/RegisterCommand";
 export class OnlineStorage {
     database;
     ANONYMOUS_USER = { Id: "Anonymous" };
@@ -18,18 +17,30 @@ 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);
+    }
+    WasAnonymousUserEverLoaded() {
+        // console.log( "aaaaAAA", this.user.Privileges)
+        return (this.User.Id === this.ANONYMOUS_USER.Id && this.user.Privileges !== undefined);
+    }
+    async InitOnce() {
+        // console.log("INIT", this.WasAnonymousUserEverLoaded());
+        if (this.WasAnonymousUserEverLoaded()) {
+            // console.log("INIT RETURN WasAnonymousUserEverLoaded()=true");
+            return;
+        }
+        this.user = await this.Login("Anonymous"); // TODO: Tutaj można my zrobić dedykowaną metode do pobierania ustawień użytkownika Anonymous
     }
     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);
             }
         }
     }
@@ -37,6 +48,7 @@ export class OnlineStorage {
         return this.user;
     }
     async Login(password) {
+        // console.log("LOGIN", password);
         const result = await this._bus.SendMessage(new LoginQuery(this.DatabaseDir, password));
         if (!result.IsSuccess) {
             throw new Error(`Could not login: ${result.ErrorMessage}`);
@@ -44,7 +56,8 @@ export class OnlineStorage {
         this.user = result.Result || this.ANONYMOUS_USER;
         this.SetUser(this.user);
         this.SaveUserInLocalStorage();
-        this.CallOnUserChanged();
+        this.CallOnUserChanged(false);
+        // console.log("USER LOGIN", this.user);
         return this.user;
     }
     SaveUserInLocalStorage() {
@@ -54,25 +67,36 @@ export class OnlineStorage {
     }
     OnUserChange(handler) {
         this.onUserChange.push(handler);
-        handler(this.user, this.IsAuthorized);
+        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));
-        if (!result.IsSuccess) {
-            throw new Error(`Could not register: ${result.ErrorMessage}`);
-        }
-        const user = result.Result;
-        return user;
-    }
+    //
+    // UWAGA!!!!!!!!!! TAK NIE MOŻNA REJESTROWAĆ Privileges!!!!!! TO MUSI SIĘ ODBYWAĆ PRZEZ INNĄ METODE ALBO INNY MECHANIZM!!!!!!!
+    // Użytkownik nie może sam sobie nadawać uprawnień xddd
+    //
+    //
+    // public async Register(id: string, role: string, name: string,
+    // 	login: string, password: string, email: string,
+    // 	privileges: IStorageUserPrivileges,
+    // 	icon?: string, tags?: string[]): Promise<IStorageUser>
+    // {
+    // 	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}`);
+    // 	}
+    // 	const user = result.Result as IStorageUser;
+    // 	return user;
+    // }
     Logout() {
         this.SetUser(this.ANONYMOUS_USER);
         this.SaveUserInLocalStorage();
-        this.CallOnUserChanged();
+        this.CallOnUserChanged(false);
         return this;
     }
-    CallOnUserChanged() {
-        this.onUserChange.forEach(handler => handler(this.user, this.IsAuthorized));
+    CallOnUserChanged(appStart) {
+        this.onUserChange.forEach(handler => handler(this.user, this.IsAuthorized, appStart));
     }
     get IsAuthorized() {
         return this.user.Id !== this.ANONYMOUS_USER.Id;

package/package.json

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