@servicelabsco/nestjs-utility-services 2.0.15 → 3.0.2

package/CHANGELOG.md

@@ -1 +1,126 @@
-RELEASE 1.0.0
+# Changelog
+
+## 3.0.0 — audit remediation (BREAKING)
+
+This is a **major** release. `2.0.15` was published from the `production` branch; `main` had since
+accumulated breaking changes that were sitting under an already-consumed patch version. Everything
+below lands at once.
+
+Read the **Action required** section before upgrading. For a breaker-by-breaker migration
+runbook (env escape hatches, SSRF, scripts, sessions, migrations), see
+**[docs/upgrade-3.0-backward-compatibility.md](docs/upgrade-3.0-backward-compatibility.md)**.
+
+### Action required
+
+**Runtime**
+
+- **Node 24 is now required** (`engines: ^24.11.0`; Node 22 dropped). Installs on Node 22 fail.
+
+**Environment variables**
+
+| Variable | Default | Why |
+|---|---|---|
+| `INTERNAL_SERVER_KEY` | _(none)_ | **Now effectively required.** The admin-mutable `internal.server.key` DB fallback is off by default — `internal/*` requests are rejected when neither this nor the opt-in below is set. |
+| `INTERNAL_SERVER_KEY_ALLOW_DB_FALLBACK` | `false` | Set to `true` only to restore the legacy DB-property fallback during migration. That row is editable from the admin API, so anyone who can write properties can mint the internal secret. |
+| `MAIL_ATTACHMENT_LOCAL_ROOT` | `os.tmpdir()` | Directory local mail attachments may be read from. Set it if your app writes attachments elsewhere, or those sends will be rejected. |
+
+**System properties** (all optional, all have safe defaults — no action needed unless you want to override)
+
+`lambda.split.pdf.url`, `lambda.split.pdf.max.bytes`, `lambda.split.pdf.timeout.ms`, `pdf.html.signed.url.ttl.seconds`.
+
+**Database**
+
+- Migrations drop `sys_event_logs` and `sys_system_logs`. **Data in those tables is destroyed** —
+  archive first if you need it. (`down()` recreates the shape, not the rows.)
+- The json→jsonb migration rewrites many `sys_` tables. It now skips columns already `jsonb` and is
+  re-runnable, but the first run still takes `ACCESS EXCLUSIVE` locks — **run it in a maintenance window**.
+- `pgcrypto` is required by the refresh-token migration. On a least-privilege database, create it
+  manually first; the migration now fails with an actionable message naming the required SQL.
+
+**Publishing** — `prepublishOnly` now refuses to publish unless `dist/index.js` and `dist/index.d.ts`
+exist. The barrels come from the out-of-repo `slnu` step, not `nest build`; run it before publishing.
+
+### Breaking API changes
+
+**Constructor signatures** (DI-wired consumers are unaffected; manual `new` breaks)
+
+- `MailService(propertyService, uploadService, awsClientFactory, emithookMailService)` — was
+  `(propertyService, uploadService, awsConfigService)`.
+- `PdfService` gained a 5th parameter, `StorageService`.
+- `EventQueueService` gained a 2nd parameter, `SqlService`.
+
+**Removed**
+
+- `EventLogEntity`, `SystemLogEntity`, `LoggerService`, `test.mongo.job`, `test.mentity`,
+  `role.mapping`, `sql.safety` (its helpers are now instance methods on `SqlService`), and ~28
+  subscriber stubs (folded into jobs via the `@SubscribeFor` registry).
+- `CommonJob` logging helpers (`log` / `info` / `warn` / `error` / `saveLogs`, `logIdentifier`,
+  `logJobActivity`, `disableLogging`).
+- `CommonMapperJob` is no longer generic — `extends CommonMapperJob<Foo>` must become
+  `extends CommonMapperJob`.
+- `engine.feature.support.dto` moved to `interfaces/engine.feature.support.interface`.
+
+**Behavioural**
+
+- `RemoteRequestService` now blocks SSRF targets: non-http(s) schemes, and hosts resolving to
+  loopback / private / link-local (incl. `169.254.169.254`) ranges — on the initial URL *and* on
+  redirect hops. **Calls to internal hosts now fail** unless you pass `allowInternal: true` on the
+  request options or source config. `getRawResponse` still never throws — a blocked URL returns
+  `{ success: false }`.
+- `PdfService.uploadHtml` / `getHtmlUrl` default to **`public-read`** and a permanent object URL
+  (pre-3.0 behaviour). Pass `{ private: true }` for a private object + time-limited presigned URL
+  (`pdf.html.signed.url.ttl.seconds`). Object names remain high-entropy either way.
+- Stored scripts may use legacy `fn.getService` / `fn.getEntity` / `fn.getJob` (and business-rule
+  `getServiceInstance` / `getEntityInstance`) again — they return **remote handles**, not host
+  objects. `fn.call*` / `fn.dispatchJob` remain available.
+- `ProcessSesMail` now **rejects** when SES fails. It previously resolved with the `Error` object,
+  producing a mail log indistinguishable from a successful send. This aligns `ses` with the `smtp`
+  and `sesRaw` gateways, which already rejected.
+- `MailService` throws `OperationException` when no mail gateway is configured, instead of crashing
+  with `Cannot destructure property 'identifier' of undefined`.
+- `RedisService.flushdb()` is now **prefix-scoped** — it deletes only this application's keys via
+  `SCAN`/`UNLINK`. `flushdb(true)` performs the old unscoped `FLUSHDB`. `keys()` uses `SCAN` instead
+  of the blocking `KEYS`.
+- `CommonSqsPolling` deletes a message only **after** the handler succeeds. A permanently-failing
+  message now redelivers (at-least-once) instead of being dropped on first attempt.
+- Kaleyra SMS honours `dialing_code` — **non-Indian numbers are now addressed correctly** rather than
+  being forced to `+91`. The API key is no longer duplicated into the request body.
+- A **revoked session is now rejected** (`AccessException`) instead of silently continuing as
+  anonymous. Logout genuinely invalidates the access token: login now issues and persists a
+  `session_identifier`, which the previous release signed nowhere, leaving revocation inert.
+- Refresh-token rotation claims the row atomically; a lost race is treated as reuse — the token
+  family is revoked and an `AccessException` is thrown.
+- Social login **refuses to auto-link** to an existing local account whose email was never verified.
+- Access checks fail closed. `hasRoleIdentifier`, `hasAbsoluteRoleId`, `hasAbsoluteRoleIdentifier`,
+  `hasPermissionId`, `hasPermissionIdentifier`, `hasAbsolutePermissionId` and
+  `hasAbsolutePermissionIdentifier` previously **granted** access when the user's role/permission
+  array was absent (`undefined !== -1`). If you relied on that, those calls now correctly deny.
+- `Money` arithmetic throws on a non-finite result (e.g. divide by zero) instead of yielding
+  `Infinity`/`NaN` and passing it to a Postgres `numeric` column.
+- Report keyset pagination models `NULLS FIRST/LAST`; reports ordering on a nullable column no longer
+  silently drop rows. Reports that previously failed to parse a `NULLS FIRST/LAST` clause now succeed.
+
+### Fixed
+
+Security: unauthenticated open mail relay removed; internal audit documents no longer published to
+npm; SSRF guards on outbound requests and mail attachments; arbitrary local-file read via mail
+attachments closed; world-readable, guessable PDF uploads made private; Emithook path-injection and
+unstable idempotency keys; Kaleyra API key kept out of request logs; privilege escalation in access
+checks; session revocation made functional; refresh-token rotation race; social account-link
+takeover; admin-mutable internal server key; sandbox no longer hands host objects to stored scripts;
+`/health/quick` no longer runs an unauthenticated heavy Redis probe and stack traces are not returned
+to anonymous callers.
+
+Correctness: `DynamoService.updateItem` existing-row read; mail dropping all but the first recipient;
+SQS polling processing only one batch per invocation, poison-message redelivery loops, and shared
+job-singleton state; duplicate event dispatch under overlapping schedulers; `NaN` BullMQ retention
+limits; `isMongoEntity` never matching; `CachedProperty` stale-on-error and loader dogpile;
+post-commit dispatch failures being silently swallowed; SQS FIFO batches serialised onto one group id;
+unbounded orphan-sweeper memory; manager SQL value interpolation.
+
+Tooling: CI now actually runs (it targeted a branch that does not exist) and gates lint, build and
+tests on Node 24.
+
+## 1.0.0
+
+Initial release.

package/README.md

@@ -24,7 +24,20 @@
 
 ## Description
 
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+NestJS utility library (`@servicelabsco/nestjs-utility-services`) — auth, system
+domain, platform services, jobs, and shared framework primitives for Finnoto apps.
+
+### Sentry reporting
+
+Consuming apps must wire early SDK init plus `SentryReportingModule`. See
+**[docs/sentry-reporting.md](docs/sentry-reporting.md)** for the full integration
+checklist (`instrument.ts`, `AppModule`, env vars, workers).
+
+### Upgrading to 3.x
+
+**[docs/upgrade-3.0-backward-compatibility.md](docs/upgrade-3.0-backward-compatibility.md)** —
+breaker-by-breaker migration guide (internal auth, SSRF, PDF URLs, scripts, access checks,
+sessions, SES, migrations) and which escape hatches exist.
 
 ## Installation
 

package/dist/app.controller.d.ts

@@ -5,13 +5,12 @@ import { MailService } from './platformUtility/services/mail.service';
 import { QueueService } from './platformUtility/services/queue.service';
 import { RedisService } from './platformUtility/services/redis.service';
 import { SqlService } from './platformUtility/services/sql.service';
+import { ZipService } from './platformUtility/services/zip.service';
 import { ExecuteCodeFixJob } from './system/jobs/execute.code.fix.job';
 import { SetScheduledEventJob } from './system/jobs/set.scheduled.event.job';
 import { SyncAllCodeJob } from './system/jobs/sync.all.code.job';
-import { LoggerService } from './system/services/logger.service';
 import { PropertyService } from './system/services/property.service';
 import { UploadService } from './system/services/upload.service';
-import { ZipService } from './platformUtility/services/zip.service';
 export declare class AppController {
     private readonly queueService;
     protected readonly testJob: TestJob;
@@ -24,16 +23,18 @@ export declare class AppController {
     protected readonly auditService: AuditService;
     protected readonly redisService: RedisService;
     protected readonly uploadService: UploadService;
-    protected readonly loggerService: LoggerService;
     protected readonly cacheService: CacheService;
     protected readonly zipService: ZipService;
-    constructor(queueService: QueueService, testJob: TestJob, setScheduledEventJob: SetScheduledEventJob, mailService: MailService, propertyService: PropertyService, sqlService: SqlService, executeCodeFixJob: ExecuteCodeFixJob, syncAllCodeJob: SyncAllCodeJob, auditService: AuditService, redisService: RedisService, uploadService: UploadService, loggerService: LoggerService, cacheService: CacheService, zipService: ZipService);
+    constructor(queueService: QueueService, testJob: TestJob, setScheduledEventJob: SetScheduledEventJob, mailService: MailService, propertyService: PropertyService, sqlService: SqlService, executeCodeFixJob: ExecuteCodeFixJob, syncAllCodeJob: SyncAllCodeJob, auditService: AuditService, redisService: RedisService, uploadService: UploadService, cacheService: CacheService, zipService: ZipService);
     get(): Promise<{
         message: string;
     }>;
+    getError(): void;
     getUserAuthObject(): Promise<any>;
     testOne(): Promise<any>;
-    testEmithookMail(to?: string): Promise<any>;
     getQueueInstance(): Promise<any>;
     queue(id: string): Promise<any>;
+    fileHash(str: string): {
+        hash: string;
+    };
 }

package/dist/app.controller.js

@@ -14,9 +14,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppController = void 0;
 const common_1 = require("@nestjs/common");
-const class_transformer_1 = require("class-transformer");
 const auth_1 = require("./common/libraries/auth");
-const mail_options_dto_1 = require("./platformUtility/dtos/mail.options.dto");
+const hash_1 = require("./common/libraries/hash");
 const test_job_1 = require("./platformUtility/jobs/test.job");
 const audit_service_1 = require("./platformUtility/services/audit.service");
 const cache_service_1 = require("./platformUtility/services/cache.service");
@@ -24,15 +23,14 @@ const mail_service_1 = require("./platformUtility/services/mail.service");
 const queue_service_1 = require("./platformUtility/services/queue.service");
 const redis_service_1 = require("./platformUtility/services/redis.service");
 const sql_service_1 = require("./platformUtility/services/sql.service");
+const zip_service_1 = require("./platformUtility/services/zip.service");
 const execute_code_fix_job_1 = require("./system/jobs/execute.code.fix.job");
 const set_scheduled_event_job_1 = require("./system/jobs/set.scheduled.event.job");
 const sync_all_code_job_1 = require("./system/jobs/sync.all.code.job");
-const logger_service_1 = require("./system/services/logger.service");
 const property_service_1 = require("./system/services/property.service");
 const upload_service_1 = require("./system/services/upload.service");
-const zip_service_1 = require("./platformUtility/services/zip.service");
 let AppController = class AppController {
-    constructor(queueService, testJob, setScheduledEventJob, mailService, propertyService, sqlService, executeCodeFixJob, syncAllCodeJob, auditService, redisService, uploadService, loggerService, cacheService, zipService) {
+    constructor(queueService, testJob, setScheduledEventJob, mailService, propertyService, sqlService, executeCodeFixJob, syncAllCodeJob, auditService, redisService, uploadService, cacheService, zipService) {
         this.queueService = queueService;
         this.testJob = testJob;
         this.setScheduledEventJob = setScheduledEventJob;
@@ -44,50 +42,30 @@ let AppController = class AppController {
         this.auditService = auditService;
         this.redisService = redisService;
         this.uploadService = uploadService;
-        this.loggerService = loggerService;
         this.cacheService = cacheService;
         this.zipService = zipService;
     }
     async get() {
         return { message: 'Hello World!' };
     }
+    getError() {
+        throw new Error('My first Sentry error!');
+    }
     async getUserAuthObject() {
         return auth_1.Auth.user();
     }
     async testOne() {
         return auth_1.Auth.user();
     }
-    async testEmithookMail(to) {
-        try {
-            const log = await this.mailService.send((0, class_transformer_1.plainToClass)(mail_options_dto_1.MailOptionsDto, {
-                gateway: 'emithook',
-                to: to || 'hemantanshu@gmail.com',
-                subject: 'Emithook test from nestjs-utility-services',
-                html: '<p>Test email sent via MailService with the Emithook gateway.</p>',
-                idempotency_key: `nu-emithook-test-${Date.now()}`,
-            }));
-            return {
-                success: true,
-                mail_log_id: log?.id,
-                gateway: log?.gateway,
-                identifier: log?.identifier,
-                subject: log?.subject,
-                body: log?.body,
-            };
-        }
-        catch (error) {
-            return {
-                success: false,
-                error: error?.message || String(error),
-            };
-        }
-    }
     async getQueueInstance() {
         return this.queueService.data;
     }
     async queue(id) {
         return this.queueService.getJobDetails(id);
     }
+    fileHash(str) {
+        return { hash: hash_1.Hash.hashMD5(str) };
+    }
 };
 exports.AppController = AppController;
 __decorate([
@@ -96,6 +74,12 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], AppController.prototype, "get", null);
+__decorate([
+    (0, common_1.Get)('/debug-sentry'),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], AppController.prototype, "getError", null);
 __decorate([
     (0, common_1.Get)('api/auth'),
     __metadata("design:type", Function),
@@ -108,13 +92,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], AppController.prototype, "testOne", null);
-__decorate([
-    (0, common_1.Get)('test/emithook-mail'),
-    __param(0, (0, common_1.Query)('to')),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String]),
-    __metadata("design:returntype", Promise)
-], AppController.prototype, "testEmithookMail", null);
 __decorate([
     (0, common_1.Get)('api/admin/queue-instance'),
     __metadata("design:type", Function),
@@ -128,6 +105,13 @@ __decorate([
     __metadata("design:paramtypes", [String]),
     __metadata("design:returntype", Promise)
 ], AppController.prototype, "queue", null);
+__decorate([
+    (0, common_1.Get)('api/admin/file-hash/:str'),
+    __param(0, (0, common_1.Param)('str')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Object)
+], AppController.prototype, "fileHash", null);
 exports.AppController = AppController = __decorate([
     (0, common_1.Controller)(),
     __metadata("design:paramtypes", [queue_service_1.QueueService,
@@ -141,7 +125,6 @@ exports.AppController = AppController = __decorate([
         audit_service_1.AuditService,
         redis_service_1.RedisService,
         upload_service_1.UploadService,
-        logger_service_1.LoggerService,
         cache_service_1.CacheService,
         zip_service_1.ZipService])
 ], AppController);

package/dist/app.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAwD;AACxD,kDAA+C;AAC/C,kDAA+C;AAC/C,8DAA0D;AAC1D,4EAAwE;AACxE,4EAAwE;AACxE,0EAAsE;AACtE,4EAAwE;AACxE,4EAAwE;AACxE,wEAAoE;AACpE,wEAAoE;AACpE,6EAAuE;AACvE,mFAA6E;AAC7E,uEAAiE;AACjE,yEAAqE;AACrE,qEAAiE;AAS1D,IAAM,aAAa,GAAnB,MAAM,aAAa;IAetB,YACqB,YAA0B,EACxB,OAAgB,EAChB,oBAA0C,EAC1C,WAAwB,EACxB,eAAgC,EAChC,UAAsB,EACtB,iBAAoC,EACpC,cAA8B,EAC9B,YAA0B,EAC1B,YAA0B,EAC1B,aAA4B,EAC5B,YAA0B,EAC1B,UAAsB;QAZxB,iBAAY,GAAZ,YAAY,CAAc;QACxB,YAAO,GAAP,OAAO,CAAS;QAChB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,eAAU,GAAV,UAAU,CAAY;IAC1C,CAAC;IAOE,AAAN,KAAK,CAAC,GAAG;QACL,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACvC,CAAC;IAGD,QAAQ;QACJ,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC9C,CAAC;IAOK,AAAN,KAAK,CAAC,iBAAiB;QACnB,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAOK,AAAN,KAAK,CAAC,OAAO;QACT,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAQK,AAAN,KAAK,CAAC,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IAClC,CAAC;IASK,AAAN,KAAK,CAAC,KAAK,CAAc,EAAU;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAUD,QAAQ,CAAe,GAAW;QAC9B,OAAO,EAAE,IAAI,EAAE,WAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;IACvC,CAAC;CACJ,CAAA;AA/FY,sCAAa;AAoChB;IADL,IAAA,YAAG,GAAE;;;;wCAGL;AAGD;IADC,IAAA,YAAG,EAAC,eAAe,CAAC;;;;6CAGpB;AAOK;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;;;;sDAGf;AAOK;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;;;;4CAGf;AAQK;IADL,IAAA,YAAG,EAAC,0BAA0B,CAAC;;;;qDAG/B;AASK;IADL,IAAA,YAAG,EAAC,8BAA8B,CAAC;IACvB,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;0CAEvB;AAUD;IADC,IAAA,YAAG,EAAC,0BAA0B,CAAC;IACtB,WAAA,IAAA,cAAK,EAAC,KAAK,CAAC,CAAA;;;;6CAErB;wBA9FQ,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAiB0B,4BAAY;QACf,kBAAO;QACM,8CAAoB;QAC7B,0BAAW;QACP,kCAAe;QACpB,wBAAU;QACH,wCAAiB;QACpB,kCAAc;QAChB,4BAAY;QACZ,4BAAY;QACX,8BAAa;QACd,4BAAY;QACd,wBAAU;GA5BpC,aAAa,CA+FzB"}

package/dist/app.module.js

@@ -61,6 +61,7 @@ const ormconfig = __importStar(require("./config/typeorm.config"));
 const health_check_controller_1 = require("./health.check.controller");
 const maintenance_middleware_1 = require("./platformUtility/middlewares/maintenance.middleware");
 const platform_utility_module_1 = require("./platformUtility/platform.utility.module");
+const sentry_reporting_module_1 = require("./platformUtility/sentry.reporting.module");
 const shutdown_service_1 = require("./platformUtility/services/shutdown.service");
 const security_module_1 = require("./security/security.module");
 const menu_controller_1 = require("./system/controllers/menu.controller");
@@ -68,17 +69,23 @@ const system_module_1 = require("./system/system.module");
 const worker_service_1 = require("./worker.service");
 let AppModule = class AppModule {
     configure(consumer) {
-        consumer.apply(maintenance_middleware_1.MaintenanceMiddleware).forRoutes({ path: '*', method: common_1.RequestMethod.ALL });
+        consumer
+            .apply(maintenance_middleware_1.MaintenanceMiddleware)
+            .exclude({ path: 'health', method: common_1.RequestMethod.ALL }, { path: 'health/(.*)', method: common_1.RequestMethod.ALL })
+            .forRoutes({ path: '*', method: common_1.RequestMethod.ALL });
         consumer.apply(jwt_middleware_1.JwtMiddleware).forRoutes({ path: '*', method: common_1.RequestMethod.ALL });
         consumer.apply(basic_auth_middleware_1.BasicAuthMiddleware).forRoutes({ path: '*', method: common_1.RequestMethod.ALL });
         consumer.apply(restricted_middleware_1.RestrictedMiddleware).forRoutes({ path: 'api/*', method: common_1.RequestMethod.ALL });
-        consumer.apply(internal_middleware_1.InternalMiddleware).forRoutes({ path: 'internal/*', method: common_1.RequestMethod.ALL });
+        consumer
+            .apply(internal_middleware_1.InternalMiddleware)
+            .forRoutes({ path: 'internal/*', method: common_1.RequestMethod.ALL }, { path: 'health/detailed', method: common_1.RequestMethod.GET });
     }
 };
 exports.AppModule = AppModule;
 exports.AppModule = AppModule = __decorate([
     (0, common_1.Module)({
         imports: [
+            sentry_reporting_module_1.SentryReportingModule.forRoot(),
             typeorm_1.TypeOrmModule.forRoot(ormconfig),
             typeorm_1.TypeOrmModule.forRoot(readOrmconfig),
             typeorm_1.TypeOrmModule.forRoot(mongoOrmconfig),

package/dist/app.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA2E;AAC3E,2CAA8C;AAC9C,+CAAkD;AAClD,6CAAgD;AAChD,qDAAiD;AACjD,+CAA2C;AAC3C,oDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,gFAA4E;AAC5E,sEAAkE;AAClE,oFAAgF;AAChF,0DAAsD;AACtD,sEAAwD;AACxD,mEAAqD;AACrD,4EAA8D;AAC9D,mEAAqD;AACrD,uEAAkE;AAClE,iGAA6F;AAC7F,uFAAkF;AAClF,kFAA8E;AAC9E,gEAA4D;AAC5D,0EAAsE;AACtE,0DAAsD;AACtD,qDAAiD;AAqB1C,IAAM,SAAS,GAAf,MAAM,SAAS;IAGlB,SAAS,CAAC,QAA4B;QAClC,QAAQ,CAAC,KAAK,CAAC,8CAAqB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAC1F,QAAQ,CAAC,KAAK,CAAC,8BAAa,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,KAAK,CAAC,2CAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,QAAQ,CAAC,KAAK,CAAC,4CAAoB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7F,QAAQ,CAAC,KAAK,CAAC,wCAAkB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;IACpG,CAAC;CACJ,CAAA;AAVY,8BAAS;oBAAT,SAAS;IApBrB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,uBAAa,CAAC,OAAO,CAAC,SAAS,CAAC;YAChC,uBAAa,CAAC,OAAO,CAAC,aAAa,CAAC;YACpC,uBAAa,CAAC,OAAO,CAAC,cAAc,CAAC;YACrC,mBAAU,CAAC,OAAO,CAAC,WAAW,CAAC;YAC/B,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACxC,+CAAqB;YACrB,wBAAU;YACV,4BAAY;YACZ,gCAAc;YACd,4BAAY;YACZ,yBAAc,CAAC,OAAO,CAAC;gBACnB,aAAa,EAAE,QAAQ;gBACvB,MAAM,EAAE,IAAI;aACf,CAAC;SACL;QACD,WAAW,EAAE,CAAC,8BAAa,EAAE,2CAAmB,EAAE,gCAAc,EAAE,+CAAqB,CAAC;QACxF,SAAS,EAAE,CAAC,wBAAU,EAAE,8BAAa,EAAE,kCAAe,CAAC;KAC1D,CAAC;GACW,SAAS,CAUrB"}
+{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA2E;AAC3E,2CAA8C;AAC9C,+CAAkD;AAClD,6CAAgD;AAChD,qDAAiD;AACjD,+CAA2C;AAC3C,oDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,gFAA4E;AAC5E,sEAAkE;AAClE,oFAAgF;AAChF,0DAAsD;AACtD,sEAAwD;AACxD,mEAAqD;AACrD,4EAA8D;AAC9D,mEAAqD;AACrD,uEAAkE;AAClE,iGAA6F;AAC7F,uFAAkF;AAClF,uFAAkF;AAClF,kFAA8E;AAC9E,gEAA4D;AAC5D,0EAAsE;AACtE,0DAAsD;AACtD,qDAAiD;AAuB1C,IAAM,SAAS,GAAf,MAAM,SAAS;IAGlB,SAAS,CAAC,QAA4B;QAIlC,QAAQ;aACH,KAAK,CAAC,8CAAqB,CAAC;aAC5B,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC;aAC1G,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QACzD,QAAQ,CAAC,KAAK,CAAC,8BAAa,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAClF,QAAQ,CAAC,KAAK,CAAC,2CAAmB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,QAAQ,CAAC,KAAK,CAAC,4CAAoB,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7F,QAAQ;aACH,KAAK,CAAC,wCAAkB,CAAC;aAIzB,SAAS,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,sBAAa,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9H,CAAC;CACJ,CAAA;AArBY,8BAAS;oBAAT,SAAS;IArBrB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,+CAAqB,CAAC,OAAO,EAAE;YAC/B,uBAAa,CAAC,OAAO,CAAC,SAAS,CAAC;YAChC,uBAAa,CAAC,OAAO,CAAC,aAAa,CAAC;YACpC,uBAAa,CAAC,OAAO,CAAC,cAAc,CAAC;YACrC,mBAAU,CAAC,OAAO,CAAC,WAAW,CAAC;YAC/B,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACxC,+CAAqB;YACrB,wBAAU;YACV,4BAAY;YACZ,gCAAc;YACd,4BAAY;YACZ,yBAAc,CAAC,OAAO,CAAC;gBACnB,aAAa,EAAE,QAAQ;gBACvB,MAAM,EAAE,IAAI;aACf,CAAC;SACL;QACD,WAAW,EAAE,CAAC,8BAAa,EAAE,2CAAmB,EAAE,gCAAc,EAAE,+CAAqB,CAAC;QACxF,SAAS,EAAE,CAAC,wBAAU,EAAE,8BAAa,EAAE,kCAAe,CAAC;KAC1D,CAAC;GACW,SAAS,CAqBrB"}

package/dist/auth/controllers/admin.auth.controller.d.ts

@@ -4,16 +4,20 @@ import { UserLoginDto } from '../dtos/user.login.dto';
 import { DeviceTokenEntity } from '../entities/device.token.entity';
 import { AuthService } from '../services/auth.service';
 import { DeviceTokenService } from '../services/device.token.service';
+import { RefreshTokenService } from '../services/refresh.token.service';
 import { UserService } from '../services/user.service';
 export declare class AdminAuthController {
     private readonly authService;
     private readonly userService;
     private readonly deviceTokenService;
-    constructor(authService: AuthService, userService: UserService, deviceTokenService: DeviceTokenService);
+    private readonly refreshTokenService;
+    constructor(authService: AuthService, userService: UserService, deviceTokenService: DeviceTokenService, refreshTokenService: RefreshTokenService);
     checkLogin(): Promise<UserAccessDto>;
     login(body: UserLoginDto, req: Request): Promise<UserAccessDto>;
     loginInfo(req: Request | any): Promise<any>;
     device(req: Request, body: DeviceTokenEntity): Promise<DeviceTokenEntity>;
     getToken(req: Request, token: string): Promise<UserAccessDto>;
-    logout(req: Request): Promise<any>;
+    logout(req: Request): Promise<{
+        status: 'ok';
+    }>;
 }

package/dist/auth/controllers/admin.auth.controller.js

@@ -25,12 +25,14 @@ const refresh_token_entity_1 = require("../entities/refresh.token.entity");
 const user_entity_1 = require("../entities/user.entity");
 const auth_service_1 = require("../services/auth.service");
 const device_token_service_1 = require("../services/device.token.service");
+const refresh_token_service_1 = require("../services/refresh.token.service");
 const user_service_1 = require("../services/user.service");
 let AdminAuthController = class AdminAuthController {
-    constructor(authService, userService, deviceTokenService) {
+    constructor(authService, userService, deviceTokenService, refreshTokenService) {
         this.authService = authService;
         this.userService = userService;
         this.deviceTokenService = deviceTokenService;
+        this.refreshTokenService = refreshTokenService;
     }
     async checkLogin() {
         const auth = auth_1.Auth.user();
@@ -62,40 +64,51 @@ let AdminAuthController = class AdminAuthController {
         return this.deviceTokenService.setDeviceToken(req, body);
     }
     async getToken(req, token) {
-        const record = await refresh_token_entity_1.RefreshTokenEntity.findOne({
-            where: {
-                token,
-            },
-            relations: ['device'],
-        });
-        if (!record)
+        const record = await this.refreshTokenService.findByRawToken(token);
+        if (!record) {
+            throw new access_exception_1.AccessException('Refresh token has either expired or is not valid');
+        }
+        if (record.used_at) {
+            await this.refreshTokenService.revokeFamily(record);
+            throw new access_exception_1.AccessException('Refresh token has either expired or is not valid');
+        }
+        if (record.revoked_at) {
             throw new access_exception_1.AccessException('Refresh token has either expired or is not valid');
-        if (record.device && record.device.uuid !== req.headers['u-device-identifier'])
+        }
+        const requestDeviceIdentifier = req.headers['u-device-identifier'];
+        if (!record.device || record.device.uuid !== requestDeviceIdentifier) {
             throw new access_exception_1.AccessException('Invalid refresh token against the registered device');
-        if (record.validity_datetime < new Date())
+        }
+        if (record.validity_datetime < new Date()) {
             throw new access_exception_1.AccessException('Refresh token has expired');
+        }
         const user = await user_entity_1.UserEntity.first(record.user_id);
-        if (this.authService.isUserBlocked(user))
+        if (this.authService.isUserBlocked(user)) {
             throw new operation_exception_1.OperationException('This user is blocked from the platform');
-        record.validity_datetime = date_util_1.DateUtil.getFutureDateTime(30 * 24 * 60);
-        record.last_access_datetime = date_util_1.DateUtil.getDateTime();
-        await record.save();
-        return this.authService.getUserInfo({ id: record.user_id });
+        }
+        const { rawToken } = await this.refreshTokenService.rotate(record);
+        const info = await this.authService.getUserInfo({ id: record.user_id });
+        info.refresh_token = rawToken;
+        return info;
     }
     async logout(req) {
         const deviceIdentifier = req.headers['u-device-identifier'];
+        await this.authService.revokeSession();
         const device = await device_token_entity_1.DeviceTokenEntity.findOne({
             where: { uuid: deviceIdentifier },
         });
         if (!device)
-            return;
+            return { status: 'ok' };
         const refreshTokens = await refresh_token_entity_1.RefreshTokenEntity.find({
             where: { device_id: device.id },
         });
+        const now = date_util_1.DateUtil.getDateTime();
         for (const token of refreshTokens) {
+            token.revoked_at = now;
+            await token.save();
             await token.softDelete();
         }
-        return refreshTokens;
+        return { status: 'ok' };
     }
 };
 exports.AdminAuthController = AdminAuthController;
@@ -147,6 +160,7 @@ exports.AdminAuthController = AdminAuthController = __decorate([
     (0, common_1.Controller)('user-auth'),
     __metadata("design:paramtypes", [auth_service_1.AuthService,
         user_service_1.UserService,
-        device_token_service_1.DeviceTokenService])
+        device_token_service_1.DeviceTokenService,
+        refresh_token_service_1.RefreshTokenService])
 ], AdminAuthController);
 //# sourceMappingURL=admin.auth.controller.js.map

package/dist/auth/controllers/admin.auth.controller.js.map

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

package/dist/auth/controllers/social.controller.d.ts

@@ -1,10 +1,12 @@
 import { Request } from 'express';
 import { AuthService } from '../services/auth.service';
+import { SocialIdentityService } from '../services/social.identity.service';
 import { SocialService } from '../services/social.service';
 export declare class SocialController {
     private readonly authService;
     private readonly socialService;
-    constructor(authService: AuthService, socialService: SocialService);
+    private readonly socialIdentityService;
+    constructor(authService: AuthService, socialService: SocialService, socialIdentityService: SocialIdentityService);
     fbLogin(req: Request, accessToken: string): Promise<any>;
-    googleLogin(req: Request, accessToken: string): Promise<any>;
+    googleLogin(req: Request, accessToken: string, idToken?: string): Promise<any>;
 }

package/dist/auth/controllers/social.controller.js

@@ -15,20 +15,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SocialController = void 0;
 const common_1 = require("@nestjs/common");
 const auth_service_1 = require("../services/auth.service");
+const social_identity_service_1 = require("../services/social.identity.service");
 const social_service_1 = require("../services/social.service");
 let SocialController = class SocialController {
-    constructor(authService, socialService) {
+    constructor(authService, socialService, socialIdentityService) {
         this.authService = authService;
         this.socialService = socialService;
+        this.socialIdentityService = socialIdentityService;
     }
     async fbLogin(req, accessToken) {
-        const user = await this.socialService.fbLogin(accessToken);
-        if (!user)
+        if (!accessToken)
             throw new common_1.UnauthorizedException();
-        return this.authService.getUserLoginInfo(user, req);
+        const identity = await this.socialService.verifyFacebook(accessToken);
+        const localUser = await this.socialIdentityService.resolveOrCreate(identity);
+        return this.authService.getUserLoginInfo({ id: localUser.id }, req);
     }
-    async googleLogin(req, accessToken) {
-        return this.socialService.googleLogin(accessToken);
+    async googleLogin(req, accessToken, idToken) {
+        const token = idToken ?? accessToken;
+        if (!token)
+            throw new common_1.UnauthorizedException();
+        const identity = await this.socialService.verifyGoogle(token, !!idToken);
+        const localUser = await this.socialIdentityService.resolveOrCreate(identity);
+        return this.authService.getUserLoginInfo({ id: localUser.id }, req);
     }
 };
 exports.SocialController = SocialController;
@@ -44,13 +52,15 @@ __decorate([
     (0, common_1.Post)('google'),
     __param(0, (0, common_1.Req)()),
     __param(1, (0, common_1.Body)('access_token')),
+    __param(2, (0, common_1.Body)('id_token')),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, String]),
+    __metadata("design:paramtypes", [Object, String, String]),
     __metadata("design:returntype", Promise)
 ], SocialController.prototype, "googleLogin", null);
 exports.SocialController = SocialController = __decorate([
     (0, common_1.Controller)('social'),
     __metadata("design:paramtypes", [auth_service_1.AuthService,
-        social_service_1.SocialService])
+        social_service_1.SocialService,
+        social_identity_service_1.SocialIdentityService])
 ], SocialController);
 //# sourceMappingURL=social.controller.js.map

package/dist/auth/controllers/social.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"social.controller.js","sourceRoot":"","sources":["../../../src/auth/controllers/social.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoF;AAEpF,2DAAuD;AACvD,+DAA2D;AASpD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAMzB,YACqB,WAAwB,EACxB,aAA4B;QAD5B,gBAAW,GAAX,WAAW,CAAa;QACxB,kBAAa,GAAb,aAAa,CAAe;IAC9C,CAAC;IAUE,AAAN,KAAK,CAAC,OAAO,CAAQ,GAAY,EAAwB,WAAmB;QACxE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,8BAAqB,EAAE,CAAC;QAE7C,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC;IASK,AAAN,KAAK,CAAC,WAAW,CAAQ,GAAY,EAAwB,WAAmB;QAC5E,OAAO,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;CACJ,CAAA;AApCY,4CAAgB;AAmBnB;IADL,IAAA,aAAI,EAAC,IAAI,CAAC;IACI,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,aAAI,EAAC,cAAc,CAAC,CAAA;;;;+CAKvD;AASK;IADL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACI,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,aAAI,EAAC,cAAc,CAAC,CAAA;;;;mDAE3D;2BAnCQ,gBAAgB;IAD5B,IAAA,mBAAU,EAAC,QAAQ,CAAC;qCAQiB,0BAAW;QACT,8BAAa;GARxC,gBAAgB,CAoC5B"}
+{"version":3,"file":"social.controller.js","sourceRoot":"","sources":["../../../src/auth/controllers/social.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoF;AAEpF,2DAAuD;AACvD,iFAA4E;AAC5E,+DAA2D;AAWpD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAOzB,YACqB,WAAwB,EACxB,aAA4B,EAC5B,qBAA4C;QAF5C,gBAAW,GAAX,WAAW,CAAa;QACxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;IAC9D,CAAC;IASE,AAAN,KAAK,CAAC,OAAO,CAAQ,GAAY,EAAwB,WAAmB;QACxE,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,8BAAqB,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAUK,AAAN,KAAK,CAAC,WAAW,CAAQ,GAAY,EAAwB,WAAmB,EAAoB,OAAgB;QAChH,MAAM,KAAK,GAAG,OAAO,IAAI,WAAW,CAAC;QACrC,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,8BAAqB,EAAE,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QACzE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;CACJ,CAAA;AA1CY,4CAAgB;AAoBnB;IADL,IAAA,aAAI,EAAC,IAAI,CAAC;IACI,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,aAAI,EAAC,cAAc,CAAC,CAAA;;;;+CAKvD;AAUK;IADL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACI,WAAA,IAAA,YAAG,GAAE,CAAA;IAAgB,WAAA,IAAA,aAAI,EAAC,cAAc,CAAC,CAAA;IAAuB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;;;;mDAMlG;2BAzCQ,gBAAgB;IAD5B,IAAA,mBAAU,EAAC,QAAQ,CAAC;qCASiB,0BAAW;QACT,8BAAa;QACL,+CAAqB;GAVxD,gBAAgB,CA0C5B"}

package/dist/auth/controllers/user.controller.d.ts

@@ -4,8 +4,8 @@ import { UserEntity } from '../entities/user.entity';
 import { AuthService } from '../services/auth.service';
 import { UserService } from '../services/user.service';
 export declare class UserController {
-    private readonly s;
+    private readonly userService;
     private readonly authService;
-    constructor(s: UserService, authService: AuthService);
+    constructor(userService: UserService, authService: AuthService);
     signUp(createUser: CreateUserDto, request: Request): Promise<UserEntity>;
 }