@spinajs/rbac 2.0.28 → 2.0.44

package/lib/interfaces.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SessionProvider = exports.AuthProvider = exports.PasswordProvider = void 0;
+exports.PasswordValidationProvider = exports.AthenticationErrorCodes = exports.SessionProvider = exports.FederatedAuthProvider = exports.AuthProvider = exports.PasswordProvider = void 0;
 const di_1 = require("@spinajs/di");
 /**
  * Service used for generating random password & for hash raw string
@@ -8,10 +8,39 @@ const di_1 = require("@spinajs/di");
 class PasswordProvider {
 }
 exports.PasswordProvider = PasswordProvider;
+/**
+ * Provides standard authentication based on login & password
+ *
+ * Unlike federated auth providers, it check local db for user,
+ * or some kind of other source
+ */
 class AuthProvider {
 }
 exports.AuthProvider = AuthProvider;
-class SessionProvider extends di_1.AsyncModule {
+/**
+ * Used for implementign authentication with external services
+ * eg. slack or facebook that uses openid or similar auth
+ *
+ * NOTE: it should only authorize user, it should not register new one if
+ * not exists in use DB.
+ */
+class FederatedAuthProvider {
+}
+exports.FederatedAuthProvider = FederatedAuthProvider;
+class SessionProvider extends di_1.AsyncService {
 }
 exports.SessionProvider = SessionProvider;
+var AthenticationErrorCodes;
+(function (AthenticationErrorCodes) {
+    AthenticationErrorCodes["E_USER_BANNED"] = "E_USER_BANNED";
+    AthenticationErrorCodes["E_USER_NOT_ACTIVE"] = "E_USER_NOT_ACTIVE";
+    AthenticationErrorCodes["E_INVALID_CREDENTIALS"] = "E_INVALID_CREDENTIALS";
+    AthenticationErrorCodes["E_LOGIN_ATTEMPTS_EXCEEDED"] = "E_LOGIN_ATTEMPTS_EXCEEDED";
+})(AthenticationErrorCodes = exports.AthenticationErrorCodes || (exports.AthenticationErrorCodes = {}));
+/**
+ * Interface to provide implementation of password rule validation
+ */
+class PasswordValidationProvider {
+}
+exports.PasswordValidationProvider = PasswordValidationProvider;
 //# sourceMappingURL=interfaces.js.map

package/lib/interfaces.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;AACA,oCAA2C;AAiC3C;;GAEG;AACH,MAAsB,gBAAgB;CAsBrC;AAtBD,4CAsBC;AAED;;;;;GAKG;AACH,MAAsB,YAAY;CAgEjC;AAhED,oCAgEC;AAED;;;;;;GAMG;AACH,MAAsB,qBAAqB;CAwB1C;AAxBD,sDAwBC;AAED,MAAsB,eAA8B,SAAQ,iBAAY;CAgDvE;AAhDD,0CAgDC;AAED,IAAY,uBAKX;AALD,WAAY,uBAAuB;IACjC,0DAA+B,CAAA;IAC/B,kEAAuC,CAAA;IACvC,0EAA+C,CAAA;IAC/C,kFAAuD,CAAA;AACzD,CAAC,EALW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAKlC;AA2BD;;GAEG;AACH,MAAsB,0BAA0B;CAE/C;AAFD,gEAEC"}

package/lib/jobs/UnbanUser.d.ts

@@ -0,0 +1,9 @@
+import { Log } from '@spinajs/log';
+import { QueueClient, QueueJob } from '@spinajs/queue';
+export declare class UnbanUser extends QueueJob {
+    UserUUID: string;
+    protected Log: Log;
+    protected Queue: QueueClient;
+    constructor(UserUUID: string);
+    execute(): Promise<void>;
+}

package/lib/jobs/UnbanUser.js

@@ -0,0 +1,44 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnbanUser = void 0;
+const di_1 = require("@spinajs/di");
+const log_1 = require("@spinajs/log");
+const queue_1 = require("@spinajs/queue");
+const events_1 = require("../events");
+const User_1 = require("../models/User");
+let UnbanUser = class UnbanUser extends queue_1.QueueJob {
+    constructor(UserUUID) {
+        super();
+        this.UserUUID = UserUUID;
+    }
+    async execute() {
+        const user = await User_1.User.where('Id', this.UserUUID).orWhere('Uuid', this.UserUUID).firstOrThrow(new Error('User not found'));
+        user.IsBanned = false;
+        await user.update();
+        await user.Metadata.delete(/user:ban.*/);
+        await this.Queue.emit(new events_1.UserUnbanned(this.UserUUID));
+    }
+};
+__decorate([
+    (0, log_1.Logger)('rbac'),
+    __metadata("design:type", log_1.Log)
+], UnbanUser.prototype, "Log", void 0);
+__decorate([
+    (0, di_1.Autoinject)(queue_1.QueueClient),
+    __metadata("design:type", queue_1.QueueClient)
+], UnbanUser.prototype, "Queue", void 0);
+UnbanUser = __decorate([
+    (0, queue_1.Job)(),
+    __metadata("design:paramtypes", [String])
+], UnbanUser);
+exports.UnbanUser = UnbanUser;
+//# sourceMappingURL=UnbanUser.js.map

package/lib/jobs/UnbanUser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UnbanUser.js","sourceRoot":"","sources":["../../src/jobs/UnbanUser.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAyC;AACzC,sCAA2C;AAC3C,0CAA4D;AAC5D,sCAAyC;AACzC,yCAAsC;AAGtC,IAAa,SAAS,GAAtB,MAAa,SAAU,SAAQ,gBAAQ;IAOrC,YAAmB,QAAgB;QACjC,KAAK,EAAE,CAAC;QADS,aAAQ,GAAR,QAAQ,CAAQ;IAEnC,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,MAAM,IAAI,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC5H,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;QAEtB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,qBAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzD,CAAC;CACF,CAAA;AAjBC;IADC,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;sCAAC;AAGnB;IADC,IAAA,eAAU,EAAC,mBAAW,CAAC;8BACP,mBAAW;wCAAC;AALlB,SAAS;IADrB,IAAA,WAAG,GAAE;;GACO,SAAS,CAmBrB;AAnBY,8BAAS"}

package/lib/messages/ChangedProperties.d.ts

@@ -0,0 +1,6 @@
+import { QueueMessage } from '@spinajs/queue';
+export declare class UserPropertyChangedMessage extends QueueMessage {
+    Uuid: string;
+    Property: string;
+    Value: any;
+}

package/lib/messages/ChangedProperties.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserPropertyChangedMessage = void 0;
+const queue_1 = require("@spinajs/queue");
+class UserPropertyChangedMessage extends queue_1.QueueMessage {
+}
+exports.UserPropertyChangedMessage = UserPropertyChangedMessage;
+//# sourceMappingURL=ChangedProperties.js.map

package/lib/messages/ChangedProperties.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ChangedProperties.js","sourceRoot":"","sources":["../../src/messages/ChangedProperties.ts"],"names":[],"mappings":";;;AAAA,0CAA8C;AAC9C,MAAa,0BAA2B,SAAQ,oBAAY;CAM3D;AAND,gEAMC"}

package/lib/messages/NewUser.d.ts

@@ -0,0 +1,14 @@
+import { QueueMessage } from '@spinajs/queue';
+import { DateTime } from 'luxon';
+import { User } from '../models/User';
+export declare class NewUserMessage extends QueueMessage {
+    Uuid: string;
+    Email: string;
+    Login: string;
+    Role: string[];
+    UserCreatedAt: DateTime;
+    IsBanned: boolean;
+    IsActive: boolean;
+    Metadata: Map<string, any>;
+    constructor(user: User, channel: string);
+}

package/lib/messages/NewUser.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NewUserMessage = void 0;
+const queue_1 = require("@spinajs/queue");
+class NewUserMessage extends queue_1.QueueMessage {
+    constructor(user, channel) {
+        super(channel);
+        this.Metadata = new Map();
+        this.Email = user.Email;
+        this.Login = user.Login;
+        this.Role = user.Role;
+        this.UserCreatedAt = user.CreatedAt;
+        this.IsBanned = user.IsBanned;
+        this.IsActive = user.IsActive;
+        for (const m of user.Metadata) {
+            this.Metadata.set(m.Key, m.Value);
+        }
+    }
+}
+exports.NewUserMessage = NewUserMessage;
+//# sourceMappingURL=NewUser.js.map

package/lib/messages/NewUser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NewUser.js","sourceRoot":"","sources":["../../src/messages/NewUser.ts"],"names":[],"mappings":";;;AAAA,0CAA8C;AAG9C,MAAa,cAAe,SAAQ,oBAAY;IAiB9C,YAAY,IAAU,EAAE,OAAe;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QAHV,aAAQ,GAAqB,IAAI,GAAG,EAAe,CAAC;QAKzD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAE9B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC;CACF;AA/BD,wCA+BC"}

package/lib/messages/UserActivated.d.ts

@@ -0,0 +1,7 @@
+import { QueueMessage } from '@spinajs/queue';
+import { User } from '../models/User';
+export declare class UserActivatedMessage extends QueueMessage {
+    Uuid: string;
+    Active: boolean;
+    constructor(user: User, channel: string);
+}

package/lib/messages/UserActivated.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserActivatedMessage = void 0;
+const queue_1 = require("@spinajs/queue");
+class UserActivatedMessage extends queue_1.QueueMessage {
+    constructor(user, channel) {
+        super(channel);
+        this.Active = user.IsActive;
+        this.Uuid = user.Uuid;
+    }
+}
+exports.UserActivatedMessage = UserActivatedMessage;
+//# sourceMappingURL=UserActivated.js.map

package/lib/messages/UserActivated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserActivated.js","sourceRoot":"","sources":["../../src/messages/UserActivated.ts"],"names":[],"mappings":";;;AAAA,0CAA8C;AAE9C,MAAa,oBAAqB,SAAQ,oBAAY;IAKpD,YAAY,IAAU,EAAE,OAAe;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AAXD,oDAWC"}

package/lib/messages/UserBanned.d.ts

@@ -0,0 +1,7 @@
+import { QueueMessage } from '@spinajs/queue';
+import { User } from '../models/User';
+export declare class UserBannedMessage extends QueueMessage {
+    Uuid: string;
+    Banned: boolean;
+    constructor(user: User, channel: string);
+}

package/lib/messages/UserBanned.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UserBannedMessage = void 0;
+const queue_1 = require("@spinajs/queue");
+class UserBannedMessage extends queue_1.QueueMessage {
+    constructor(user, channel) {
+        super(channel);
+        this.Banned = user.IsBanned;
+        this.Uuid = user.Uuid;
+    }
+}
+exports.UserBannedMessage = UserBannedMessage;
+//# sourceMappingURL=UserBanned.js.map

package/lib/messages/UserBanned.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserBanned.js","sourceRoot":"","sources":["../../src/messages/UserBanned.ts"],"names":[],"mappings":";;;AAAA,0CAA8C;AAE9C,MAAa,iBAAkB,SAAQ,oBAAY;IAKjD,YAAY,IAAU,EAAE,OAAe;QACrC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;CACF;AAXD,8CAWC"}

package/lib/middleware.d.ts

@@ -0,0 +1,4 @@
+import { QueryBuilder, QueryMiddleware } from '@spinajs/orm';
+export declare class RbacModelPermissionMiddleware extends QueryMiddleware {
+    afterQueryCreation(builder: QueryBuilder): void;
+}

package/lib/middleware.js

@@ -0,0 +1,23 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RbacModelPermissionMiddleware = void 0;
+const di_1 = require("@spinajs/di");
+const orm_1 = require("@spinajs/orm");
+let RbacModelPermissionMiddleware = class RbacModelPermissionMiddleware extends orm_1.QueryMiddleware {
+    afterQueryCreation(builder) {
+        if (builder instanceof orm_1.SelectQueryBuilder) {
+            //builder.Model.
+        }
+    }
+};
+RbacModelPermissionMiddleware = __decorate([
+    (0, di_1.Injectable)(orm_1.QueryMiddleware)
+], RbacModelPermissionMiddleware);
+exports.RbacModelPermissionMiddleware = RbacModelPermissionMiddleware;
+//# sourceMappingURL=middleware.js.map

package/lib/middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oCAAyC;AACzC,sCAAiF;AAGjF,IAAa,6BAA6B,GAA1C,MAAa,6BAA8B,SAAQ,qBAAe;IAChE,kBAAkB,CAAC,OAAqB;QACtC,IAAI,OAAO,YAAY,wBAAkB,EAAE;YACzC,gBAAgB;SACjB;IACH,CAAC;CACF,CAAA;AANY,6BAA6B;IADzC,IAAA,eAAU,EAAC,qBAAe,CAAC;GACf,6BAA6B,CAMzC;AANY,sEAA6B"}

package/lib/migrations/RBACInitial_2022_06_28_01_13_00.js

@@ -13,20 +13,36 @@ let RBACInitial_2022_06_28_01_13_00 = class RBACInitial_2022_06_28_01_13_00 exte
     async up(connection) {
         await connection.schema().createTable('users', (table) => {
             table.int('Id').primaryKey().autoIncrement();
+            table.uuid('Uuid').notNull();
             table.string('Email', 64).unique().notNull();
             table.string('Password', 128).notNull();
             table.string('Login', 64).notNull();
-            table.string('Role', 256).notNull();
+            table.string('Role', 256).notNull().default().value('guest');
+            table.boolean('IsBanned').notNull().default().value(0);
+            table.boolean('IsActive').notNull().default().value(0);
             table.dateTime('RegisteredAt');
             table.dateTime('CreatedAt').notNull().default().dateTime();
             table.dateTime('DeletedAt');
+            table.dateTime('LastLoginAt');
         });
         await connection.schema().createTable('users_metadata', (table) => {
             table.string('Key', 255).notNull();
+            table.enum('Type', ['number', 'float', 'string', 'json', 'boolean', 'datetime']).notNull();
             table.text('Value').notNull();
             table.int('user_id').notNull();
             table.foreignKey('user_id').references('users', 'Id').cascade();
         });
+        await connection.schema().createTable('user_actions', (table) => {
+            table.int('Id').primaryKey().autoIncrement();
+            table.string('Action', 255).notNull();
+            table.boolean('Persistent').notNull().default().value(0);
+            table.int('ResourceId');
+            table.text('Data');
+            table.dateTime('CreatedAt').notNull().default().dateTime();
+            table.int('user_id').notNull();
+            table.foreignKey('user_id').references('users', 'Id').cascade();
+        });
+        await connection.index().unique().table('users').name('user_uuid_idx').columns(['Uuid']);
         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']);
     }

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,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"}
+{"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":"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"}

package/lib/models/User.d.ts

@@ -1,14 +1,44 @@
+import { ISelectQueryBuilder } from './../../../orm/lib/interfaces.d';
 import { DateTime } from 'luxon';
-import { ModelBase, Relation } from '@spinajs/orm';
+import { ModelBase, Relation, OneToManyRelationList, QueryScope } from '@spinajs/orm';
 import { UserMetadata } from './UserMetadata';
+import { UserAction } from './UserTimeline';
+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 | RegExp): Promise<boolean>;
+    /**
+     *
+     * Deletes meta from DB
+     *
+     * @param key - meta key do delete or regexp
+     */
+    delete(key: string | RegExp): Promise<void>;
+    [index: string]: any;
+}
+export declare class UserQueryScopes implements QueryScope {
+    /**
+     *
+     * Fetch users that are not banned, are active & email confirmed, not deleted
+     *
+     */
+    isActiveUser(this: ISelectQueryBuilder<User>): ISelectQueryBuilder<User>;
+}
 /**
- * Base modele for users used by ACL
+ * Base model for users used by auth and ACL system
  *
  * 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[];
+    static readonly _queryScopes: UserQueryScopes;
     Id: number;
+    Uuid: string;
     Email: string;
     /**
      * Hashed password for user
@@ -34,9 +64,17 @@ export declare class User extends ModelBase {
      * User deletion date
      */
     DeletedAt: DateTime;
+    LastLoginAt: DateTime;
+    IsBanned: boolean;
+    /**
+     * Account is fully active (eg. passed registration)
+     */
+    IsActive: boolean;
     /**
      * User additional information. Can be anything
      */
-    Metadata: Relation<UserMetadata>;
+    Metadata: UserMetadataRelation;
+    Actions: Relation<UserAction, User>;
     can(resource: string, permission: string): any;
 }
+export {};

package/lib/models/User.js

@@ -9,42 +9,177 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.User = void 0;
+exports.User = exports.UserQueryScopes = void 0;
 const luxon_1 = require("luxon");
 const orm_1 = require("@spinajs/orm");
 const di_1 = require("@spinajs/di");
 const UserMetadata_1 = require("./UserMetadata");
+const UserTimeline_1 = require("./UserTimeline");
+class UserMetadataRelation extends orm_1.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) {
+        let result = null;
+        if (key instanceof RegExp) {
+            result = await UserMetadata_1.UserMetadata.where({
+                User: this.owner,
+            }).andWhere('Key', 'rlike', key.source);
+        }
+        else {
+            result = await UserMetadata_1.UserMetadata.where({
+                User: this.owner,
+            }).andWhere('Key', key);
+        }
+        return result !== null && result !== undefined;
+    }
+    /**
+     *
+     * Deletes meta from DB
+     *
+     * @param key - meta key do delete or regexp
+     */
+    async delete(key) {
+        if (key instanceof RegExp) {
+            await UserMetadata_1.UserMetadata.destroy()
+                .where({
+                User: this.owner,
+            })
+                .andWhere('Key', 'rlike', key.source);
+        }
+        else {
+            await UserMetadata_1.UserMetadata.destroy().where({
+                Key: key,
+                User: this.owner,
+            });
+        }
+        // refresh meta
+        await this.populate();
+    }
+}
+function UserMetadataRelationFactory(model, desc, container) {
+    const repository = container.resolve(UserMetadataRelation, [model, desc.TargetModel, desc, []]);
+    const proxy = {
+        set: (target, prop, value) => {
+            // if we try to call method or prop that exists return it
+            if (target[prop]) {
+                return (target[prop] = value);
+            }
+            else {
+                const userMeta = new UserMetadata_1.UserMetadata();
+                userMeta.User.Value = model;
+                userMeta.Key = prop;
+                userMeta.Value = value;
+                UserMetadata_1.UserMetadata.insert(userMeta, orm_1.InsertBehaviour.InsertOrUpdate);
+                let meta = target.find((x) => x.Value === prop);
+                if (meta) {
+                    meta.Value = value;
+                }
+                else {
+                    target.push(userMeta);
+                }
+            }
+            return true;
+        },
+        get: (target, prop) => {
+            // if we try to call method or prop that exists return it
+            if (target[prop]) {
+                return target[prop];
+            }
+            else {
+                // check for metadata entries
+                const found = target.find((x) => x.Key === prop);
+                if (found) {
+                    return found.Value;
+                }
+                // if not found try to obtain it
+                // or return null
+                return UserMetadata_1.UserMetadata.where({
+                    User: model,
+                    Key: prop,
+                })
+                    .first()
+                    .then((res) => {
+                    if (res) {
+                        // add to this repo for cache
+                        target.push(res);
+                    }
+                    return res;
+                });
+            }
+        },
+    };
+    return new Proxy(repository, proxy);
+}
+class UserQueryScopes {
+    /**
+     *
+     * Fetch users that are not banned, are active & email confirmed, not deleted
+     *
+     */
+    isActiveUser() {
+        return this.where({
+            IsBanned: false,
+            IsActive: true,
+            DeletedAt: null,
+        });
+    }
+}
+exports.UserQueryScopes = UserQueryScopes;
 /**
- * Base modele for users used by ACL
+ * Base model for users used by auth and ACL system
  *
  * 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'];
+        this._hidden = ['Password', 'Id'];
     }
     can(resource, permission) {
         const ac = di_1.DI.get('AccessControl');
         return ac.can(this.Role)[permission](resource);
     }
 };
+User._queryScopes = new UserQueryScopes();
 __decorate([
     (0, orm_1.Primary)(),
     __metadata("design:type", Number)
 ], User.prototype, "Id", void 0);
+__decorate([
+    (0, orm_1.Uuid)(),
+    __metadata("design:type", String)
+], User.prototype, "Uuid", void 0);
 __decorate([
     (0, orm_1.CreatedAt)(),
     __metadata("design:type", luxon_1.DateTime)
 ], User.prototype, "CreatedAt", void 0);
+__decorate([
+    (0, orm_1.DateTime)(),
+    __metadata("design:type", luxon_1.DateTime)
+], User.prototype, "RegisteredAt", void 0);
 __decorate([
     (0, orm_1.SoftDelete)(),
     __metadata("design:type", luxon_1.DateTime)
 ], User.prototype, "DeletedAt", void 0);
 __decorate([
-    (0, orm_1.HasMany)(UserMetadata_1.UserMetadata),
-    __metadata("design:type", orm_1.Relation)
+    (0, orm_1.DateTime)(),
+    __metadata("design:type", luxon_1.DateTime)
+], User.prototype, "LastLoginAt", void 0);
+__decorate([
+    (0, orm_1.HasMany)(UserMetadata_1.UserMetadata, {
+        factory: UserMetadataRelationFactory,
+    }),
+    __metadata("design:type", UserMetadataRelation)
 ], User.prototype, "Metadata", void 0);
+__decorate([
+    (0, orm_1.HasMany)(UserTimeline_1.UserAction),
+    __metadata("design:type", orm_1.Relation)
+], User.prototype, "Actions", void 0);
 User = __decorate([
     (0, orm_1.Connection)('default'),
     (0, orm_1.Model)('users')

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

package/lib/models/UserMetadata.d.ts

@@ -1,8 +1,9 @@
 import { ModelBase, SingleRelation } from '@spinajs/orm';
 import type { User } from './User';
-export declare class UserMetadata extends ModelBase {
+export declare class UserMetadata extends ModelBase<UserMetadata> {
     Id: number;
     Key: string;
-    Value: string;
+    Type: 'number' | 'float' | 'string' | 'json' | 'boolean' | 'datetime';
+    Value: any;
     User: SingleRelation<User>;
 }

package/lib/models/UserMetadata.js

@@ -17,6 +17,10 @@ __decorate([
     (0, orm_1.Primary)(),
     __metadata("design:type", Number)
 ], UserMetadata.prototype, "Id", void 0);
+__decorate([
+    (0, orm_1.UniversalConverter)('Type'),
+    __metadata("design:type", Object)
+], UserMetadata.prototype, "Value", void 0);
 __decorate([
     (0, orm_1.BelongsTo)('User'),
     __metadata("design:type", orm_1.SingleRelation)

package/lib/models/UserMetadata.js.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"UserMetadata.js","sourceRoot":"","sources":["../../src/models/UserMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAoH;AAMpH,IAAa,YAAY,GAAzB,MAAa,YAAa,SAAQ,eAAuB;CAaxD,CAAA;AAXC;IADC,IAAA,aAAO,GAAE;;wCACQ;AAOlB;IADC,IAAA,wBAAkB,EAAC,MAAM,CAAC;;2CACT;AAGlB;IADC,IAAA,eAAS,EAAC,MAAM,CAAC;8BACL,oBAAc;0CAAO;AAZvB,YAAY;IAFxB,IAAA,gBAAU,EAAC,SAAS,CAAC;IACrB,IAAA,WAAK,EAAC,gBAAgB,CAAC;GACX,YAAY,CAaxB;AAbY,oCAAY"}

package/lib/models/UserTimeline.d.ts

@@ -0,0 +1,28 @@
+import { ModelBase, SingleRelation } from '@spinajs/orm';
+import { DateTime } from 'luxon';
+import type { User } from './User';
+/**
+ * Timeline table for storing user actions / interactions
+ * eg. login attempts, failed logins, resource deletions, alterations etc.
+ */
+export declare class UserAction extends ModelBase<UserAction> {
+    Id: number;
+    User: SingleRelation<User>;
+    Action: string;
+    Data: string;
+    /**
+     * True if this timeline event is persistent
+     * eg. we clear out login attempts older than 5 days
+     * but we want to save for eg. events related to payments
+     */
+    Persistent: boolean;
+    /**
+     * If action is performed on some kind of resource
+     * Here is stored this resource identifier or primary key in db
+     */
+    ResourceId: number;
+    asNumber(): number;
+    asFloat(): number;
+    asJsonObject<T = {}>(): T;
+    CreatedAt: DateTime;
+}