@spinajs/rbac 2.0.46 → 2.0.50

package/README.md

@@ -1,11 +1,11 @@
-# `rbac`
-
-> TODO: description
-
-## Usage
-
-```
-const rbac = require('rbac');
-
-// TODO: DEMONSTRATE API
-```
+# `rbac`
+
+> TODO: description
+
+## Usage
+
+```
+const rbac = require('rbac');
+
+// TODO: DEMONSTRATE API
+```

package/lib/auth.d.ts

@@ -1,5 +1,5 @@
-import { AuthProvider, IAuthenticationResult, PasswordProvider } from './interfaces';
-import { User } from './models/User';
+import { AuthProvider, IAuthenticationResult, PasswordProvider } from './interfaces.js';
+import { User } from './models/User.js';
 import { IContainer } from '@spinajs/di';
 export declare class SimpleDbAuthProvider implements AuthProvider<User> {
     protected Container: IContainer;
@@ -13,3 +13,4 @@ export declare class SimpleDbAuthProvider implements AuthProvider<User> {
     isActive(email: string): Promise<boolean>;
     isDeleted(email: string): Promise<boolean>;
 }
+//# sourceMappingURL=auth.d.ts.map

package/lib/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,YAAY,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACjH,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAyB,UAAU,EAAc,MAAM,aAAa,CAAC;AAG5E,qBACa,oBAAqB,YAAW,YAAY,CAAC,IAAI,CAAC;IAE7D,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IAGhC,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEhC,MAAM,CAAC,WAAW,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASpD,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAgDnF,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMzC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKzC,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAIxD"}

package/lib/auth.js

@@ -1,4 +1,3 @@
-"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);
@@ -8,37 +7,35 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SimpleDbAuthProvider = void 0;
-const interfaces_1 = require("./interfaces");
-const User_1 = require("./models/User");
-const di_1 = require("@spinajs/di");
-const configuration_1 = require("@spinajs/configuration");
+import { AthenticationErrorCodes, AuthProvider, PasswordProvider } from './interfaces.js';
+import { User } from './models/User.js';
+import { Autoinject, Container, Injectable } from '@spinajs/di';
+import { AutoinjectService } from '@spinajs/configuration';
 let SimpleDbAuthProvider = class SimpleDbAuthProvider {
     async exists(userOrEmail) {
-        const result = await User_1.User.where('Email', userOrEmail instanceof User_1.User ? userOrEmail.Email : userOrEmail).first();
+        const result = await User.where('Email', userOrEmail instanceof User ? userOrEmail.Email : userOrEmail).first();
         if (result) {
             return true;
         }
         return false;
     }
     async getByLogin(login) {
-        const result = await User_1.User.where('Login', login).first();
+        const result = await User.where('Login', login).first();
         return result;
     }
     async getByEmail(email) {
-        const result = await User_1.User.where('Email', email).first();
+        const result = await User.where('Email', email).first();
         return result;
     }
     async getByUUID(uuid) {
-        const result = await User_1.User.where('Uuid', uuid).first();
+        const result = await User.where('Uuid', uuid).first();
         return result;
     }
     async authenticate(email, password) {
-        const result = await User_1.User.where({ Email: email, DeletedAt: null }).first();
+        const result = await User.where({ Email: email, DeletedAt: null }).first();
         const eInvalidCredentials = {
             Error: {
-                Code: interfaces_1.AthenticationErrorCodes.E_INVALID_CREDENTIALS,
+                Code: AthenticationErrorCodes.E_INVALID_CREDENTIALS,
                 Message: 'Invalid user credentials, or user not exist.',
             },
         };
@@ -51,13 +48,16 @@ let SimpleDbAuthProvider = class SimpleDbAuthProvider {
         }
         const valid = await this.PasswordProvider.verify(result.Password, password);
         if (!valid) {
-            return Object.assign({ User: undefined }, eInvalidCredentials);
+            return {
+                User: undefined,
+                ...eInvalidCredentials,
+            };
         }
         if (result.IsBanned) {
             return {
                 User: result,
                 Error: {
-                    Code: interfaces_1.AthenticationErrorCodes.E_USER_BANNED,
+                    Code: AthenticationErrorCodes.E_USER_BANNED,
                 },
             };
         }
@@ -65,7 +65,7 @@ let SimpleDbAuthProvider = class SimpleDbAuthProvider {
             return {
                 User: result,
                 Error: {
-                    Code: interfaces_1.AthenticationErrorCodes.E_USER_NOT_ACTIVE,
+                    Code: AthenticationErrorCodes.E_USER_NOT_ACTIVE,
                 },
             };
         }
@@ -74,28 +74,28 @@ let SimpleDbAuthProvider = class SimpleDbAuthProvider {
         };
     }
     async isBanned(email) {
-        const result = await User_1.User.where({ Email: email, IsBanned: true }).first();
+        const result = await User.where({ Email: email, IsBanned: true }).first();
         return result !== null;
     }
     async isActive(email) {
-        const result = await User_1.User.where({ Email: email, IsActive: true }).first();
+        const result = await User.where({ Email: email, IsActive: true }).first();
         return result !== null;
     }
     async isDeleted(email) {
-        const result = await User_1.User.where('Email', email).whereNotNull('DeletedAt').first();
+        const result = await User.where('Email', email).whereNotNull('DeletedAt').first();
         return result !== null;
     }
 };
 __decorate([
-    (0, di_1.Autoinject)(di_1.Container),
+    Autoinject(Container),
     __metadata("design:type", Object)
 ], SimpleDbAuthProvider.prototype, "Container", void 0);
 __decorate([
-    (0, configuration_1.AutoinjectService)('rbac.password'),
-    __metadata("design:type", interfaces_1.PasswordProvider)
+    AutoinjectService('rbac.password'),
+    __metadata("design:type", PasswordProvider)
 ], SimpleDbAuthProvider.prototype, "PasswordProvider", void 0);
 SimpleDbAuthProvider = __decorate([
-    (0, di_1.Injectable)(interfaces_1.AuthProvider)
+    Injectable(AuthProvider)
 ], SimpleDbAuthProvider);
-exports.SimpleDbAuthProvider = SimpleDbAuthProvider;
+export { SimpleDbAuthProvider };
 //# sourceMappingURL=auth.js.map

package/lib/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8G;AAC9G,wCAAqC;AACrC,oCAA4E;AAC5E,0DAA2D;AAG3D,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAOxB,KAAK,CAAC,MAAM,CAAC,WAA0B;QAC5C,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,YAAY,WAAI,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,CAAC;QAChH,IAAI,MAAM,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAa;QACnC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,KAAa;QACnC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QACxD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,IAAY;QACjC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACtD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,QAAgB;QACvD,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3E,MAAM,mBAAmB,GAAG;YAC1B,KAAK,EAAE;gBACL,IAAI,EAAE,oCAAuB,CAAC,qBAAqB;gBACnD,OAAO,EAAE,8CAA8C;aACxD;SACF,CAAC;QAEF;;;WAGG;QACH,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,mBAAmB,CAAC;SAC5B;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,EAAE;YACV,uBACE,IAAI,EAAE,SAAS,IACZ,mBAAmB,EACtB;SACH;QAED,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE;oBACL,IAAI,EAAE,oCAAuB,CAAC,aAAa;iBAC5C;aACF,CAAC;SACH;QAED,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE;oBACL,IAAI,EAAE,oCAAuB,CAAC,iBAAiB;iBAChD;aACF,CAAC;SACH;QAED,OAAO;YACL,IAAI,EAAE,MAAM;SACb,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,KAAa;QACjC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAE1E,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,KAAa;QACjC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAC1E,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,KAAa;QAClC,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,KAAK,EAAE,CAAC;QAClF,OAAO,MAAM,KAAK,IAAI,CAAC;IACzB,CAAC;CACF,CAAA;AA5FC;IADC,IAAA,eAAU,EAAC,cAAS,CAAC;;uDACU;AAGhC;IADC,IAAA,iCAAiB,EAAC,eAAe,CAAC;8BACP,6BAAgB;8DAAC;AALlC,oBAAoB;IADhC,IAAA,eAAU,EAAC,yBAAY,CAAC;GACZ,oBAAoB,CA8FhC;AA9FY,oDAAoB"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}

package/lib/cli/ActivateUser.d.ts

@@ -6,3 +6,4 @@ export declare class ActivateUser extends CliCommand {
     protected Queue: QueueClient;
     execute(idOrUuid: string, active: boolean): Promise<void>;
 }
+//# sourceMappingURL=ActivateUser.d.ts.map

package/lib/cli/ActivateUser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ActivateUser.d.ts","sourceRoot":"","sources":["../../src/cli/ActivateUser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAK7D,qBAGa,YAAa,SAAQ,UAAU;IAE1C,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC;IAEhB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAavE"}

package/lib/cli/ActivateUser.js

@@ -1,4 +1,3 @@
-"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);
@@ -8,21 +7,19 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ActivateUser = void 0;
-const UserDeactivated_1 = require("./../events/UserDeactivated");
+import { UserDeactivated } from './../events/UserDeactivated.js';
 //import { UserBannedMessage } from './../messages/UserBanned';
-const Queue_1 = require("@spinajs/Queue");
-const log_1 = require("@spinajs/log");
-const cli_1 = require("@spinajs/cli");
-const di_1 = require("@spinajs/di");
-const User_1 = require("../models/User");
-const UserActivated_1 = require("../events/UserActivated");
-let ActivateUser = class ActivateUser extends cli_1.CliCommand {
+import { QueueClient } from '@spinajs/Queue';
+import { Log, Logger } from '@spinajs/log';
+import { Argument, CliCommand, Command } from '@spinajs/cli';
+import { Autoinject } from '@spinajs/di';
+import { User } from '../models/User.js';
+import { UserActivated } from '../events/UserActivated.js';
+let ActivateUser = class ActivateUser extends CliCommand {
     async execute(idOrUuid, active) {
-        const result = await User_1.User.update({ IsActive: active }).where('Id', idOrUuid).orWhere('Uuid', idOrUuid);
+        const result = await User.update({ IsActive: active }).where('Id', idOrUuid).orWhere('Uuid', idOrUuid);
         if (result.RowsAffected > 0) {
-            const event = active ? new UserActivated_1.UserActivated(idOrUuid) : new UserDeactivated_1.UserDeactivated(idOrUuid);
+            const event = active ? new UserActivated(idOrUuid) : new UserDeactivated(idOrUuid);
             this.Queue.emit(event);
             this.Log.success(`User activation status changed to ${active}`);
         }
@@ -32,17 +29,17 @@ let ActivateUser = class ActivateUser extends cli_1.CliCommand {
     }
 };
 __decorate([
-    (0, log_1.Logger)('rbac'),
-    __metadata("design:type", log_1.Log)
+    Logger('rbac'),
+    __metadata("design:type", Log)
 ], ActivateUser.prototype, "Log", void 0);
 __decorate([
-    (0, di_1.Autoinject)(Queue_1.QueueClient),
-    __metadata("design:type", Queue_1.QueueClient)
+    Autoinject(QueueClient),
+    __metadata("design:type", QueueClient)
 ], ActivateUser.prototype, "Queue", void 0);
 ActivateUser = __decorate([
-    (0, cli_1.Command)('rbac:user-activate', 'Sets active or inactive user'),
-    (0, cli_1.Argument)('idOrUuid', 'numeric id or uuid'),
-    (0, cli_1.Argument)('active', ' true / false', false, (opt) => (opt.toLowerCase() === 'true' ? true : false))
+    Command('rbac:user-activate', 'Sets active or inactive user'),
+    Argument('idOrUuid', 'numeric id or uuid'),
+    Argument('active', ' true / false', false, (opt) => (opt.toLowerCase() === 'true' ? true : false))
 ], ActivateUser);
-exports.ActivateUser = ActivateUser;
+export { ActivateUser };
 //# sourceMappingURL=ActivateUser.js.map

package/lib/cli/ActivateUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActivateUser.js","sourceRoot":"","sources":["../../src/cli/ActivateUser.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iEAA8D;AAC9D,+DAA+D;AAC/D,0CAA6C;AAC7C,sCAA2C;AAC3C,sCAA6D;AAC7D,oCAAyC;AACzC,yCAAsC;AACtC,2DAAwD;AAKxD,IAAa,YAAY,GAAzB,MAAa,YAAa,SAAQ,gBAAU;IAOnC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,MAAe;QACpD,MAAM,MAAM,GAAG,MAAM,WAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEvG,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE;YAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,6BAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,iCAAe,CAAC,QAAQ,CAAC,CAAC;YAEnF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEvB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAC;SACjE;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,QAAQ,QAAQ,CAAC,CAAC;SACrD;IACH,CAAC;CACF,CAAA;AAlBC;IADC,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;yCAAC;AAGnB;IADC,IAAA,eAAU,EAAC,mBAAW,CAAC;8BACP,mBAAW;2CAAC;AALlB,YAAY;IAHxB,IAAA,aAAO,EAAC,oBAAoB,EAAE,8BAA8B,CAAC;IAC7D,IAAA,cAAQ,EAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,IAAA,cAAQ,EAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;GAC9F,YAAY,CAoBxB;AApBY,oCAAY"}
+{"version":3,"file":"ActivateUser.js","sourceRoot":"","sources":["../../src/cli/ActivateUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,+DAA+D;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAKpD,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,UAAU;IAOnC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,MAAe;QACpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEvG,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE;YAC3B,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;YAEnF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEvB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,qCAAqC,MAAM,EAAE,CAAC,CAAC;SACjE;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,QAAQ,QAAQ,CAAC,CAAC;SACrD;IACH,CAAC;CACF,CAAA;AAnBC;IAAC,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;yCAAC;AAEnB;IAAC,UAAU,CAAC,WAAW,CAAC;8BACP,WAAW;2CAAC;AALlB,YAAY;IAHxB,OAAO,CAAC,oBAAoB,EAAE,8BAA8B,CAAC;IAC7D,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;GAC9F,YAAY,CAoBxB;SApBY,YAAY"}

package/lib/cli/BanUser.d.ts

@@ -6,3 +6,4 @@ export declare class BanUser extends CliCommand {
     protected Queue: QueueClient;
     execute(idOrUuid: string, ban: boolean, duration: number): Promise<void>;
 }
+//# sourceMappingURL=BanUser.d.ts.map

package/lib/cli/BanUser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"BanUser.d.ts","sourceRoot":"","sources":["../../src/cli/BanUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAQ7D,qBAIa,OAAQ,SAAQ,UAAU;IAErC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC;IAEhB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA8BtF"}

package/lib/cli/BanUser.js

@@ -1,4 +1,3 @@
-"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);
@@ -8,31 +7,29 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BanUser = void 0;
-const UserUnbanned_1 = require("./../events/UserUnbanned");
-const Queue_1 = require("@spinajs/Queue");
-const log_1 = require("@spinajs/log");
-const cli_1 = require("@spinajs/cli");
-const di_1 = require("@spinajs/di");
-const User_1 = require("../models/User");
-const UserBanned_1 = require("../events/UserBanned");
-const UserMetadata_1 = require("../models/UserMetadata");
-const UnbanUser_1 = require("../jobs/UnbanUser");
-const luxon_1 = require("luxon");
-let BanUser = class BanUser extends cli_1.CliCommand {
+import { UserUnbanned } from './../events/UserUnbanned.js';
+import { QueueClient } from '@spinajs/Queue';
+import { Log, Logger } from '@spinajs/log';
+import { Argument, CliCommand, Command } from '@spinajs/cli';
+import { Autoinject } from '@spinajs/di';
+import { User } from '../models/User.js';
+import { UserBanned } from '../events/UserBanned.js';
+import { UserMetadata } from '../models/UserMetadata.js';
+import { UnbanUser } from '../jobs/UnbanUser.js';
+import { DateTime } from 'luxon';
+let BanUser = class BanUser extends CliCommand {
     async execute(idOrUuid, ban, duration) {
-        const user = await User_1.User.where('Id', idOrUuid).orWhere('Uuid', idOrUuid).firstOrThrow(new Error('User not found'));
+        const user = await User.where('Id', idOrUuid).orWhere('Uuid', idOrUuid).firstOrThrow(new Error('User not found'));
         user.IsBanned = ban;
         await user.update();
         if (ban) {
             await (user.Metadata['ban:duration'] = duration);
-            await (user.Metadata['ban:issued'] = luxon_1.DateTime.now().toISO());
-            this.Queue.emit(new UserBanned_1.UserBanned(idOrUuid, duration));
+            await (user.Metadata['ban:issued'] = DateTime.now().toISO());
+            this.Queue.emit(new UserBanned(idOrUuid, duration));
             if (duration !== 0) {
                 // schedule job with delay equals ban duration
                 // to automattically unban user after this time
-                const job = new UnbanUser_1.UnbanUser(idOrUuid);
+                const job = new UnbanUser(idOrUuid);
                 job.ScheduleDelay = duration * 60 * 1000;
                 this.Queue.emit(job);
             }
@@ -40,25 +37,25 @@ let BanUser = class BanUser extends cli_1.CliCommand {
         }
         else {
             // cleanup meta
-            await UserMetadata_1.UserMetadata.destroy().where('Key', 'like', 'user:ban:%').andWhere('User', user);
-            this.Queue.emit(new UserUnbanned_1.UserUnbanned(idOrUuid));
+            await UserMetadata.destroy().where('Key', 'like', 'user:ban:%').andWhere('User', user);
+            this.Queue.emit(new UserUnbanned(idOrUuid));
             this.Log.warn(`No user with id: ${idOrUuid} found`);
         }
     }
 };
 __decorate([
-    (0, log_1.Logger)('rbac'),
-    __metadata("design:type", log_1.Log)
+    Logger('rbac'),
+    __metadata("design:type", Log)
 ], BanUser.prototype, "Log", void 0);
 __decorate([
-    (0, di_1.Autoinject)(Queue_1.QueueClient),
-    __metadata("design:type", Queue_1.QueueClient)
+    Autoinject(QueueClient),
+    __metadata("design:type", QueueClient)
 ], BanUser.prototype, "Queue", void 0);
 BanUser = __decorate([
-    (0, cli_1.Command)('rbac:user-ban', 'Sets active or inactive user'),
-    (0, cli_1.Argument)('idOrUuid', 'numeric id or uuid'),
-    (0, cli_1.Argument)('ban', ' true / false', false, (opt) => (opt.toLowerCase() === 'true' ? true : false)),
-    (0, cli_1.Argument)('duration', 'how long should ban last ( in minutes )', 24 * 60, (opt) => parseInt(opt))
+    Command('rbac:user-ban', 'Sets active or inactive user'),
+    Argument('idOrUuid', 'numeric id or uuid'),
+    Argument('ban', ' true / false', false, (opt) => (opt.toLowerCase() === 'true' ? true : false)),
+    Argument('duration', 'how long should ban last ( in minutes )', 24 * 60, (opt) => parseInt(opt))
 ], BanUser);
-exports.BanUser = BanUser;
+export { BanUser };
 //# sourceMappingURL=BanUser.js.map

package/lib/cli/BanUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"BanUser.js","sourceRoot":"","sources":["../../src/cli/BanUser.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2DAAwD;AACxD,0CAA6C;AAC7C,sCAA2C;AAC3C,sCAA6D;AAC7D,oCAAyC;AACzC,yCAAsC;AACtC,qDAAkD;AAClD,yDAAsD;AACtD,iDAA8C;AAC9C,iCAAiC;AAMjC,IAAa,OAAO,GAApB,MAAa,OAAQ,SAAQ,gBAAU;IAO9B,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,GAAY,EAAE,QAAgB;QACnE,MAAM,IAAI,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;QAEpB,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAEpB,IAAI,GAAG,EAAE;YACP,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,QAAQ,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YAE7D,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,uBAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;YAEpD,IAAI,QAAQ,KAAK,CAAC,EAAE;gBAClB,8CAA8C;gBAC9C,+CAA+C;gBAC/C,MAAM,GAAG,GAAG,IAAI,qBAAS,CAAC,QAAQ,CAAC,CAAC;gBACpC,GAAG,CAAC,aAAa,GAAG,QAAQ,GAAG,EAAE,GAAG,IAAI,CAAC;gBAEzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACtB;YAED,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;SACvD;aAAM;YACL,eAAe;YACf,MAAM,2BAAY,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAEvF,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,2BAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,QAAQ,QAAQ,CAAC,CAAC;SACrD;IACH,CAAC;CACF,CAAA;AAnCC;IADC,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;oCAAC;AAGnB;IADC,IAAA,eAAU,EAAC,mBAAW,CAAC;8BACP,mBAAW;sCAAC;AALlB,OAAO;IAJnB,IAAA,aAAO,EAAC,eAAe,EAAE,8BAA8B,CAAC;IACxD,IAAA,cAAQ,EAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,IAAA,cAAQ,EAAC,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACvG,IAAA,cAAQ,EAAC,UAAU,EAAE,yCAAyC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;GAC5F,OAAO,CAqCnB;AArCY,0BAAO"}
+{"version":3,"file":"BanUser.js","sourceRoot":"","sources":["../../src/cli/BanUser.ts"],"names":[],"mappings":"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"}

package/lib/cli/ChangeUserPassword.d.ts

@@ -1,7 +1,7 @@
 import { QueueClient } from '@spinajs/Queue';
 import { Log } from '@spinajs/log';
 import { CliCommand } from '@spinajs/cli';
-import { PasswordProvider, PasswordValidationProvider } from '../interfaces';
+import { PasswordProvider, PasswordValidationProvider } from '../interfaces.js';
 export declare class ChangeUserPassword extends CliCommand {
     protected Log: Log;
     protected Queue: QueueClient;
@@ -9,3 +9,4 @@ export declare class ChangeUserPassword extends CliCommand {
     protected PasswordValidation: PasswordValidationProvider;
     execute(idOrUuid: string, newPassword: string): Promise<void>;
 }
+//# sourceMappingURL=ChangeUserPassword.d.ts.map

package/lib/cli/ChangeUserPassword.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ChangeUserPassword.d.ts","sourceRoot":"","sources":["../../src/cli/ChangeUserPassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAG7D,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAIhF,qBAGa,kBAAmB,SAAQ,UAAU;IAEhD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC;IAG7B,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,kBAAkB,EAAE,0BAA0B,CAAC;IAE5C,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAiB3E"}

package/lib/cli/ChangeUserPassword.js

@@ -1,4 +1,3 @@
-"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);
@@ -8,52 +7,50 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeUserPassword = void 0;
-const exceptions_1 = require("@spinajs/exceptions");
-const Queue_1 = require("@spinajs/Queue");
-const log_1 = require("@spinajs/log");
-const cli_1 = require("@spinajs/cli");
-const di_1 = require("@spinajs/di");
-const User_1 = require("../models/User");
-const interfaces_1 = require("../interfaces");
-const UserPasswordChanged_1 = require("../events/UserPasswordChanged");
-const configuration_1 = require("@spinajs/configuration");
-let ChangeUserPassword = class ChangeUserPassword extends cli_1.CliCommand {
+import { ResourceNotFound, InvalidArgument } from '../../../exceptions/lib/index.js';
+import { QueueClient } from '@spinajs/Queue';
+import { Log, Logger } from '@spinajs/log';
+import { Argument, CliCommand, Command } from '@spinajs/cli';
+import { Autoinject } from '@spinajs/di';
+import { User } from '../models/User.js';
+import { PasswordProvider, PasswordValidationProvider } from '../interfaces.js';
+import { UserPasswordChanged } from '../events/UserPasswordChanged.js';
+import { AutoinjectService } from '@spinajs/configuration';
+let ChangeUserPassword = class ChangeUserPassword extends CliCommand {
     async execute(idOrUuid, newPassword) {
-        const user = await User_1.User.where('Id', idOrUuid)
+        const user = await User.where('Id', idOrUuid)
             .orWhere('Uuid', idOrUuid)
-            .firstOrThrow(new exceptions_1.ResourceNotFound(`No user with id ${idOrUuid} found`));
+            .firstOrThrow(new ResourceNotFound(`No user with id ${idOrUuid} found`));
         if (!this.PasswordValidation.check(newPassword)) {
-            throw new exceptions_1.InvalidArgument(`New password does not match password rules, change passowrd or check rbac.password.validation config entry for password rules`);
+            throw new InvalidArgument(`New password does not match password rules, change passowrd or check rbac.password.validation config entry for password rules`);
         }
         const hashedPassword = await this.PasswordProvider.hash(newPassword);
         user.Password = hashedPassword;
         await user.update();
-        await this.Queue.emit(new UserPasswordChanged_1.UserPasswordChanged(idOrUuid));
+        await this.Queue.emit(new UserPasswordChanged(idOrUuid));
         this.Log.success(`User password changed !`);
     }
 };
 __decorate([
-    (0, log_1.Logger)('rbac'),
-    __metadata("design:type", log_1.Log)
+    Logger('rbac'),
+    __metadata("design:type", Log)
 ], ChangeUserPassword.prototype, "Log", void 0);
 __decorate([
-    (0, di_1.Autoinject)(Queue_1.QueueClient),
-    __metadata("design:type", Queue_1.QueueClient)
+    Autoinject(QueueClient),
+    __metadata("design:type", QueueClient)
 ], ChangeUserPassword.prototype, "Queue", void 0);
 __decorate([
-    (0, configuration_1.AutoinjectService)('rbac.password'),
-    __metadata("design:type", interfaces_1.PasswordProvider)
+    AutoinjectService('rbac.password'),
+    __metadata("design:type", PasswordProvider)
 ], ChangeUserPassword.prototype, "PasswordProvider", void 0);
 __decorate([
-    (0, configuration_1.AutoinjectService)('rbac.validation'),
-    __metadata("design:type", interfaces_1.PasswordValidationProvider)
+    AutoinjectService('rbac.validation'),
+    __metadata("design:type", PasswordValidationProvider)
 ], ChangeUserPassword.prototype, "PasswordValidation", void 0);
 ChangeUserPassword = __decorate([
-    (0, cli_1.Command)('rbac:user-change-password', 'Sets active or inactive user'),
-    (0, cli_1.Argument)('idOrUuid', 'numeric id or uuid'),
-    (0, cli_1.Argument)('newPassword', 'new password')
+    Command('rbac:user-change-password', 'Sets active or inactive user'),
+    Argument('idOrUuid', 'numeric id or uuid'),
+    Argument('newPassword', 'new password')
 ], ChangeUserPassword);
-exports.ChangeUserPassword = ChangeUserPassword;
+export { ChangeUserPassword };
 //# sourceMappingURL=ChangeUserPassword.js.map

package/lib/cli/ChangeUserPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChangeUserPassword.js","sourceRoot":"","sources":["../../src/cli/ChangeUserPassword.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAwE;AACxE,0CAA6C;AAC7C,sCAA2C;AAC3C,sCAA6D;AAC7D,oCAAyC;AACzC,yCAAsC;AACtC,8CAA6E;AAC7E,uEAAoE;AACpE,0DAA2D;AAK3D,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,gBAAU;IAazC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,WAAmB;QACxD,MAAM,IAAI,GAAG,MAAM,WAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC;aAC1C,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC;aACzB,YAAY,CAAC,IAAI,6BAAgB,CAAC,mBAAmB,QAAQ,QAAQ,CAAC,CAAC,CAAC;QAE3E,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAC/C,MAAM,IAAI,4BAAe,CAAC,+HAA+H,CAAC,CAAC;SAC5J;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrE,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QAC/B,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAEpB,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,yCAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEzD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AA5BC;IADC,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;+CAAC;AAGnB;IADC,IAAA,eAAU,EAAC,mBAAW,CAAC;8BACP,mBAAW;iDAAC;AAG7B;IADC,IAAA,iCAAiB,EAAC,eAAe,CAAC;8BACP,6BAAgB;4DAAC;AAG7C;IADC,IAAA,iCAAiB,EAAC,iBAAiB,CAAC;8BACP,uCAA0B;8DAAC;AAX9C,kBAAkB;IAH9B,IAAA,aAAO,EAAC,2BAA2B,EAAE,8BAA8B,CAAC;IACpE,IAAA,cAAQ,EAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,IAAA,cAAQ,EAAC,aAAa,EAAE,cAAc,CAAC;GAC3B,kBAAkB,CA8B9B;AA9BY,gDAAkB"}
+{"version":3,"file":"ChangeUserPassword.js","sourceRoot":"","sources":["../../src/cli/ChangeUserPassword.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAKpD,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,UAAU;IAazC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,WAAmB;QACxD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC;aAC1C,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC;aACzB,YAAY,CAAC,IAAI,gBAAgB,CAAC,mBAAmB,QAAQ,QAAQ,CAAC,CAAC,CAAC;QAE3E,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;YAC/C,MAAM,IAAI,eAAe,CAAC,+HAA+H,CAAC,CAAC;SAC5J;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACrE,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;QAC/B,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAEpB,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEzD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AA7BC;IAAC,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;+CAAC;AAEnB;IAAC,UAAU,CAAC,WAAW,CAAC;8BACP,WAAW;iDAAC;AAE7B;IAAC,iBAAiB,CAAC,eAAe,CAAC;8BACP,gBAAgB;4DAAC;AAE7C;IAAC,iBAAiB,CAAC,iBAAiB,CAAC;8BACP,0BAA0B;8DAAC;AAX9C,kBAAkB;IAH9B,OAAO,CAAC,2BAA2B,EAAE,8BAA8B,CAAC;IACpE,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;GAC3B,kBAAkB,CA8B9B;SA9BY,kBAAkB"}

package/lib/cli/ClearUserTimelineSchedule.d.ts

@@ -6,3 +6,4 @@ export declare class ChangeUserPassword extends CliCommand {
     protected TimelineTTL: number;
     execute(): Promise<void>;
 }
+//# sourceMappingURL=ClearUserTimelineSchedule.d.ts.map

package/lib/cli/ClearUserTimelineSchedule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ClearUserTimelineSchedule.d.ts","sourceRoot":"","sources":["../../src/cli/ClearUserTimelineSchedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AAMnD,qBACa,kBAAmB,SAAQ,UAAU;IAEhD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC;IAG/B,SAAS,CAAC,WAAW,EAAE,MAAM,CAAC;IAEjB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CA4BtC"}

package/lib/cli/ClearUserTimelineSchedule.js

@@ -1,4 +1,3 @@
-"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);
@@ -8,20 +7,18 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeUserPassword = void 0;
-const log_1 = require("@spinajs/log");
-const cli_1 = require("@spinajs/cli");
-const configuration_1 = require("@spinajs/configuration");
-const cron_1 = require("cron");
-const UserTimeline_1 = require("../models/UserTimeline");
-const luxon_1 = require("luxon");
-let ChangeUserPassword = class ChangeUserPassword extends cli_1.CliCommand {
+import { Log, Logger } from '@spinajs/log';
+import { CliCommand, Command } from '@spinajs/cli';
+import { Config } from '@spinajs/configuration';
+import { CronJob } from 'cron';
+import { UserAction } from '../models/UserTimeline.js';
+import { DateTime } from 'luxon';
+let ChangeUserPassword = class ChangeUserPassword extends CliCommand {
     async execute() {
-        new cron_1.CronJob(this.CronSchedule, async () => {
-            const result = await UserTimeline_1.UserAction.destroy()
+        new CronJob(this.CronSchedule, async () => {
+            const result = await UserAction.destroy()
                 .where('Persistent', false)
-                .andWhere('CreatedAt', '<=', luxon_1.DateTime.now().plus({
+                .andWhere('CreatedAt', '<=', DateTime.now().plus({
                 minutes: -this.TimelineTTL,
             }));
             if (result && result.RowsAffected > 0) {
@@ -37,19 +34,19 @@ let ChangeUserPassword = class ChangeUserPassword extends cli_1.CliCommand {
     }
 };
 __decorate([
-    (0, log_1.Logger)('rbac'),
-    __metadata("design:type", log_1.Log)
+    Logger('rbac'),
+    __metadata("design:type", Log)
 ], ChangeUserPassword.prototype, "Log", void 0);
 __decorate([
-    (0, configuration_1.Config)('rbac.timeline.schedule'),
+    Config('rbac.timeline.schedule'),
     __metadata("design:type", String)
 ], ChangeUserPassword.prototype, "CronSchedule", void 0);
 __decorate([
-    (0, configuration_1.Config)('rbac.timeline.ttl'),
+    Config('rbac.timeline.ttl'),
     __metadata("design:type", Number)
 ], ChangeUserPassword.prototype, "TimelineTTL", void 0);
 ChangeUserPassword = __decorate([
-    (0, cli_1.Command)('rbac:cleanup-schedule', 'Starts a schedule with cleanup tasks')
+    Command('rbac:cleanup-schedule', 'Starts a schedule with cleanup tasks')
 ], ChangeUserPassword);
-exports.ChangeUserPassword = ChangeUserPassword;
+export { ChangeUserPassword };
 //# sourceMappingURL=ClearUserTimelineSchedule.js.map

package/lib/cli/ClearUserTimelineSchedule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClearUserTimelineSchedule.js","sourceRoot":"","sources":["../../src/cli/ClearUserTimelineSchedule.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAA2C;AAC3C,sCAAmD;AACnD,0DAAgD;AAChD,+BAA+B;AAC/B,yDAAoD;AACpD,iCAAiC;AAGjC,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,gBAAU;IAUzC,KAAK,CAAC,OAAO;QAClB,IAAI,cAAO,CACT,IAAI,CAAC,YAAY,EACjB,KAAK,IAAI,EAAE;YACT,MAAM,MAAM,GAAG,MAAM,yBAAU,CAAC,OAAO,EAAE;iBACtC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC;iBAC1B,QAAQ,CACP,WAAW,EACX,IAAI,EACJ,gBAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;gBAClB,OAAO,EAAE,CAAC,IAAI,CAAC,WAAW;aAC3B,CAAC,CACH,CAAC;YAEJ,IAAI,MAAM,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE;gBACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,YAAY,uBAAuB,CAAC,CAAC;aACtE;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;aAC9D;QACH,CAAC,EACD,GAAG,EAAE;YACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACjD,CAAC,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AApCC;IADC,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;+CAAC;AAGnB;IADC,IAAA,sBAAM,EAAC,wBAAwB,CAAC;;wDACF;AAG/B;IADC,IAAA,sBAAM,EAAC,mBAAmB,CAAC;;uDACE;AARnB,kBAAkB;IAD9B,IAAA,aAAO,EAAC,uBAAuB,EAAE,sCAAsC,CAAC;GAC5D,kBAAkB,CAsC9B;AAtCY,gDAAkB"}
+{"version":3,"file":"ClearUserTimelineSchedule.js","sourceRoot":"","sources":["../../src/cli/ClearUserTimelineSchedule.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG1B,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,UAAU;IAUzC,KAAK,CAAC,OAAO;QAClB,IAAI,OAAO,CACT,IAAI,CAAC,YAAY,EACjB,KAAK,IAAI,EAAE;YACT,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE;iBACtC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC;iBAC1B,QAAQ,CACP,WAAW,EACX,IAAI,EACJ,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;gBAClB,OAAO,EAAE,CAAC,IAAI,CAAC,WAAW;aAC3B,CAAC,CACH,CAAC;YAEJ,IAAI,MAAM,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE;gBACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,YAAY,uBAAuB,CAAC,CAAC;aACtE;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;aAC9D;QACH,CAAC,EACD,GAAG,EAAE;YACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACjD,CAAC,EACD,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AArCC;IAAC,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;+CAAC;AAEnB;IAAC,MAAM,CAAC,wBAAwB,CAAC;;wDACF;AAE/B;IAAC,MAAM,CAAC,mBAAmB,CAAC;;uDACE;AARnB,kBAAkB;IAD9B,OAAO,CAAC,uBAAuB,EAAE,sCAAsC,CAAC;GAC5D,kBAAkB,CAsC9B;SAtCY,kBAAkB"}

package/lib/cli/CreateUser.d.ts

@@ -1,7 +1,7 @@
 import { QueueClient } from '@spinajs/queue';
 import { Log } from '@spinajs/log';
 import { CliCommand } from '@spinajs/cli';
-import { PasswordProvider } from '../interfaces';
+import { PasswordProvider } from '../interfaces.js';
 interface UserCreationOptions {
     email: string;
     roles: string;
@@ -15,3 +15,4 @@ export declare class CreateUser extends CliCommand {
     execute(options: UserCreationOptions): Promise<void>;
 }
 export {};
+//# sourceMappingURL=CreateUser.d.ts.map

package/lib/cli/CreateUser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateUser.d.ts","sourceRoot":"","sources":["../../src/cli/CreateUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAK3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAIpD,UAAU,mBAAmB;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAKa,UAAW,SAAQ,UAAU;IAExC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAG7C,SAAS,CAAC,KAAK,EAAE,WAAW,CAAC;IAEhB,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CAgClE"}