@spinajs/rbac 1.2.211 → 2.0.12

package/lib/auth.js

@@ -23,12 +23,7 @@ let SimpleDbAuthProvider = class SimpleDbAuthProvider {
     }
     async authenticate(email, password) {
         const pwd = this.Container.resolve(interfaces_1.PasswordProvider);
-        const result = await User_1.User.where({
-            Email: email,
-        })
-            .andWhere('DeletedAt', null)
-            .populate('Metadata')
-            .first();
+        const result = await User_1.User.where({ Email: email, DeletedAt: null }).first();
         if (!result) {
             return null;
         }

package/lib/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8D;AAC9D,wCAAqC;AACrC,oCAA4E;AAG5E,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAIxB,KAAK,CAAC,MAAM,CAAC,IAAmB;QACrC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,YAAY,WAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3F,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,QAAgB;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,6BAAgB,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC;YAC9B,KAAK,EAAE,KAAK;SACb,CAAC;aACC,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC;aAC3B,QAAQ,CAAC,UAAU,CAAC;aACpB,KAAK,EAAE,CAAC;QAEX,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE;YACT,OAAO,MAAM,CAAC;SACf;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA/BC;IADC,IAAA,eAAU,EAAC,cAAS,CAAC;;uDACU;AAFrB,oBAAoB;IADhC,IAAA,eAAU,EAAC,yBAAY,CAAC;GACZ,oBAAoB,CAiChC;AAjCY,oDAAoB"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8D;AAC9D,wCAAqC;AACrC,oCAA4E;AAG5E,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAIxB,KAAK,CAAC,MAAM,CAAC,IAAmB;QACrC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,YAAY,WAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3F,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,QAAgB;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,6BAAgB,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAE3E,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,IAAI,CAAC;SACb;QAED,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1D,IAAI,KAAK,EAAE;YACT,OAAO,MAAM,CAAC;SACf;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA1BC;IADC,IAAA,eAAU,EAAC,cAAS,CAAC;;uDACU;AAFrB,oBAAoB;IADhC,IAAA,eAAU,EAAC,yBAAY,CAAC;GACZ,oBAAoB,CA4BhC;AA5BY,oDAAoB"}

package/lib/interfaces.d.ts

@@ -1,32 +1,30 @@
 import { User } from './models/User';
 import { AsyncModule } from '@spinajs/di';
 import { DateTime } from 'luxon';
-export interface UserSessionData {
+export interface ISession {
     /**
      * Session identifier
      */
-    SessionId?: string;
+    SessionId: string;
     /**
      * Expiration date. After that date session is invalid
      */
-    Expiration: DateTime;
+    Expiration?: DateTime;
     /**
      * Session creation date. After that date session is invalid
      */
-    Creation?: DateTime;
+    Creation: DateTime;
     /**
      * Data holds by session
      */
-    Data: any;
-}
-export interface UserSession extends UserSessionData {
+    Data: Map<string, unknown>;
     /**
      *
      * Extends session lifetime
      *
-     * @param minutes  - how mutch to extend
+     * @param minutes  - how mutch to extend, if value not provided, default value from config is used
      */
-    extend(minutes: number): void;
+    extend(minutes?: number): void;
 }
 /**
  * Service used for generating random password & for hash raw string
@@ -56,33 +54,26 @@ export declare abstract class AuthProvider<U = User> {
     abstract exists(user: U): Promise<boolean>;
     abstract authenticate(email: string, password: string): Promise<U>;
 }
-export declare abstract class SessionProvider<T = UserSession> extends AsyncModule {
+export declare abstract class SessionProvider<T = ISession> extends AsyncModule {
     /**
      *
      * Load session from store. If not exists or expired returns null
      *
      * @param sessionId - session identifier
      */
-    abstract restoreSession(sessionId: string): Promise<T>;
+    abstract restore(sessionId: string): Promise<T>;
     /**
      *
      * Deletes session from store
      *
      * @param sessionId - session to delete
      */
-    abstract deleteSession(sessionId: string): Promise<void>;
+    abstract delete(sessionId: string): Promise<void>;
     /**
      *
      * Adds or updates session in store
      *
      * @param session - session to update / insert
      */
-    abstract updateSession(session: UserSession): Promise<void>;
-    /**
-     *
-     * Extends session expiration time. Extension is set in acl.session.expiration (in seconds)
-     *
-     * @param sessionId - session to refres
-     */
-    abstract refreshSession(sessionId: string | UserSession): Promise<void>;
+    abstract save(session: ISession): Promise<void>;
 }

package/lib/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AACA,oCAA0C;AAmC1C;;GAEG;AACH,MAAsB,gBAAgB;CAsBrC;AAtBD,4CAsBC;AAED,MAAsB,YAAY;CAIjC;AAJD,oCAIC;AAED,MAAsB,eAAiC,SAAQ,gBAAW;CAgCzE;AAhCD,0CAgCC"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AACA,oCAA0C;AAiC1C;;GAEG;AACH,MAAsB,gBAAgB;CAsBrC;AAtBD,4CAsBC;AAED,MAAsB,YAAY;CAIjC;AAJD,oCAIC;AAED,MAAsB,eAA8B,SAAQ,gBAAW;CAwBtE;AAxBD,0CAwBC"}

package/lib/migrations/RBACInitial_2022_06_28_01_13_00.js

@@ -12,25 +12,23 @@ const orm_1 = require("@spinajs/orm");
 let RBACInitial_2022_06_28_01_13_00 = class RBACInitial_2022_06_28_01_13_00 extends orm_1.OrmMigration {
     async up(connection) {
         await connection.schema().createTable('users', (table) => {
-            table.int('Id').autoIncrement().primaryKey();
-            table.string('Login', 64).unique().notNull();
+            table.int('Id').primaryKey().autoIncrement();
             table.string('Email', 64).unique().notNull();
             table.string('Password', 128).notNull();
-            table.string('NiceName', 64).notNull();
-            table.string('Role', 64).notNull();
+            table.string('Login', 64).notNull();
+            table.string('Role', 256).notNull();
             table.dateTime('RegisteredAt');
-            table.dateTime('CreatedAt').notNull();
+            table.dateTime('CreatedAt').notNull().default().dateTime();
             table.dateTime('DeletedAt');
         });
-        await connection.schema().createTable('user_metadatas', (table) => {
-            table.int('Id').autoIncrement().primaryKey();
+        await connection.schema().createTable('users_metadata', (table) => {
             table.string('Key', 255).notNull();
             table.text('Value').notNull();
             table.int('user_id').notNull();
             table.foreignKey('user_id').references('users', 'Id').cascade();
         });
-        await connection.index().unique().table('users').name('users_email_idx').columns(['Email']);
-        await connection.index().unique().table('user_metadatas').name('owner_user_meta_key_idx').columns(['user_id', 'Key']);
+        await connection.index().unique().table('users_metadata').name('owner_user_meta_key_idx').columns(['user_id', 'Key']);
+        await connection.index().unique().table('users').name('user_login_idx').columns(['Login']);
     }
     // tslint:disable-next-line: no-empty
     // eslint-disable-next-line @typescript-eslint/no-empty-function

package/lib/migrations/RBACInitial_2022_06_28_01_13_00.js.map

@@ -1 +1 @@
-{"version":3,"file":"RBACInitial_2022_06_28_01_13_00.js","sourceRoot":"","sources":["../../src/migrations/RBACInitial_2022_06_28_01_13_00.ts"],"names":[],"mappings":";;;;;;;;;AAAA,sDAAsD;AACtD,sCAAkE;AAGlE,IAAa,+BAA+B,GAA5C,MAAa,+BAAgC,SAAQ,kBAAY;IACxD,KAAK,CAAC,EAAE,CAAC,UAAqB;QACnC,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACvD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC,UAAU,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YACxC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YACvC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YACnC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC/B,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;YACtC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAChE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC,UAAU,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAC/B,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QAE5F,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;IACxH,CAAC;IAED,qCAAqC;IACrC,gEAAgE;IACzD,KAAK,CAAC,IAAI,CAAC,WAAsB,IAAkB,CAAC;CAC5D,CAAA;AA9BY,+BAA+B;IAD3C,IAAA,eAAS,EAAC,SAAS,CAAC;GACR,+BAA+B,CA8B3C;AA9BY,0EAA+B"}
+{"version":3,"file":"RBACInitial_2022_06_28_01_13_00.js","sourceRoot":"","sources":["../../src/migrations/RBACInitial_2022_06_28_01_13_00.ts"],"names":[],"mappings":";;;;;;;;;AAAA,sDAAsD;AACtD,sCAAkE;AAGlE,IAAa,+BAA+B,GAA5C,MAAa,+BAAgC,SAAQ,kBAAY;IACxD,KAAK,CAAC,EAAE,CAAC,UAAqB;QACnC,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACvD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YACxC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YACpC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YACpC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;YAC/B,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC3D,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAChE,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAC/B,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACtH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED,qCAAqC;IACrC,gEAAgE;IACzD,KAAK,CAAC,IAAI,CAAC,WAAsB,IAAkB,CAAC;CAC5D,CAAA;AA3BY,+BAA+B;IAD3C,IAAA,eAAS,EAAC,SAAS,CAAC;GACR,+BAA+B,CA2B3C;AA3BY,0EAA+B"}

package/lib/models/User.d.ts

@@ -7,29 +7,29 @@ import { UserMetadata } from './UserMetadata';
  * To add / extend fields simply extend this model and register as default user model in ACL service
  */
 export declare class User extends ModelBase {
+    protected _hidden: string[];
     Id: number;
     Email: string;
-    Login: string;
     /**
      * Hashed password for user
      */
     Password: string;
-    /**
-     * Registration date. User is registered when clicked confirmation link sended to provided email.
-     */
-    RegisteredAt: DateTime;
     /**
      * Displayed name ( for others to see )
      */
-    NiceName: string;
+    Login: string;
     /**
      * User role
      */
-    Role: string;
+    Role: string[];
     /**
      * User creation date
      */
     CreatedAt: DateTime;
+    /**
+     * Registration date. User is registered when clicked confirmation link sended to provided email.
+     */
+    RegisteredAt: DateTime;
     /**
      * User deletion date
      */
@@ -38,4 +38,5 @@ export declare class User extends ModelBase {
      * User additional information. Can be anything
      */
     Metadata: Relation<UserMetadata>;
+    can(resource: string, permission: string): any;
 }

package/lib/models/User.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
 const luxon_1 = require("luxon");
 const orm_1 = require("@spinajs/orm");
+const di_1 = require("@spinajs/di");
 const UserMetadata_1 = require("./UserMetadata");
 /**
  * Base modele for users used by ACL
@@ -19,6 +20,14 @@ const UserMetadata_1 = require("./UserMetadata");
  * To add / extend fields simply extend this model and register as default user model in ACL service
  */
 let User = class User extends orm_1.ModelBase {
+    constructor() {
+        super(...arguments);
+        this._hidden = ['Password'];
+    }
+    can(resource, permission) {
+        const ac = di_1.DI.get('AccessControl');
+        return ac.can(this.Role)[permission](resource);
+    }
 };
 __decorate([
     (0, orm_1.Primary)(),

package/lib/models/User.js.map

@@ -1 +1 @@
-{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,sCAA+G;AAC/G,iDAA8C;AAE9C;;;;GAIG;AAGH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,eAAS;CA6ClC,CAAA;AA3CC;IADC,IAAA,aAAO,GAAE;;gCACQ;AA8BlB;IADC,IAAA,eAAS,GAAE;8BACM,gBAAQ;uCAAC;AAM3B;IADC,IAAA,gBAAU,GAAE;8BACK,gBAAQ;uCAAC;AAM3B;IADC,IAAA,aAAO,EAAC,2BAAY,CAAC;8BACL,cAAQ;sCAAe;AA5C7B,IAAI;IAFhB,IAAA,gBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,WAAK,EAAC,OAAO,CAAC;GACF,IAAI,CA6ChB;AA7CY,oBAAI"}
+{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,sCAA+G;AAE/G,oCAAiC;AACjC,iDAA8C;AAE9C;;;;GAIG;AAGH,IAAa,IAAI,GAAjB,MAAa,IAAK,SAAQ,eAAS;IAAnC;;QACY,YAAO,GAAa,CAAC,UAAU,CAAC,CAAC;IAiD7C,CAAC;IAJQ,GAAG,CAAC,QAAgB,EAAE,UAAkB;QAC7C,MAAM,EAAE,GAAG,OAAE,CAAC,GAAG,CAAgB,eAAe,CAAC,CAAC;QAClD,OAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC;CACF,CAAA;AA9CC;IADC,IAAA,aAAO,GAAE;;gCACQ;AAuBlB;IADC,IAAA,eAAS,GAAE;8BACM,gBAAQ;uCAAC;AAW3B;IADC,IAAA,gBAAU,GAAE;8BACK,gBAAQ;uCAAC;AAM3B;IADC,IAAA,aAAO,EAAC,2BAAY,CAAC;8BACL,cAAQ;sCAAe;AA5C7B,IAAI;IAFhB,IAAA,gBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,WAAK,EAAC,OAAO,CAAC;GACF,IAAI,CAkDhB;AAlDY,oBAAI"}

package/lib/models/UserMetadata.d.ts

@@ -1,6 +1,8 @@
-import { ModelBase } from '@spinajs/orm';
+import { ModelBase, SingleRelation } from '@spinajs/orm';
+import type { User } from './User';
 export declare class UserMetadata extends ModelBase {
     Id: number;
     Key: string;
     Value: string;
+    User: SingleRelation<User>;
 }

package/lib/models/UserMetadata.js

@@ -17,9 +17,13 @@ __decorate([
     (0, orm_1.Primary)(),
     __metadata("design:type", Number)
 ], UserMetadata.prototype, "Id", void 0);
+__decorate([
+    (0, orm_1.BelongsTo)('User'),
+    __metadata("design:type", orm_1.SingleRelation)
+], UserMetadata.prototype, "User", void 0);
 UserMetadata = __decorate([
     (0, orm_1.Connection)('default'),
-    (0, orm_1.Model)('user_metadatas')
+    (0, orm_1.Model)('users_metadata')
 ], UserMetadata);
 exports.UserMetadata = UserMetadata;
 //# sourceMappingURL=UserMetadata.js.map

package/lib/models/UserMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserMetadata.js","sourceRoot":"","sources":["../../src/models/UserMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAqE;AAIrE,IAAa,YAAY,GAAzB,MAAa,YAAa,SAAQ,eAAS;CAO1C,CAAA;AALC;IADC,IAAA,aAAO,GAAE;;wCACQ;AAFP,YAAY;IAFxB,IAAA,gBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,WAAK,EAAC,gBAAgB,CAAC;GACX,YAAY,CAOxB;AAPY,oCAAY"}
+{"version":3,"file":"UserMetadata.js","sourceRoot":"","sources":["../../src/models/UserMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAgG;AAKhG,IAAa,YAAY,GAAzB,MAAa,YAAa,SAAQ,eAAS;CAU1C,CAAA;AARC;IADC,IAAA,aAAO,GAAE;;wCACQ;AAOlB;IADC,IAAA,eAAS,EAAC,MAAM,CAAC;8BACL,oBAAc;0CAAO;AATvB,YAAY;IAFxB,IAAA,gBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,WAAK,EAAC,gBAAgB,CAAC;GACX,YAAY,CAUxB;AAVY,oCAAY"}

package/lib/session.d.ts

@@ -1,32 +1,33 @@
 import { DateTime } from 'luxon';
-import { SessionProvider, UserSession, UserSessionData } from './interfaces';
+import { SessionProvider, ISession } from './interfaces';
 import { Configuration } from '@spinajs/configuration';
 /**
  * Session base class
  */
-export declare class Session implements UserSession {
+export declare class Session implements ISession {
     protected SessionExpirationTime: number;
     SessionId: string;
+    /**
+     * Expiration time for session, if null it does not expire
+     */
     Expiration: DateTime;
-    Data: any;
+    Data: Map<string, unknown>;
     Creation: DateTime;
-    constructor(data?: UserSessionData);
+    constructor(session?: Partial<ISession>);
     /**
      * Extends lifetime of session
      *
-     * @param minutes - hom mutch to extend
+     * @param seconds - hom mutch to extend
      */
-    extend(minutes: number): void;
+    extend(seconds?: number): void;
 }
 /**
- * Simple session storage in memory
+ * Simple session storage in memory, for testing or rapid prototyping
  */
-export declare class MemorySessionStore<T = UserSession> extends SessionProvider<T> {
+export declare class MemorySessionStore extends SessionProvider<ISession> {
     protected Configuration: Configuration;
-    protected Sessions: Map<string, UserSession>;
-    restoreSession(sessionId: string): Promise<T>;
-    resolveAsync(): Promise<void>;
-    deleteSession(sessionId: string): Promise<void>;
-    updateSession(session: UserSession): Promise<void>;
-    refreshSession(sessionId: string): Promise<void>;
+    protected Sessions: Map<string, ISession>;
+    restore(sessionId: string): Promise<ISession | null>;
+    delete(sessionId: string): Promise<void>;
+    save(session: ISession): Promise<void>;
 }

package/lib/session.js

@@ -19,28 +19,25 @@ const uuid_1 = require("uuid");
  * Session base class
  */
 let Session = class Session {
-    constructor(data) {
-        if (data) {
-            Object.assign(this, data);
-        }
-        if (!this.SessionId) {
-            this.SessionId = (0, uuid_1.v4)();
-        }
+    constructor(session) {
+        this.SessionId = (0, uuid_1.v4)();
         /**
-         * always extend session time
+         * Expiration time for session, if null it does not expire
          */
-        this.Expiration = luxon_1.DateTime.now().plus({ minutes: this.SessionExpirationTime });
-        if (!this.Creation) {
-            this.Creation = luxon_1.DateTime.now();
+        this.Expiration = null;
+        this.Data = new Map();
+        this.Creation = luxon_1.DateTime.now();
+        if (session) {
+            Object.assign(this, session);
         }
     }
     /**
      * Extends lifetime of session
      *
-     * @param minutes - hom mutch to extend
+     * @param seconds - hom mutch to extend
      */
-    extend(minutes) {
-        this.Expiration.plus({ minutes });
+    extend(seconds) {
+        this.Expiration = luxon_1.DateTime.now().plus({ seconds: seconds ? seconds : this.SessionExpirationTime });
     }
 };
 __decorate([
@@ -53,40 +50,31 @@ Session = __decorate([
 ], Session);
 exports.Session = Session;
 /**
- * Simple session storage in memory
+ * Simple session storage in memory, for testing or rapid prototyping
  */
 let MemorySessionStore = class MemorySessionStore extends interfaces_1.SessionProvider {
     constructor() {
         super(...arguments);
         this.Sessions = new Map();
     }
-    async restoreSession(sessionId) {
+    async restore(sessionId) {
         if (this.Sessions.has(sessionId)) {
             const session = this.Sessions.get(sessionId);
-            if (session.Expiration <= luxon_1.DateTime.now()) {
-                this.deleteSession(session.SessionId);
-                return null;
+            if (!session.Expiration || session.Expiration > luxon_1.DateTime.now()) {
+                return session;
             }
-            return session;
+            return null;
         }
         return null;
     }
-    // tslint:disable-next-line: no-empty
-    async resolveAsync() { }
-    async deleteSession(sessionId) {
+    async delete(sessionId) {
         if (this.Sessions.has(sessionId)) {
             this.Sessions.delete(sessionId);
         }
     }
-    async updateSession(session) {
+    async save(session) {
         this.Sessions.set(session.SessionId, session);
     }
-    async refreshSession(sessionId) {
-        if (this.Sessions.has(sessionId)) {
-            const session = this.Sessions.get(sessionId);
-            session.extend(this.Configuration.get('acl.session.expiration', 10));
-        }
-    }
 };
 __decorate([
     (0, di_1.Autoinject)(),

package/lib/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,6CAA6E;AAC7E,oCAAkE;AAClE,0DAA+D;AAC/D,+BAAoC;AAEpC;;GAEG;AAEH,IAAa,OAAO,GAApB,MAAa,OAAO;IAYlB,YAAY,IAAsB;QAChC,IAAI,IAAI,EAAE;YACR,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;SAC3B;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,IAAA,SAAM,GAAE,CAAC;SAC3B;QAED;;WAEG;QACH,IAAI,CAAC,UAAU,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAE/E,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC;SAChC;IACH,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,OAAe;QAC3B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AArCC;IADC,IAAA,sBAAM,EAAC,yBAAyB,CAAC;;sDACM;AAF7B,OAAO;IADnB,IAAA,gBAAW,GAAE;;GACD,OAAO,CAuCnB;AAvCY,0BAAO;AAyCpB;;GAEG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAoC,SAAQ,4BAAkB;IAA3E;;QAIY,aAAQ,GAA6B,IAAI,GAAG,EAAuB,CAAC;IAqChF,CAAC;IAnCQ,KAAK,CAAC,cAAc,CAAC,SAAiB;QAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE7C,IAAI,OAAO,CAAC,UAAU,IAAI,gBAAQ,CAAC,GAAG,EAAE,EAAE;gBACxC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACtC,OAAO,IAAI,CAAC;aACb;YAED,OAAO,OAAc,CAAC;SACvB;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qCAAqC;IAC9B,KAAK,CAAC,YAAY,KAAI,CAAC;IAEvB,KAAK,CAAC,aAAa,CAAC,SAAiB;QAC1C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SACjC;IACH,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAoB;QAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,SAAiB;QAC3C,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAE7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,EAAE,EAAE,CAAC,CAAC,CAAC;SAC9E;IACH,CAAC;CACF,CAAA;AAvCC;IADC,IAAA,eAAU,GAAE;8BACY,6BAAa;yDAAC;AAF5B,kBAAkB;IAD9B,IAAA,eAAU,EAAC,4BAAe,CAAC;GACf,kBAAkB,CAyC9B;AAzCY,gDAAkB"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAiC;AACjC,6CAAyD;AACzD,oCAAkE;AAClE,0DAA+D;AAC/D,+BAAoC;AAEpC;;GAEG;AAEH,IAAa,OAAO,GAApB,MAAa,OAAO;IAelB,YAAY,OAA2B;QAXhC,cAAS,GAAW,IAAA,SAAM,GAAE,CAAC;QAEpC;;WAEG;QACI,eAAU,GAAa,IAAI,CAAC;QAE5B,SAAI,GAAyB,IAAI,GAAG,EAAE,CAAC;QAEvC,aAAQ,GAAa,gBAAQ,CAAC,GAAG,EAAE,CAAC;QAGzC,IAAI,OAAO,EAAE;YACX,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAC9B;IACH,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,OAAgB;QAC5B,IAAI,CAAC,UAAU,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;IACrG,CAAC;CACF,CAAA;AA3BC;IADC,IAAA,sBAAM,EAAC,yBAAyB,CAAC;;sDACM;AAF7B,OAAO;IADnB,IAAA,gBAAW,GAAE;;GACD,OAAO,CA6BnB;AA7BY,0BAAO;AA+BpB;;GAEG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,4BAAyB;IAAjE;;QAIY,aAAQ,GAA0B,IAAI,GAAG,EAAoB,CAAC;IAuB1E,CAAC;IArBQ,KAAK,CAAC,OAAO,CAAC,SAAiB;QACpC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAC7C,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,GAAG,gBAAQ,CAAC,GAAG,EAAE,EAAE;gBAC9D,OAAO,OAAO,CAAC;aAChB;YACD,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,SAAiB;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SACjC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAiB;QACjC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;CACF,CAAA;AAzBC;IADC,IAAA,eAAU,GAAE;8BACY,6BAAa;yDAAC;AAF5B,kBAAkB;IAD9B,IAAA,eAAU,EAAC,4BAAe,CAAC;GACf,kBAAkB,CA2B9B;AA3BY,gDAAkB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/rbac",
-  "version": "1.2.211",
+  "version": "2.0.12",
   "description": "Role and Attribute based Access Control for SpinaJS framework",
   "main": "lib/index.js",
   "private": false,
@@ -38,12 +38,12 @@
   },
   "homepage": "https://github.com/spinajs/main#readme",
   "dependencies": {
-    "@spinajs/configuration": "^1.2.211",
-    "@spinajs/di": "^1.2.211",
-    "@spinajs/exceptions": "^1.2.127",
-    "@spinajs/log": "^1.2.211",
-    "@spinajs/orm": "^1.2.211",
-    "@spinajs/reflection": "^1.2.211",
+    "@spinajs/configuration": "^2.0.12",
+    "@spinajs/di": "^2.0.12",
+    "@spinajs/exceptions": "^2.0.12",
+    "@spinajs/log": "^2.0.12",
+    "@spinajs/orm": "^2.0.12",
+    "@spinajs/reflection": "^2.0.12",
     "accesscontrol": "^2.2.1",
     "argon2": "^0.28.5",
     "entropy-string": "^4.2.0",
@@ -52,7 +52,7 @@
     "uuid": "^8.1.0"
   },
   "devDependencies": {
-    "@spinajs/orm-sqlite": "^1.2.211"
+    "@spinajs/orm-sqlite": "^2.0.12"
   },
-  "gitHead": "70d07e9437552855ac6c986465929a31ee49f5c3"
+  "gitHead": "d7910d799995df6fa9eb8174d4a9b65c81db8352"
 }