@spinajs/rbac 2.0.185 → 2.0.187

package/lib/mjs/models/User.d.ts

@@ -1,28 +1,12 @@
 import { DateTime } from 'luxon';
-import { ModelBase, Relation, OneToManyRelationList, QueryScope, ISelectQueryBuilder } from '@spinajs/orm';
-import { Permission } from 'accesscontrol';
+import { ModelBase, QueryScope, ISelectQueryBuilder, MetadataRelation } from '@spinajs/orm';
+import { AccessControl, Permission } from 'accesscontrol';
 import { UserMetadata } from './UserMetadata.js';
-import { UserAction } from './UserTimeline.js';
-declare class UserMetadataRelation extends OneToManyRelationList<UserMetadata, User> {
-    /**
-     *
-     * Checks if metadata exists, its DB first, it will only check DB for existence
-     *
-     * @param key - key to find
-     * @returns {true|false}
-     */
-    exists(key: string): Promise<boolean>;
-    /**
-     *
-     * Deletes meta from DB
-     *
-     * @param key - meta key do delete or regexp
-     */
-    delete(key: string): Promise<void>;
-    get(key: string): Promise<any>;
-    [index: string]: any;
-}
 export declare class UserQueryScopes implements QueryScope {
+    whereUser(this: ISelectQueryBuilder<User[]> & UserQueryScopes, userOrEmail: User | string): ISelectQueryBuilder<User[]> & UserQueryScopes;
+    checkIsBanned(this: ISelectQueryBuilder<User[]> & UserQueryScopes): Promise<boolean>;
+    checkIsActive(this: ISelectQueryBuilder<User[]> & UserQueryScopes): Promise<boolean>;
+    notDeleted(this: ISelectQueryBuilder<User[]> & UserQueryScopes): ISelectQueryBuilder<User[]> & UserQueryScopes;
     /**
      *
      * Fetch users that are not banned, are active & email confirmed, not deleted
@@ -30,7 +14,40 @@ export declare class UserQueryScopes implements QueryScope {
      */
     isActiveUser(this: ISelectQueryBuilder<User[]> & UserQueryScopes): ISelectQueryBuilder<User[]> & UserQueryScopes;
     whereEmail(this: ISelectQueryBuilder<User[]> & UserQueryScopes, email: string): ISelectQueryBuilder<User[]> & UserQueryScopes;
-    whereLogin(this: ISelectQueryBuilder<User[]> & UserQueryScopes, email: string): ISelectQueryBuilder<User[]> & UserQueryScopes;
+    whereLogin(this: ISelectQueryBuilder<User[]> & UserQueryScopes, login: string): ISelectQueryBuilder<User[]> & UserQueryScopes;
+    whereUuid(this: ISelectQueryBuilder<User[]> & UserQueryScopes, uuid: string): ISelectQueryBuilder<User[]> & UserQueryScopes;
+    /**
+     * Tries to get user by ONE OF:
+     *  - UUID
+     *  - EMAIL
+     *  - LOGIN
+     *  - ID
+     *
+     * @param identifier - login ,email, uuid or id
+     * @returns
+     */
+    whereAnything(this: ISelectQueryBuilder<User[] | User> & UserQueryScopes, identifier: string | number): ISelectQueryBuilder<User | User[]> & UserQueryScopes;
+}
+/**
+ * Common user metadata keys
+ */
+export declare enum USER_COMMON_METADATA {
+    /** BAN RELATED META KEYS  */
+    USER_BAN_IS_BANNED = "user:ban:is_banned",
+    USER_BAN_START_DATE = "user:ban:start_date",
+    USER_BAN_DURATION = "user:ban:duration",
+    USER_BAN_REASON = "user:ban:reason",
+    /** USER GENERAL INFO */
+    USER_AVATAR = "user:avatar",
+    USER_PHONE = "user:phone",
+    USER_NEWSLETTER_ENABLED = "user:newsletter:enabled",
+    /** 2fa token */
+    USER_2FA_TOKEN = "user:2fa:token",
+    /** Reset password */
+    USER_PWD_RESET = "user:pwd:reset",
+    USER_PWD_RESET_START_DATE = "user:pwd_reset:start_date",
+    USER_PWD_RESET_WAIT_TIME = "user:pwd_reset:wait_time",
+    USER_PWD_RESET_TOKEN = "user:pwd_reset:token"
 }
 /**
  * Base model for users used by auth and ACL system
@@ -38,7 +55,13 @@ export declare class UserQueryScopes implements QueryScope {
  * To add / extend fields simply extend this model and register as default user model in ACL service
  */
 export declare class User extends ModelBase {
+    /**
+     * By default should not return password & id
+     * Id - to not expose internal id and predict users id / count
+     * Instead id should be replaced with uuid when exposing to end user / app
+     */
     protected _hidden: string[];
+    protected _ac: AccessControl;
     static readonly _queryScopes: UserQueryScopes;
     constructor(data?: Partial<User>);
     Id: number;
@@ -52,7 +75,6 @@ export declare class User extends ModelBase {
      * Displayed name ( for others to see )
      */
     Login: string;
-    IsBanned: boolean;
     /**
      * User role
      */
@@ -72,31 +94,75 @@ export declare class User extends ModelBase {
     LastLoginAt: DateTime;
     /**
      * Account is fully active (eg. passed registration)
+     * Do not use it to ban users, active user still can have banned status
      */
     IsActive: boolean;
     /**
      * User additional information. Can be anything
      */
-    Metadata: UserMetadataRelation;
-    Actions: Relation<UserAction, User>;
+    Metadata: MetadataRelation<UserMetadata, User>;
     get IsGuest(): boolean;
+    get IsBanned(): boolean;
     can(resource: string, permission: string): Permission;
     /**
-     * Shorthand for check if user can read any resource
+     * Shorthand for check if user can read any of specified resource
      * @param resource
      * @returns
      */
     canReadAny(resource: string): Permission;
+    /**
+     * Shortcut for check if user can read own resource
+     *
+     * @param resource
+     * @returns
+     */
     canReadOwn(resource: string): Permission;
+    /**
+     * Shortcut for check if user can update any resource
+     *
+     * @param resource
+     * @returns
+     */
     canUpdateAny(resource: string): Permission;
+    /**
+     * Shortcut for check if user can update own resource
+     * @param resource
+     * @returns
+     */
     canUpdateOwn(resource: string): Permission;
+    /**
+     * Shortcut for check if user can delete any resource
+     * @param resource
+     * @returns
+     */
     canDeleteAny(resource: string): Permission;
+    /**
+     * Shourtcut for check if user can delete own resource
+     * @param resource
+     * @returns
+     */
     canDeleteOwn(resource: string): Permission;
+    /**
+     * Shortcut for check if user can create any resource
+     * @param resource
+     * @returns
+     */
     canCreateAny(resource: string): Permission;
+    /**
+     * Shourtcut for check if user can create own resource
+     * @param resource
+     * @returns
+     */
     canCreateOwn(resource: string): Permission;
     static getByLogin(login: string): Promise<User>;
     static getByEmail(email: string): Promise<User>;
     static getByUuid(uuid: string): Promise<User>;
+    /**
+     * Tries to get user by any identifier
+     *
+     * @param identifier login, email, id or uuid
+     * @returns
+     */
+    static getByAnything(identifier: string | number): Promise<User>;
 }
-export {};
 //# sourceMappingURL=User.d.ts.map

package/lib/mjs/models/User.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../../src/models/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,SAAS,EAA8D,QAAQ,EAAwB,qBAAqB,EAAuB,UAAU,EAAmB,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnO,OAAO,EAAiB,UAAU,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG/C,cAAM,oBAAqB,SAAQ,qBAAqB,CAAC,YAAY,EAAE,IAAI,CAAC;IAC1E;;;;;;OAMG;IACU,MAAM,CAAC,GAAG,EAAE,MAAM;IAO/B;;;;;OAKG;IACU,MAAM,CAAC,GAAG,EAAE,MAAM;IASlB,GAAG,CAAC,GAAG,EAAE,MAAM;IAoB5B,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAkDD,qBAAa,eAAgB,YAAW,UAAU;IAChD;;;;OAIG;IACI,YAAY,CAAC,IAAI,EAAE,mBAAmB,CAAC,IAAI,EAAE,CAAC,GAAG,eAAe;IAOhE,UAAU,CAAC,IAAI,EAAE,mBAAmB,CAAC,IAAI,EAAE,CAAC,GAAG,eAAe,EAAE,KAAK,EAAE,MAAM;IAM7E,UAAU,CAAC,IAAI,EAAE,mBAAmB,CAAC,IAAI,EAAE,CAAC,GAAG,eAAe,EAAE,KAAK,EAAE,MAAM;CAKrF;AAED;;;;GAIG;AACH,qBAEa,IAAK,SAAQ,SAAS;IACjC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAsB;IAEjD,gBAAuB,YAAY,EAAE,eAAe,CAAyB;gBAE1D,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC;IAShC,EAAE,EAAE,MAAM,CAAC;IAGX,IAAI,EAAE,MAAM,CAAC;IAEb,KAAK,EAAE,MAAM,CAAC;IAErB;;OAEG;IACI,QAAQ,EAAE,MAAM,CAAC;IAExB;;OAEG;IACI,KAAK,EAAE,MAAM,CAAC;IAEd,QAAQ,EAAE,OAAO,CAAC;IAEzB;;OAEG;IACI,IAAI,EAAE,MAAM,EAAE,CAAC;IAEtB;;OAEG;IAEI,SAAS,EAAE,QAAQ,CAAC;IAE3B;;OAEG;IAEI,YAAY,EAAE,QAAQ,CAAC;IAE9B;;OAEG;IAEI,SAAS,EAAE,QAAQ,CAAC;IAGpB,WAAW,EAAE,QAAQ,CAAC;IAE7B;;OAEG;IACI,QAAQ,EAAE,OAAO,CAAC;IAEzB;;OAEG;IAII,QAAQ,EAAE,oBAAoB,CAAC;IAG/B,OAAO,EAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IAE3C,IAAW,OAAO,IAAI,OAAO,CAE5B;IAEM,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,UAAU;IAK5D;;;;OAIG;IACI,UAAU,CAAC,QAAQ,EAAE,MAAM;IAG3B,UAAU,CAAC,QAAQ,EAAE,MAAM;IAI3B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAI7B,YAAY,CAAC,QAAQ,EAAE,MAAM;WAItB,UAAU,CAAC,KAAK,EAAE,MAAM;WAIxB,UAAU,CAAC,KAAK,EAAE,MAAM;WAIxB,SAAS,CAAC,IAAI,EAAE,MAAM;CAOrC"}
+{"version":3,"file":"User.d.ts","sourceRoot":"","sources":["../../../src/models/User.ts"],"names":[],"mappings":"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"}

package/lib/mjs/models/User.js

@@ -9,97 +9,38 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var User_1;
 import { DateTime } from 'luxon';
-import { ModelBase, Primary, Connection, Model, CreatedAt, SoftDelete, HasMany, Relation, Uuid, DateTime as DT, OneToManyRelationList, InsertBehaviour } from '@spinajs/orm';
+import { ModelBase, Primary, Connection, Model, Set, CreatedAt, SoftDelete, HasMany, Uuid, DateTime as DT, MetadataRelation, RawQuery } from '@spinajs/orm';
 import { DI } from '@spinajs/di';
 import { UserMetadata } from './UserMetadata.js';
-import { UserAction } from './UserTimeline.js';
 import { v4 as uuidv4 } from 'uuid';
-class UserMetadataRelation extends OneToManyRelationList {
-    /**
-     *
-     * Checks if metadata exists, its DB first, it will only check DB for existence
-     *
-     * @param key - key to find
-     * @returns {true|false}
-     */
-    async exists(key) {
-        return await UserMetadata.where({
-            User: this.owner,
-            Key: key,
-        }).resultExists();
+import { _check_arg, _gt, _non_nil, _is_email, _non_empty, _trim, _is_number, _or, _is_string, _to_int, _default, _is_uuid, _is_object } from '@spinajs/util';
+import { _cfg } from '@spinajs/configuration';
+export class UserQueryScopes {
+    whereUser(userOrEmail) {
+        _check_arg(_or(_is_object(_non_nil()), _is_string(_trim(), _non_empty())))(userOrEmail, 'userOrEmail');
+        return this.where('Email', userOrEmail instanceof User ? userOrEmail.Email : userOrEmail);
     }
-    /**
-     *
-     * Deletes meta from DB
-     *
-     * @param key - meta key do delete or regexp
-     */
-    async delete(key) {
-        await UserMetadata.destroy().where({
-            Key: key,
-            User: this.owner.Id,
-        });
+    async checkIsBanned() {
+        const banned = await this.clearColumns()
+            .count('*', 'BannedCount')
+            .setAlias('banned_count')
+            .whereExist(UserMetadata.query().where(function () {
+            this.where('Key', USER_COMMON_METADATA.USER_BAN_IS_BANNED);
+            this.where('Value', 'true');
+            this.where(new RawQuery('user_id = banned_count.Id'));
+        }))
+            .asRaw();
+        return banned[0].BannedCount > 0;
+    }
+    async checkIsActive() {
+        const active = await this.clearColumns().count('*', 'ActiveCount').where('IsActive', true).asRaw();
+        return active[0].ActiveCount > 0;
     }
-    async get(key) {
-        const found = this.find((x) => x.Key === key);
-        if (found) {
-            return found.Value;
-        }
-        return await UserMetadata.where({
-            User: this.owner,
-            Key: key,
-        })
-            .first()
-            .then((res) => {
-            if (res) {
-                return res.Value;
-            }
-            return null;
+    notDeleted() {
+        return this.where({
+            DeletedAt: null,
         });
     }
-}
-function UserMetadataRelationFactory(model, desc, container) {
-    const repository = container.resolve(UserMetadataRelation, [model, desc.TargetModel, desc, []]);
-    const proxy = {
-        set: (target, prop, value) => {
-            if (target[prop]) {
-                return (target[prop] = value);
-            }
-            return (async () => {
-                const userMeta = new UserMetadata();
-                userMeta.User.Value = model;
-                userMeta.Key = prop;
-                userMeta.Value = value;
-                await UserMetadata.insert(userMeta, InsertBehaviour.InsertOrUpdate);
-            })();
-        },
-        get: (target, prop) => {
-            if (target[prop]) {
-                return target[prop];
-            }
-            return (async () => {
-                // check for metadata entries
-                const found = target.find((x) => x.Key === prop);
-                if (found) {
-                    return found.Value;
-                }
-                return await UserMetadata.where({
-                    User: model,
-                    Key: prop,
-                })
-                    .first()
-                    .then((res) => {
-                    if (res) {
-                        return res.Value;
-                    }
-                    return null;
-                });
-            })();
-        },
-    };
-    return new Proxy(repository, proxy);
-}
-export class UserQueryScopes {
     /**
      *
      * Fetch users that are not banned, are active & email confirmed, not deleted
@@ -112,16 +53,68 @@ export class UserQueryScopes {
         });
     }
     whereEmail(email) {
+        email = _check_arg(_trim(), _non_empty(), _is_email())(email, 'email');
         return this.where({
             Email: email,
         });
     }
-    whereLogin(email) {
+    whereLogin(login) {
+        login = _check_arg(_trim(), _non_empty())(login, 'login');
         return this.where({
-            Email: email,
+            Login: login,
+        });
+    }
+    whereUuid(uuid) {
+        uuid = _check_arg(_trim(), _is_uuid())(uuid, 'uuid');
+        return this.where({
+            Uuid: uuid,
+        });
+    }
+    /**
+     * Tries to get user by ONE OF:
+     *  - UUID
+     *  - EMAIL
+     *  - LOGIN
+     *  - ID
+     *
+     * @param identifier - login ,email, uuid or id
+     * @returns
+     */
+    whereAnything(identifier) {
+        identifier = _check_arg(_or(_is_number(_gt(0)), _to_int(), _is_string(_trim(), _non_empty())))(identifier, 'identifier');
+        return this.when(typeof identifier === 'number', function () {
+            this.where('Id', identifier);
+        }, function () {
+            this.where('Uuid', identifier).orWhere('Email', identifier).orWhere('Login', identifier);
         });
     }
 }
+/**
+ * Common user metadata keys
+ */
+export var USER_COMMON_METADATA;
+(function (USER_COMMON_METADATA) {
+    /** BAN RELATED META KEYS  */
+    USER_COMMON_METADATA["USER_BAN_IS_BANNED"] = "user:ban:is_banned";
+    USER_COMMON_METADATA["USER_BAN_START_DATE"] = "user:ban:start_date";
+    USER_COMMON_METADATA["USER_BAN_DURATION"] = "user:ban:duration";
+    USER_COMMON_METADATA["USER_BAN_REASON"] = "user:ban:reason";
+    /** USER GENERAL INFO */
+    USER_COMMON_METADATA["USER_AVATAR"] = "user:avatar";
+    USER_COMMON_METADATA["USER_PHONE"] = "user:phone";
+    USER_COMMON_METADATA["USER_NEWSLETTER_ENABLED"] = "user:newsletter:enabled";
+    /** 2fa token */
+    USER_COMMON_METADATA["USER_2FA_TOKEN"] = "user:2fa:token";
+    /** Reset password */
+    // is reset password in progress
+    USER_COMMON_METADATA["USER_PWD_RESET"] = "user:pwd:reset";
+    // start date of reset password
+    USER_COMMON_METADATA["USER_PWD_RESET_START_DATE"] = "user:pwd_reset:start_date";
+    // wait time for reset password
+    USER_COMMON_METADATA["USER_PWD_RESET_WAIT_TIME"] = "user:pwd_reset:wait_time";
+    // reset password token
+    USER_COMMON_METADATA["USER_PWD_RESET_TOKEN"] = "user:pwd_reset:token";
+})(USER_COMMON_METADATA || (USER_COMMON_METADATA = {}));
 /**
  * Base model for users used by auth and ACL system
  *
@@ -130,59 +123,113 @@ export class UserQueryScopes {
 let User = User_1 = class User extends ModelBase {
     constructor(data) {
         super(data);
+        /**
+         * By default should not return password & id
+         * Id - to not expose internal id and predict users id / count
+         * Instead id should be replaced with uuid when exposing to end user / app
+         */
         this._hidden = ['Password', 'Id'];
-        if (this.Uuid === undefined) {
-            this.Uuid = uuidv4();
-        }
+        this.Uuid = _check_arg(_default(uuidv4()))(this.Uuid, 'uuid');
+        this.Role = _check_arg(_default([_cfg('rbac.defaultRole')()]))(this.Role, 'role');
+        this._ac = DI.get('AccessControl');
     }
     get IsGuest() {
         return this.Role.indexOf('guest') !== -1 || this.Role.length === 0;
     }
+    get IsBanned() {
+        return this.Metadata[USER_COMMON_METADATA.USER_BAN_IS_BANNED] === true;
+    }
     can(resource, permission) {
-        const ac = DI.get('AccessControl');
-        return ac.can(this.Role)[permission](resource);
+        resource = _check_arg(_trim(), _non_empty())(resource, 'resource');
+        permission = _check_arg(_trim(), _non_empty())(permission, 'permission');
+        return this._ac.can(this.Role)[permission](resource);
     }
     /**
-     * Shorthand for check if user can read any resource
+     * Shorthand for check if user can read any of specified resource
      * @param resource
      * @returns
      */
     canReadAny(resource) {
         return this.can(resource, 'readAny');
     }
+    /**
+     * Shortcut for check if user can read own resource
+     *
+     * @param resource
+     * @returns
+     */
     canReadOwn(resource) {
         return this.can(resource, 'readOwn');
     }
+    /**
+     * Shortcut for check if user can update any resource
+     *
+     * @param resource
+     * @returns
+     */
     canUpdateAny(resource) {
         return this.can(resource, 'updateAny');
     }
+    /**
+     * Shortcut for check if user can update own resource
+     * @param resource
+     * @returns
+     */
     canUpdateOwn(resource) {
         return this.can(resource, 'updateOwn');
     }
+    /**
+     * Shortcut for check if user can delete any resource
+     * @param resource
+     * @returns
+     */
     canDeleteAny(resource) {
         return this.can(resource, 'deleteAny');
     }
+    /**
+     * Shourtcut for check if user can delete own resource
+     * @param resource
+     * @returns
+     */
     canDeleteOwn(resource) {
         return this.can(resource, 'deleteOwn');
     }
+    /**
+     * Shortcut for check if user can create any resource
+     * @param resource
+     * @returns
+     */
     canCreateAny(resource) {
         return this.can(resource, 'createAny');
     }
+    /**
+     * Shourtcut for check if user can create own resource
+     * @param resource
+     * @returns
+     */
     canCreateOwn(resource) {
         return this.can(resource, 'createOwn');
     }
     static getByLogin(login) {
+        login = _check_arg(_trim(), _non_empty())(login, 'login');
         return User_1.query().whereLogin(login).first();
     }
     static getByEmail(email) {
+        email = _check_arg(_trim(), _non_empty(), _is_email())(email, 'email');
         return User_1.query().whereEmail(email).first();
     }
     static getByUuid(uuid) {
-        return User_1.query()
-            .where({
-            Uuid: uuid,
-        })
-            .first();
+        uuid = _check_arg(_trim(), _is_uuid())(uuid, 'uuid');
+        return User_1.query().whereUuid(uuid).first();
+    }
+    /**
+     * Tries to get user by any identifier
+     *
+     * @param identifier login, email, id or uuid
+     * @returns
+     */
+    static getByAnything(identifier) {
+        return User_1.query().whereAnything(identifier).first();
     }
 };
 User._queryScopes = new UserQueryScopes();
@@ -194,6 +241,10 @@ __decorate([
     Uuid(),
     __metadata("design:type", String)
 ], User.prototype, "Uuid", void 0);
+__decorate([
+    Set(),
+    __metadata("design:type", Array)
+], User.prototype, "Role", void 0);
 __decorate([
     CreatedAt(),
     __metadata("design:type", DateTime)
@@ -211,15 +262,9 @@ __decorate([
     __metadata("design:type", DateTime)
 ], User.prototype, "LastLoginAt", void 0);
 __decorate([
-    HasMany(UserMetadata, {
-        factory: UserMetadataRelationFactory,
-    }),
-    __metadata("design:type", UserMetadataRelation)
+    HasMany(UserMetadata),
+    __metadata("design:type", MetadataRelation)
 ], User.prototype, "Metadata", void 0);
-__decorate([
-    HasMany(UserAction),
-    __metadata("design:type", Relation)
-], User.prototype, "Actions", void 0);
 User = User_1 = __decorate([
     Connection('default'),
     Model('users'),

package/lib/mjs/models/User.js.map

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

package/lib/mjs/models/UserMetadata.d.ts

@@ -1,10 +1,6 @@
-import { ModelBase, SingleRelation } from '@spinajs/orm';
+import { MetadataModel, SingleRelation } from '@spinajs/orm';
 import type { User } from './User.js';
-export declare class UserMetadata extends ModelBase {
-    Id: number;
-    Key: string;
-    Type: 'number' | 'float' | 'string' | 'json' | 'boolean' | 'datetime';
-    Value: any;
+export declare class UserMetadata extends MetadataModel<UserMetadata> {
     User: SingleRelation<User>;
 }
 //# sourceMappingURL=UserMetadata.d.ts.map

package/lib/mjs/models/UserMetadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserMetadata.d.ts","sourceRoot":"","sources":["../../../src/models/UserMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,SAAS,EAAW,cAAc,EAAsB,MAAM,cAAc,CAAC;AAEpH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,qBAEa,YAAa,SAAQ,SAAS;IAElC,EAAE,EAAE,MAAM,CAAC;IAEX,GAAG,EAAE,MAAM,CAAC;IAEZ,IAAI,EAAE,QAAQ,GAAG,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IAGtE,KAAK,EAAE,GAAG,CAAC;IAGX,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;CACnC"}
+{"version":3,"file":"UserMetadata.d.ts","sourceRoot":"","sources":["../../../src/models/UserMetadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE3F,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,qBAEa,YAAa,SAAQ,aAAa,CAAC,YAAY,CAAC;IAEpD,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;CACnC"}

package/lib/mjs/models/UserMetadata.js

@@ -7,17 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { BelongsTo, Connection, Model, ModelBase, Primary, SingleRelation, UniversalConverter } from '@spinajs/orm';
-let UserMetadata = class UserMetadata extends ModelBase {
+import { BelongsTo, Connection, Model, MetadataModel, SingleRelation } from '@spinajs/orm';
+let UserMetadata = class UserMetadata extends MetadataModel {
 };
-__decorate([
-    Primary(),
-    __metadata("design:type", Number)
-], UserMetadata.prototype, "Id", void 0);
-__decorate([
-    UniversalConverter('Type'),
-    __metadata("design:type", Object)
-], UserMetadata.prototype, "Value", void 0);
 __decorate([
     BelongsTo('User'),
     __metadata("design:type", SingleRelation)

package/lib/mjs/models/UserMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserMetadata.js","sourceRoot":"","sources":["../../../src/models/UserMetadata.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAM7G,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,SAAS;CAa1C,CAAA;AAXQ;IADN,OAAO,EAAE;;wCACQ;AAOX;IADN,kBAAkB,CAAC,MAAM,CAAC;;2CACT;AAGX;IADN,SAAS,CAAC,MAAM,CAAC;8BACL,cAAc;0CAAO;AAZvB,YAAY;IAFxB,UAAU,CAAC,SAAS,CAAC;IACrB,KAAK,CAAC,gBAAgB,CAAC;GACX,YAAY,CAaxB"}
+{"version":3,"file":"UserMetadata.js","sourceRoot":"","sources":["../../../src/models/UserMetadata.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAMpF,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,aAA2B;CAG5D,CAAA;AADQ;IADN,SAAS,CAAC,MAAM,CAAC;8BACL,cAAc;0CAAO;AAFvB,YAAY;IAFxB,UAAU,CAAC,SAAS,CAAC;IACrB,KAAK,CAAC,gBAAgB,CAAC;GACX,YAAY,CAGxB"}

package/lib/mjs/session.d.ts

@@ -3,7 +3,7 @@ import { SessionProvider, ISession } from './interfaces.js';
 /**
  * Session base class
  */
-export declare class Session implements ISession {
+export declare class UserSession implements ISession {
     protected SessionExpirationTime: number;
     SessionId: string;
     /**

package/lib/mjs/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAM5D;;GAEG;AACH,qBACa,OAAQ,YAAW,QAAQ;IAEtC,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAEjC,SAAS,EAAE,MAAM,CAAY;IAEpC;;OAEG;IACI,UAAU,EAAE,QAAQ,CAAQ;IAE5B,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IAEvC,QAAQ,EAAE,QAAQ,CAAkB;gBAE/B,OAAO,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IAMvC;;;;OAIG;IACI,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM;CAG/B;AAED;;GAEG;AACH,qBACa,kBAAmB,SAAQ,eAAe,CAAC,QAAQ,CAAC;IAC/D,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAA+B;IAE3D,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAYpD,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxC,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAWhF"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAM5D;;GAEG;AACH,qBACa,WAAY,YAAW,QAAQ;IAE1C,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAEjC,SAAS,EAAE,MAAM,CAAY;IAEpC;;OAEG;IACI,UAAU,EAAE,QAAQ,CAAQ;IAE5B,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAa;IAEvC,QAAQ,EAAE,QAAQ,CAAkB;gBAE/B,OAAO,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC;IAMvC;;;;OAIG;IACI,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM;CAG/B;AAED;;GAEG;AACH,qBACa,kBAAmB,SAAQ,eAAe,CAAC,QAAQ,CAAC;IAC/D,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAA+B;IAE3D,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAIzB,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAYpD,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxC,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAWhF"}