@spinajs/rbac 2.0.185 → 2.0.187

package/lib/mjs/cli/BanUser.js

@@ -7,39 +7,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { UserUnbanned } from './../events/UserUnbanned.js';
-import { QueueService } 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';
+import { ban, unban } from '../actions.js';
 let BanUser = class BanUser extends CliCommand {
-    async execute(idOrUuid, ban, duration) {
-        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['user:ban.duration'] = duration);
-            await (user.Metadata['user: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(idOrUuid);
-                job.ScheduleDelay = duration * 60 * 1000;
-                this.Queue.emit(job);
-            }
-            this.Log.success(`User ban status changed to ${ban}`);
+    async execute(idOrUuid, banOrUnban, duration, reason) {
+        try {
+            await banOrUnban ? ban(idOrUuid, reason, duration) : unban(idOrUuid);
+            this.Log.success(`User ${idOrUuid} ${ban ? 'banned' : 'unbanned'}`);
         }
-        else {
-            // cleanup meta
-            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`);
+        catch (e) {
+            this.Log.error(`Error while banning user ${idOrUuid} ${e.message}`);
         }
     }
 };
@@ -47,15 +25,12 @@ __decorate([
     Logger('rbac'),
     __metadata("design:type", Log)
 ], BanUser.prototype, "Log", void 0);
-__decorate([
-    Autoinject(QueueService),
-    __metadata("design:type", QueueService)
-], BanUser.prototype, "Queue", void 0);
 BanUser = __decorate([
     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))
+    Argument('duration', 'how long should ban last ( in minutes )', 24 * 60, (opt) => parseInt(opt)),
+    Argument('reason', 'reason for ban')
 ], BanUser);
 export { BanUser };
 //# sourceMappingURL=BanUser.js.map

package/lib/mjs/cli/BanUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"BanUser.js","sourceRoot":"","sources":["../../../src/cli/BanUser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BanUser.js","sourceRoot":"","sources":["../../../src/cli/BanUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAOpC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,UAAU;IAI9B,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,UAAmB,EAAE,QAAgB,EAAE,MAAc;QAC1F,IAAI;YAEF,MAAM,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAErE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,QAAQ,IAAI,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;SACrE;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,QAAQ,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SACrE;IACH,CAAC;CACF,CAAA;AAZW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;oCAAC;AAFR,OAAO;IALnB,OAAO,CAAC,eAAe,EAAE,8BAA8B,CAAC;IACxD,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,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,QAAQ,CAAC,UAAU,EAAE,yCAAyC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxG,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;GACxB,OAAO,CAcnB"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"ChangeUserPassword.d.ts","sourceRoot":"","sources":["../../../src/cli/ChangeUserPassword.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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,YAAY,CAAC;IAG9B,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"}
+{"version":3,"file":"ChangeUserPassword.d.ts","sourceRoot":"","sources":["../../../src/cli/ChangeUserPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAI7D,qBAGa,kBAAmB,SAAQ,UAAU;IAEhD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAQ3E"}

package/lib/mjs/cli/ChangeUserPassword.js

@@ -7,46 +7,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { ResourceNotFound, InvalidArgument } from '@spinajs/exceptions';
-import { QueueService } 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';
+import { _user, changePassword } from '../actions.js';
+import { _chain } from '@spinajs/util';
 let ChangeUserPassword = class ChangeUserPassword extends CliCommand {
     async execute(idOrUuid, newPassword) {
-        const user = await User.where('Id', idOrUuid)
-            .orWhere('Uuid', idOrUuid)
-            .firstOrThrow(new ResourceNotFound(`No user with id ${idOrUuid} found`));
-        if (!this.PasswordValidation.check(newPassword)) {
-            throw new InvalidArgument(`New password does not match password rules, change passowrd or check rbac.password.validation config entry for password rules`);
+        try {
+            await _chain(_user(idOrUuid), changePassword(newPassword));
+            this.Log.success(`User ${idOrUuid} password changed`);
+        }
+        catch (e) {
+            this.Log.error(`Error while changing user password ${idOrUuid} ${e.message}`);
         }
-        const hashedPassword = await this.PasswordProvider.hash(newPassword);
-        user.Password = hashedPassword;
-        await user.update();
-        await this.Queue.emit(new UserPasswordChanged(idOrUuid));
-        this.Log.success(`User password changed !`);
     }
 };
 __decorate([
     Logger('rbac'),
     __metadata("design:type", Log)
 ], ChangeUserPassword.prototype, "Log", void 0);
-__decorate([
-    Autoinject(QueueService),
-    __metadata("design:type", QueueService)
-], ChangeUserPassword.prototype, "Queue", void 0);
-__decorate([
-    AutoinjectService('rbac.password'),
-    __metadata("design:type", PasswordProvider)
-], ChangeUserPassword.prototype, "PasswordProvider", void 0);
-__decorate([
-    AutoinjectService('rbac.validation'),
-    __metadata("design:type", PasswordValidationProvider)
-], ChangeUserPassword.prototype, "PasswordValidation", void 0);
 ChangeUserPassword = __decorate([
     Command('rbac:user-change-password', 'Sets active or inactive user'),
     Argument('idOrUuid', 'numeric id or uuid'),

package/lib/mjs/cli/ChangeUserPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChangeUserPassword.js","sourceRoot":"","sources":["../../../src/cli/ChangeUserPassword.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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;AA5BW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;+CAAC;AAGT;IADT,UAAU,CAAC,YAAY,CAAC;8BACR,YAAY;iDAAC;AAGpB;IADT,iBAAiB,CAAC,eAAe,CAAC;8BACP,gBAAgB;4DAAC;AAGnC;IADT,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"}
+{"version":3,"file":"ChangeUserPassword.js","sourceRoot":"","sources":["../../../src/cli/ChangeUserPassword.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKhC,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,UAAU;IAIzC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,WAAmB;QACxD,IAAI;YACF,MAAM,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,QAAQ,mBAAmB,CAAC,CAAC;SACvD;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,QAAQ,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SAC/E;IACH,CAAC;CACF,CAAA;AAVW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;+CAAC;AAFR,kBAAkB;IAH9B,OAAO,CAAC,2BAA2B,EAAE,8BAA8B,CAAC;IACpE,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;GAC3B,kBAAkB,CAY9B"}

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

@@ -1,7 +1,5 @@
-import { QueueService } from '@spinajs/queue';
 import { Log } from '@spinajs/log';
 import { CliCommand } from '@spinajs/cli';
-import { PasswordProvider } from '../interfaces.js';
 interface UserCreationOptions {
     email: string;
     roles: string;
@@ -10,8 +8,6 @@ interface UserCreationOptions {
 }
 export declare class CreateUser extends CliCommand {
     protected Log: Log;
-    protected PasswordProvider: PasswordProvider;
-    protected Queue: QueueService;
     execute(options: UserCreationOptions): Promise<void>;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"CreateUser.d.ts","sourceRoot":"","sources":["../../../src/cli/CreateUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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,YAAY,CAAC;IAEjB,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CA6BlE"}
+{"version":3,"file":"CreateUser.d.ts","sourceRoot":"","sources":["../../../src/cli/CreateUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAG3D,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;IAEN,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;CAQlE"}

package/lib/mjs/cli/CreateUser.js

@@ -7,55 +7,24 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { QueueService } from '@spinajs/queue';
 import { Log, Logger } from '@spinajs/log';
 import { CliCommand, Command, Option } from '@spinajs/cli';
-import { AutoinjectService } from '@spinajs/configuration';
-import { DateTime } from 'luxon';
-import { Autoinject } from '@spinajs/di';
-import { v4 as uuidv4 } from 'uuid';
-import { PasswordProvider } from '../interfaces.js';
-import { User } from '../models/User.js';
-import { UserRegisteredMessage } from '../events/NewUser.js';
+import { create } from '../actions.js';
 let CreateUser = class CreateUser extends CliCommand {
     async execute(options) {
-        const user = new User({
-            Email: options.email,
-            Login: options.login,
-            Role: options.roles.split(','),
-            RegisteredAt: DateTime.now(),
-            IsBanned: false,
-            IsActive: false,
-            Uuid: uuidv4(),
-        });
-        if (options.password) {
-            user.Password = await this.PasswordProvider.hash(options.password);
+        try {
+            await create(options.email, options.login, options.password, options.roles.split(","));
+            this.Log.success(`User created`);
         }
-        else {
-            const pwd = await this.PasswordProvider.generate();
-            user.Password = await this.PasswordProvider.hash(pwd);
-            this.Log.warn(`USER PASSWORD: ${pwd}`);
+        catch (e) {
+            this.Log.error(`Error while creating user ${e.message}`);
         }
-        await user.insert();
-        const qMessage = new UserRegisteredMessage();
-        qMessage.hydrate(user.toJSON());
-        // notify others about user creation
-        this.Queue.emit(qMessage);
-        this.Log.success('User creation SUCCESS, you must activate user first before it can login !');
     }
 };
 __decorate([
     Logger('rbac'),
     __metadata("design:type", Log)
 ], CreateUser.prototype, "Log", void 0);
-__decorate([
-    AutoinjectService('rbac.password'),
-    __metadata("design:type", PasswordProvider)
-], CreateUser.prototype, "PasswordProvider", void 0);
-__decorate([
-    Autoinject(QueueService),
-    __metadata("design:type", QueueService)
-], CreateUser.prototype, "Queue", void 0);
 CreateUser = __decorate([
     Command('rbas:user-create', 'Creates user with given credentials'),
     Option('-e, --email <email>', true, 'user email'),

package/lib/mjs/cli/CreateUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../../src/cli/CreateUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AActD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAUjC,KAAK,CAAC,OAAO,CAAC,OAA4B;QAC/C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;YAC9B,YAAY,EAAE,QAAQ,CAAC,GAAG,EAAE;YAC5B,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,KAAK;YACf,IAAI,EAAE,MAAM,EAAE;SACf,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SACpE;aAAM;YACL,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;YACnD,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC;SACxC;QAED,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QAEpB,MAAM,QAAQ,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAC7C,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAEhC,oCAAoC;QACpC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE1B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,2EAA2E,CAAC,CAAC;IAChG,CAAC;CACF,CAAA;AArCW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;uCAAC;AAGT;IADT,iBAAiB,CAAC,eAAe,CAAC;8BACP,gBAAgB;oDAAC;AAGnC;IADT,UAAU,CAAC,YAAY,CAAC;8BACR,YAAY;yCAAC;AARnB,UAAU;IALtB,OAAO,CAAC,kBAAkB,EAAE,qCAAqC,CAAC;IAClE,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,YAAY,CAAC;IACjD,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,6BAA6B,CAAC;IAClE,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,YAAY,CAAC;IACjD,MAAM,CAAC,2BAA2B,EAAE,KAAK,EAAE,wEAAwE,CAAC;GACxG,UAAU,CAuCtB"}
+{"version":3,"file":"CreateUser.js","sourceRoot":"","sources":["../../../src/cli/CreateUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAchC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAIjC,KAAK,CAAC,OAAO,CAAC,OAA4B;QAC/C,IAAI;YACF,MAAM,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YACvF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1D;IACH,CAAC;CACF,CAAA;AAVW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;uCAAC;AAFR,UAAU;IALtB,OAAO,CAAC,kBAAkB,EAAE,qCAAqC,CAAC;IAClE,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,YAAY,CAAC;IACjD,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,6BAA6B,CAAC;IAClE,MAAM,CAAC,qBAAqB,EAAE,IAAI,EAAE,YAAY,CAAC;IACjD,MAAM,CAAC,2BAA2B,EAAE,KAAK,EAAE,wEAAwE,CAAC;GACxG,UAAU,CAYtB"}

package/lib/mjs/cli/DeleteUser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DeleteUser.d.ts","sourceRoot":"","sources":["../../../src/cli/DeleteUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAK7D,qBAEa,UAAW,SAAQ,UAAU;IAExC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC;IAEjB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAStD"}
+{"version":3,"file":"DeleteUser.d.ts","sourceRoot":"","sources":["../../../src/cli/DeleteUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAI7D,qBAEa,UAAW,SAAQ,UAAU;IAExC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC;IAEjB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAatD"}

package/lib/mjs/cli/DeleteUser.js

@@ -12,14 +12,21 @@ import { QueueService } 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 { UserDeleted } from '../events/UserDeleted.js';
+import { deleteUser } from '../actions.js';
 let DeleteUser = class DeleteUser extends CliCommand {
     async execute(idOrUuid) {
-        const result = await User.where('Id', idOrUuid).orWhere('Uuid', idOrUuid).firstOrThrow(new ResourceNotFound('User with given id or uuid not found in db'));
-        await result.destroy();
-        this.Queue.emit(new UserDeleted(idOrUuid));
-        this.Log.success(`User deleted sucessyfully`);
+        try {
+            await deleteUser(idOrUuid);
+            this.Log.success(`User ${idOrUuid} deleted`);
+        }
+        catch (e) {
+            if (e instanceof ResourceNotFound) {
+                this.Log.error(`User ${idOrUuid} not found`);
+            }
+            else {
+                this.Log.error(`Error while deleting user ${idOrUuid} ${e.message}`);
+            }
+        }
     }
 };
 __decorate([

package/lib/mjs/cli/DeleteUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeleteUser.js","sourceRoot":"","sources":["../../../src/cli/DeleteUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIhD,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAOjC,KAAK,CAAC,OAAO,CAAC,QAAgB;QACnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,IAAI,gBAAgB,CAAC,4CAA4C,CAAC,CAAC,CAAC;QAE3J,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;QAEvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC;CACF,CAAA;AAdW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;uCAAC;AAGT;IADT,UAAU,CAAC,YAAY,CAAC;8BACR,YAAY;yCAAC;AALnB,UAAU;IAFtB,OAAO,CAAC,kBAAkB,EAAE,wCAAwC,CAAC;IACrE,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;GAC9B,UAAU,CAgBtB"}
+{"version":3,"file":"DeleteUser.js","sourceRoot":"","sources":["../../../src/cli/DeleteUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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,UAAU,EAAE,MAAM,eAAe,CAAC;AAIpC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAOjC,KAAK,CAAC,OAAO,CAAC,QAAgB;QACnC,IAAI;YAEF,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,QAAQ,UAAU,CAAC,CAAC;SAC9C;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,YAAY,gBAAgB,EAAE;gBACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,QAAQ,YAAY,CAAC,CAAC;aAC9C;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,QAAQ,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aACtE;SACF;IACH,CAAC;CACF,CAAA;AAlBW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;uCAAC;AAGT;IADT,UAAU,CAAC,YAAY,CAAC;8BACR,YAAY;yCAAC;AALnB,UAAU;IAFtB,OAAO,CAAC,kBAAkB,EAAE,wCAAwC,CAAC;IACrE,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;GAC9B,UAAU,CAoBtB"}

package/lib/mjs/cli/FindUser.d.ts

@@ -1,13 +1,7 @@
 import { Log } from '@spinajs/log';
 import { CliCommand } from '@spinajs/cli';
-interface UserOption {
-    idOrUuid?: string;
-    login?: string;
-    email?: string;
-}
 export declare class CreateUser extends CliCommand {
     protected Log: Log;
-    execute(options: UserOption): Promise<void>;
+    execute(identifier: string): Promise<void>;
 }
-export {};
 //# sourceMappingURL=FindUser.d.ts.map

package/lib/mjs/cli/FindUser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FindUser.d.ts","sourceRoot":"","sources":["../../../src/cli/FindUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAU,UAAU,EAAW,MAAM,cAAc,CAAC;AAG3D,UAAU,UAAU;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAIa,UAAW,SAAQ,UAAU;IAExC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAqBzD"}
+{"version":3,"file":"FindUser.d.ts","sourceRoot":"","sources":["../../../src/cli/FindUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAU,UAAU,EAAW,MAAM,cAAc,CAAC;AAG3D,qBAEa,UAAW,SAAQ,UAAU;IAExC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUxD"}

package/lib/mjs/cli/FindUser.js

@@ -11,21 +11,13 @@ import { Log, Logger } from '@spinajs/log';
 import { Option, CliCommand, Command } from '@spinajs/cli';
 import { User } from '../models/User.js';
 let CreateUser = class CreateUser extends CliCommand {
-    async execute(options) {
-        let query = null;
-        if (options.email) {
-            query = User.where('Email', 'like', `%${options.email}`);
+    async execute(identifier) {
+        const user = await User.getByAnything(identifier);
+        if (user) {
+            this.Log.info(`User : ${user.Id}, ${user.Uuid}, email: ${user.Email}, login: ${user.Login}, active: ${user.IsActive}, CreatedAt: ${user.CreatedAt.toISO()}, LastLogin: ${user.LastLoginAt.toISO()}`);
+            return;
         }
-        if (options.login) {
-            query = User.where('Login', 'like', `%${options.login}`);
-        }
-        if (options.idOrUuid) {
-            query = User.where('Id', options.idOrUuid).orWhere('Uuid', options.idOrUuid);
-        }
-        const user = await query;
-        user.forEach((x) => {
-            this.Log.info(`User : ${x.Id}, ${x.Uuid}, email: ${x.Email}, login: ${x.Login}, active: ${x.IsActive}, banned: ${x.IsBanned}, CreatedAt: ${x.CreatedAt.toISO()}`);
-        });
+        this.Log.error(`User not found`);
     }
 };
 __decorate([
@@ -33,10 +25,8 @@ __decorate([
     __metadata("design:type", Log)
 ], CreateUser.prototype, "Log", void 0);
 CreateUser = __decorate([
-    Command('rbac:user-find', 'Sets active or inactive user'),
-    Option('-i, --idOrUuid <idOrUuid>', false, 'numeric id or uuid'),
-    Option('-l, --login <login>', false, 'login'),
-    Option('-e, --email <email>', false, 'email')
+    Command('rbac:user-find', 'Finds user with given identifier'),
+    Option('-i, --identifier <idOrUuid>', false, 'numeric id or uuid')
 ], CreateUser);
 export { CreateUser };
 //# sourceMappingURL=FindUser.js.map

package/lib/mjs/cli/FindUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"FindUser.js","sourceRoot":"","sources":["../../../src/cli/FindUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAYlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAIjC,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,IAAI,KAAK,GAAG,IAAI,CAAC;QAEjB,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;SAC1D;QAED,IAAI,OAAO,CAAC,KAAK,EAAE;YACjB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;SAC1D;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE;YACpB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC9E;QAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC;QAEzB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,QAAQ,aAAa,CAAC,CAAC,QAAQ,gBAAgB,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACpK,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAvBW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;uCAAC;AAFR,UAAU;IAJtB,OAAO,CAAC,gBAAgB,EAAE,8BAA8B,CAAC;IACzD,MAAM,CAAC,2BAA2B,EAAE,KAAK,EAAE,oBAAoB,CAAC;IAChE,MAAM,CAAC,qBAAqB,EAAE,KAAK,EAAE,OAAO,CAAC;IAC7C,MAAM,CAAC,qBAAqB,EAAE,KAAK,EAAE,OAAO,CAAC;GACjC,UAAU,CAyBtB"}
+{"version":3,"file":"FindUser.js","sourceRoot":"","sources":["../../../src/cli/FindUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAIlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAIjC,KAAK,CAAC,OAAO,CAAC,UAAkB;QACrC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAElD,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,YAAY,IAAI,CAAC,KAAK,YAAY,IAAI,CAAC,KAAK,aAAa,IAAI,CAAC,QAAQ,gBAAgB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,gBAAgB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACrM,OAAO;SACR;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AAZW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;uCAAC;AAFR,UAAU;IAFtB,OAAO,CAAC,gBAAgB,EAAE,kCAAkC,CAAC;IAC7D,MAAM,CAAC,6BAA6B,EAAE,KAAK,EAAE,oBAAoB,CAAC;GACtD,UAAU,CActB"}

package/lib/mjs/cli/GrantUserRole.d.ts

@@ -1,9 +1,7 @@
-import { QueueService } from '@spinajs/Queue';
 import { Log } from '@spinajs/log';
 import { CliCommand } from '@spinajs/cli';
 export declare class GrantUserRole extends CliCommand {
     protected Log: Log;
-    protected Queue: QueueService;
     execute(idOrUuid: string, role: string): Promise<void>;
 }
 //# sourceMappingURL=GrantUserRole.d.ts.map

package/lib/mjs/cli/GrantUserRole.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GrantUserRole.d.ts","sourceRoot":"","sources":["../../../src/cli/GrantUserRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAO7D,qBAGa,aAAc,SAAQ,UAAU;IAE3C,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC;IAEjB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAYpE"}
+{"version":3,"file":"GrantUserRole.d.ts","sourceRoot":"","sources":["../../../src/cli/GrantUserRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAK7D,qBAGa,aAAc,SAAQ,UAAU;IAE3C,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAapE"}

package/lib/mjs/cli/GrantUserRole.js

@@ -7,32 +7,30 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { QueueService } 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 { UserRoleGranted } from '../events/UserRoleGranted.js';
 import { ResourceNotFound } from '@spinajs/exceptions';
-import _ from 'lodash';
+import { grant } from '../actions.js';
 let GrantUserRole = class GrantUserRole extends CliCommand {
     async execute(idOrUuid, role) {
-        const result = await User.where('Id', idOrUuid).orWhere('Uuid', idOrUuid).firstOrThrow(new ResourceNotFound('User with given id or uuid not found in db'));
-        result.Role.push(role);
-        result.Role = _.uniq(result.Role);
-        await result.update();
-        this.Queue.emit(new UserRoleGranted(idOrUuid, role));
-        this.Log.success(`User role granted !`);
+        try {
+            await grant(idOrUuid, role);
+            this.Log.success(`Role ${role} granted to user ${idOrUuid}`);
+        }
+        catch (e) {
+            if (e instanceof ResourceNotFound) {
+                this.Log.error(`User ${idOrUuid} not found`);
+            }
+            else {
+                this.Log.error(`Error while granting role ${role} to user ${idOrUuid} ${e.message}`);
+            }
+        }
     }
 };
 __decorate([
     Logger('rbac'),
     __metadata("design:type", Log)
 ], GrantUserRole.prototype, "Log", void 0);
-__decorate([
-    Autoinject(QueueService),
-    __metadata("design:type", QueueService)
-], GrantUserRole.prototype, "Queue", void 0);
 GrantUserRole = __decorate([
     Command('rbac:user-grant', 'Grants role to user'),
     Argument('idOrUuid', 'numeric id or uuid'),

package/lib/mjs/cli/GrantUserRole.js.map

@@ -1 +1 @@
-{"version":3,"file":"GrantUserRole.js","sourceRoot":"","sources":["../../../src/cli/GrantUserRole.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,CAAC,MAAM,QAAQ,CAAC;AAKhB,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,UAAU;IAOpC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,IAAY;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,IAAI,gBAAgB,CAAC,4CAA4C,CAAC,CAAC,CAAC;QAE3J,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAElC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QAErD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AAjBW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;0CAAC;AAGT;IADT,UAAU,CAAC,YAAY,CAAC;8BACR,YAAY;4CAAC;AALnB,aAAa;IAHzB,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IACjD,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;GACjB,aAAa,CAmBzB"}
+{"version":3,"file":"GrantUserRole.js","sourceRoot":"","sources":["../../../src/cli/GrantUserRole.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAK/B,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,UAAU;IAIpC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,IAAY;QACjD,IAAI;YAEF,MAAM,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,oBAAoB,QAAQ,EAAE,CAAC,CAAC;SAC9D;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,YAAY,gBAAgB,EAAE;gBACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,QAAQ,YAAY,CAAC,CAAC;aAC9C;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,IAAI,YAAY,QAAQ,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aACtF;SACF;IACH,CAAC;CACF,CAAA;AAfW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;0CAAC;AAFR,aAAa;IAHzB,OAAO,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IACjD,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;GACjB,aAAa,CAiBzB"}

package/lib/mjs/cli/RevokeUserRole.d.ts

@@ -1,9 +1,7 @@
-import { QueueService } from '@spinajs/Queue';
 import { Log } from '@spinajs/log';
 import { CliCommand } from '@spinajs/cli';
 export declare class RevokeUserRole extends CliCommand {
     protected Log: Log;
-    protected Queue: QueueService;
     execute(idOrUuid: string, role: string): Promise<void>;
 }
 //# sourceMappingURL=RevokeUserRole.d.ts.map

package/lib/mjs/cli/RevokeUserRole.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RevokeUserRole.d.ts","sourceRoot":"","sources":["../../../src/cli/RevokeUserRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAO7D,qBAGa,cAAe,SAAQ,UAAU;IAE5C,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,KAAK,EAAE,YAAY,CAAC;IAEjB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAWpE"}
+{"version":3,"file":"RevokeUserRole.d.ts","sourceRoot":"","sources":["../../../src/cli/RevokeUserRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAY,UAAU,EAAW,MAAM,cAAc,CAAC;AAK7D,qBAGa,cAAe,SAAQ,UAAU;IAE5C,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAcpE"}

package/lib/mjs/cli/RevokeUserRole.js

@@ -7,31 +7,30 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { QueueService } 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 { UserRoleRevoked } from '../events/UserRoleRevoked.js';
 import { ResourceNotFound } from '@spinajs/exceptions';
-import _ from 'lodash';
+import { revoke } from '../actions.js';
 let RevokeUserRole = class RevokeUserRole extends CliCommand {
     async execute(idOrUuid, role) {
-        const result = await User.where('Id', idOrUuid).orWhere('Uuid', idOrUuid).firstOrThrow(new ResourceNotFound('User with given id or uuid not found in db'));
-        result.Role = _.remove(result.Role, role);
-        await result.update();
-        this.Queue.emit(new UserRoleRevoked(idOrUuid, role));
-        this.Log.success(`User role revoked !`);
+        try {
+            await revoke(idOrUuid, role);
+            this.Log.success(`Role ${role} revoked from user ${idOrUuid}`);
+        }
+        catch (e) {
+            if (e instanceof ResourceNotFound) {
+                this.Log.error(`User ${idOrUuid} not found`);
+            }
+            else {
+                this.Log.error(`Error while revoking role ${role} from user ${idOrUuid} ${e.message}`);
+            }
+        }
     }
 };
 __decorate([
     Logger('rbac'),
     __metadata("design:type", Log)
 ], RevokeUserRole.prototype, "Log", void 0);
-__decorate([
-    Autoinject(QueueService),
-    __metadata("design:type", QueueService)
-], RevokeUserRole.prototype, "Queue", void 0);
 RevokeUserRole = __decorate([
     Command('rbac:user-revoke', 'Sets active or inactive user'),
     Argument('idOrUuid', 'numeric id or uuid'),

package/lib/mjs/cli/RevokeUserRole.js.map

@@ -1 +1 @@
-{"version":3,"file":"RevokeUserRole.js","sourceRoot":"","sources":["../../../src/cli/RevokeUserRole.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,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,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,CAAC,MAAM,QAAQ,CAAC;AAKhB,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,UAAU;IAOrC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,IAAY;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,YAAY,CAAC,IAAI,gBAAgB,CAAC,4CAA4C,CAAC,CAAC,CAAC;QAE3J,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1C,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;QAEtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QAErD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC1C,CAAC;CACF,CAAA;AAhBW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;2CAAC;AAGT;IADT,UAAU,CAAC,YAAY,CAAC;8BACR,YAAY;6CAAC;AALnB,cAAc;IAH1B,OAAO,CAAC,kBAAkB,EAAE,8BAA8B,CAAC;IAC3D,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;GACjB,cAAc,CAkB1B"}
+{"version":3,"file":"RevokeUserRole.js","sourceRoot":"","sources":["../../../src/cli/RevokeUserRole.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAKhC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,UAAU;IAIrC,KAAK,CAAC,OAAO,CAAC,QAAgB,EAAE,IAAY;QACjD,IAAI;YAEF,MAAM,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAE7B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,sBAAsB,QAAQ,EAAE,CAAC,CAAC;SAChE;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,YAAY,gBAAgB,EAAE;gBACjC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,QAAQ,YAAY,CAAC,CAAC;aAC9C;iBAAM;gBACL,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,IAAI,cAAc,QAAQ,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aACxF;SACF;IACH,CAAC;CACF,CAAA;AAhBW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;2CAAC;AAFR,cAAc;IAH1B,OAAO,CAAC,kBAAkB,EAAE,8BAA8B,CAAC;IAC3D,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;GACjB,cAAc,CAkB1B"}

package/lib/mjs/cli/UnbanUserSchedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UnbanUserSchedule.d.ts","sourceRoot":"","sources":["../../../src/cli/UnbanUserSchedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AAMnD,qBACa,iBAAkB,SAAQ,UAAU;IAE/C,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"}
+{"version":3,"file":"UnbanUserSchedule.d.ts","sourceRoot":"","sources":["../../../src/cli/UnbanUserSchedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAU,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AAInD,qBACa,iBAAkB,SAAQ,UAAU;IAE/C,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;CAYtC"}

package/lib/mjs/cli/UnbanUserSchedule.js

@@ -11,23 +11,9 @@ 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 UnbanUserSchedule = class UnbanUserSchedule extends CliCommand {
     async execute() {
-        new CronJob(this.CronSchedule, async () => {
-            const result = await UserAction.destroy()
-                .where('Persistent', false)
-                .andWhere('CreatedAt', '<=', DateTime.now().plus({
-                minutes: -this.TimelineTTL,
-            }));
-            if (result && result.RowsAffected > 0) {
-                this.Log.info(`Deleted ${result.RowsAffected} user timeline events`);
-            }
-            else {
-                this.Log.info(`No user timeline events do delete this time`);
-            }
-        }, () => {
+        new CronJob(this.CronSchedule, async () => { }, () => {
             this.Log.info('rbac:cleanup-schedule stopped');
         }, true);
         this.Log.success(`User password changed !`);

package/lib/mjs/cli/UnbanUserSchedule.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnbanUserSchedule.js","sourceRoot":"","sources":["../../../src/cli/UnbanUserSchedule.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,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,UAAU;IAUxC,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;AApCW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;8CAAC;AAGT;IADT,MAAM,CAAC,wBAAwB,CAAC;;uDACF;AAGrB;IADT,MAAM,CAAC,mBAAmB,CAAC;;sDACE;AARnB,iBAAiB;IAD7B,OAAO,CAAC,qBAAqB,EAAE,oDAAoD,CAAC;GACxE,iBAAiB,CAsC7B"}
+{"version":3,"file":"UnbanUserSchedule.js","sourceRoot":"","sources":["../../../src/cli/UnbanUserSchedule.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;AAGxB,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,UAAU;IAUxC,KAAK,CAAC,OAAO;QAClB,IAAI,OAAO,CACT,IAAI,CAAC,YAAY,EACjB,KAAK,IAAI,EAAE,GAAE,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;AApBW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;8CAAC;AAGT;IADT,MAAM,CAAC,wBAAwB,CAAC;;uDACF;AAGrB;IADT,MAAM,CAAC,mBAAmB,CAAC;;sDACE;AARnB,iBAAiB;IAD7B,OAAO,CAAC,qBAAqB,EAAE,oDAAoD,CAAC;GACxE,iBAAiB,CAsB7B"}