@hed-hog/core 0.0.399 → 0.0.401

package/dist/notification/notification.service.d.ts

@@ -3,18 +3,20 @@ import { PrismaService } from '@hed-hog/api-prisma';
 import { OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import type { Request, Response } from 'express';
+import { RealtimeService } from '../realtime/realtime.service';
 import { CreateNotificationDto } from './dto/create-notification.dto';
 import { UpdateProgressDto } from './dto/update-progress.dto';
 export declare class NotificationService implements OnModuleInit, OnModuleDestroy {
     private readonly prisma;
     private readonly pagination;
     private readonly eventEmitter;
+    private readonly realtime;
     private readonly logger;
     private readonly notificationEvents;
     private readonly instanceId;
     private readonly channelName;
     private pgClient;
-    constructor(prisma: PrismaService, pagination: PaginationService, eventEmitter: EventEmitter2);
+    constructor(prisma: PrismaService, pagination: PaginationService, eventEmitter: EventEmitter2, realtime: RealtimeService);
     onModuleInit(): Promise<void>;
     onModuleDestroy(): Promise<void>;
     list(userId: number, paginationParams: any): Promise<{
@@ -28,6 +30,16 @@ export declare class NotificationService implements OnModuleInit, OnModuleDestro
     }>;
     private cleanupStaleProgressNotifications;
     notifyUpdated(userId: number): Promise<void>;
+    /**
+     * Avisa que o usuário ganhou uma recompensa de gamificação, para o cliente
+     * buscar a fila dele.
+     *
+     * Sem payload de propósito: a recompensa mora em `lms_student_reward` com o
+     * `seen_at` como fonte da verdade — mandar o conteúdo aqui abriria caminho
+     * para comemorar duas vezes entre a web e o app, e engordaria o `pg_notify`,
+     * cujo teto de 8000 bytes falha calado (ver `broadcastNotificationEvent`).
+     */
+    notifyRewardGranted(userId: number): Promise<void>;
     unreadCount(userId: number): Promise<{
         count: number;
     }>;
@@ -36,18 +48,18 @@ export declare class NotificationService implements OnModuleInit, OnModuleDestro
         user_id: number;
         created_at: Date;
         updated_at: Date;
-        type: import("@prisma/client").$Enums.notification_type_934e7a71cc_enum;
+        status: import("@prisma/client").$Enums.notification_status_enum;
+        started_at: Date | null;
+        finished_at: Date | null;
+        type: import("@prisma/client").$Enums.notification_type_enum;
         body: string | null;
-        status: import("@prisma/client").$Enums.notification_status_3a7944cf59_enum;
         icon: string | null;
         title: string;
         progress: number | null;
-        action_type: import("@prisma/client").$Enums.notification_action_type_f5ed983546_enum | null;
+        action_type: import("@prisma/client").$Enums.notification_action_type_enum | null;
         action_data: import("@prisma/client/runtime/library").JsonValue | null;
         action_url: string | null;
         auto_remove: boolean;
-        started_at: Date | null;
-        finished_at: Date | null;
     }>;
     markAllRead(userId: number): Promise<import("@prisma/client").Prisma.BatchPayload>;
     delete(userId: number, id: number): Promise<{
@@ -55,18 +67,18 @@ export declare class NotificationService implements OnModuleInit, OnModuleDestro
         user_id: number;
         created_at: Date;
         updated_at: Date;
-        type: import("@prisma/client").$Enums.notification_type_934e7a71cc_enum;
+        status: import("@prisma/client").$Enums.notification_status_enum;
+        started_at: Date | null;
+        finished_at: Date | null;
+        type: import("@prisma/client").$Enums.notification_type_enum;
         body: string | null;
-        status: import("@prisma/client").$Enums.notification_status_3a7944cf59_enum;
         icon: string | null;
         title: string;
         progress: number | null;
-        action_type: import("@prisma/client").$Enums.notification_action_type_f5ed983546_enum | null;
+        action_type: import("@prisma/client").$Enums.notification_action_type_enum | null;
         action_data: import("@prisma/client/runtime/library").JsonValue | null;
         action_url: string | null;
         auto_remove: boolean;
-        started_at: Date | null;
-        finished_at: Date | null;
     }>;
     deleteAll(userId: number): Promise<import("@prisma/client").Prisma.BatchPayload>;
     create(data: CreateNotificationDto): Promise<{
@@ -74,36 +86,36 @@ export declare class NotificationService implements OnModuleInit, OnModuleDestro
         user_id: number;
         created_at: Date;
         updated_at: Date;
-        type: import("@prisma/client").$Enums.notification_type_934e7a71cc_enum;
+        status: import("@prisma/client").$Enums.notification_status_enum;
+        started_at: Date | null;
+        finished_at: Date | null;
+        type: import("@prisma/client").$Enums.notification_type_enum;
         body: string | null;
-        status: import("@prisma/client").$Enums.notification_status_3a7944cf59_enum;
         icon: string | null;
         title: string;
         progress: number | null;
-        action_type: import("@prisma/client").$Enums.notification_action_type_f5ed983546_enum | null;
+        action_type: import("@prisma/client").$Enums.notification_action_type_enum | null;
         action_data: import("@prisma/client/runtime/library").JsonValue | null;
         action_url: string | null;
         auto_remove: boolean;
-        started_at: Date | null;
-        finished_at: Date | null;
     }>;
     updateProgress(userId: number, id: number, dto: UpdateProgressDto): Promise<{
         id: number;
         user_id: number;
         created_at: Date;
         updated_at: Date;
-        type: import("@prisma/client").$Enums.notification_type_934e7a71cc_enum;
+        status: import("@prisma/client").$Enums.notification_status_enum;
+        started_at: Date | null;
+        finished_at: Date | null;
+        type: import("@prisma/client").$Enums.notification_type_enum;
         body: string | null;
-        status: import("@prisma/client").$Enums.notification_status_3a7944cf59_enum;
         icon: string | null;
         title: string;
         progress: number | null;
-        action_type: import("@prisma/client").$Enums.notification_action_type_f5ed983546_enum | null;
+        action_type: import("@prisma/client").$Enums.notification_action_type_enum | null;
         action_data: import("@prisma/client/runtime/library").JsonValue | null;
         action_url: string | null;
         auto_remove: boolean;
-        started_at: Date | null;
-        finished_at: Date | null;
     }>;
     stream(userId: number, req: Request, res: Response): void;
     clearOldNotifications(retentionDays: number, batchLimit: number): Promise<number>;

package/dist/notification/notification.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"notification.service.d.ts","sourceRoot":"","sources":["../../src/notification/notification.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAQH,eAAe,EACf,YAAY,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAsB9D,qBACa,mBAAoB,YAAW,YAAY,EAAE,eAAe;IASrE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAX/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;IACzD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IACrD,OAAO,CAAC,QAAQ,CAAuB;gBAIpB,MAAM,EAAE,aAAa,EAErB,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,aAAa;IAKxC,YAAY;IAwBZ,eAAe;IAkBf,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG;;;;;;;;;YAYlC,iCAAiC;IAOzC,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,WAAW,CAAC,MAAM,EAAE,MAAM;;;IAO1B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAwBnC,WAAW,CAAC,MAAM,EAAE,MAAM;IAqB1B,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAajC,SAAS,CAAC,MAAM,EAAE,MAAM;IAexB,MAAM,CAAC,IAAI,EAAE,qBAAqB;;;;;;;;;;;;;;;;;;IAwBlC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;IAoBvE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAuC5C,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;YAavD,eAAe;IAe7B,OAAO,CAAC,yBAAyB;YAWnB,0BAA0B;IAqBxC,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,yBAAyB;CAsBlC"}
+{"version":3,"file":"notification.service.d.ts","sourceRoot":"","sources":["../../src/notification/notification.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAQH,eAAe,EACf,YAAY,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIjD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AA2B9D,qBACa,mBAAoB,YAAW,YAAY,EAAE,eAAe;IASrE,OAAO,CAAC,QAAQ,CAAC,MAAM;IAEvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAb3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwC;IAC/D,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAsB;IACzD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAgB;IAC3C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyB;IACrD,OAAO,CAAC,QAAQ,CAAuB;gBAIpB,MAAM,EAAE,aAAa,EAErB,UAAU,EAAE,iBAAiB,EAC7B,YAAY,EAAE,aAAa,EAE3B,QAAQ,EAAE,eAAe;IAKtC,YAAY;IAwBZ,eAAe;IAkBf,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG;;;;;;;;;YAYlC,iCAAiC;IAOzC,aAAa,CAAC,MAAM,EAAE,MAAM;IAIlC;;;;;;;;OAQG;IACG,mBAAmB,CAAC,MAAM,EAAE,MAAM;IAIlC,WAAW,CAAC,MAAM,EAAE,MAAM;;;IAO1B,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAwBnC,WAAW,CAAC,MAAM,EAAE,MAAM;IAqB1B,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;IAajC,SAAS,CAAC,MAAM,EAAE,MAAM;IAexB,MAAM,CAAC,IAAI,EAAE,qBAAqB;;;;;;;;;;;;;;;;;;IAwBlC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,iBAAiB;;;;;;;;;;;;;;;;;;IAoBvE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAuC5C,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;YAavD,eAAe;IAe7B,OAAO,CAAC,yBAAyB;YAWnB,0BAA0B;IAsCxC,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,yBAAyB;CAsBlC"}

package/dist/notification/notification.service.js

@@ -21,12 +21,15 @@ const event_emitter_1 = require("@nestjs/event-emitter");
 const node_crypto_1 = require("node:crypto");
 const node_events_1 = require("node:events");
 const pg_1 = require("pg");
+const realtime_service_1 = require("../realtime/realtime.service");
+const notification_constants_1 = require("./notification.constants");
 const notification_stale_progress_check_event_1 = require("./events/notification-stale-progress-check.event");
 let NotificationService = NotificationService_1 = class NotificationService {
-    constructor(prisma, pagination, eventEmitter) {
+    constructor(prisma, pagination, eventEmitter, realtime) {
         this.prisma = prisma;
         this.pagination = pagination;
         this.eventEmitter = eventEmitter;
+        this.realtime = realtime;
         this.logger = new common_1.Logger(NotificationService_1.name);
         this.notificationEvents = new node_events_1.EventEmitter();
         this.instanceId = (0, node_crypto_1.randomUUID)();
@@ -81,6 +84,18 @@ let NotificationService = NotificationService_1 = class NotificationService {
     async notifyUpdated(userId) {
         await this.broadcastNotificationEvent(userId, { type: 'notification.updated' });
     }
+    /**
+     * Avisa que o usuário ganhou uma recompensa de gamificação, para o cliente
+     * buscar a fila dele.
+     *
+     * Sem payload de propósito: a recompensa mora em `lms_student_reward` com o
+     * `seen_at` como fonte da verdade — mandar o conteúdo aqui abriria caminho
+     * para comemorar duas vezes entre a web e o app, e engordaria o `pg_notify`,
+     * cujo teto de 8000 bytes falha calado (ver `broadcastNotificationEvent`).
+     */
+    async notifyRewardGranted(userId) {
+        await this.broadcastNotificationEvent(userId, { type: 'reward.granted' });
+    }
     async unreadCount(userId) {
         const count = await this.prisma.notification.count({
             where: { user_id: userId, status: 'unread' },
@@ -263,6 +278,23 @@ let NotificationService = NotificationService_1 = class NotificationService {
     }
     async broadcastNotificationEvent(userId, event) {
         this.emitLocalNotificationEvent(userId, event);
+        // WebSocket, antes do `pg_notify` abaixo: o emit é síncrono e o
+        // `$executeRaw` é aguardado, então empurrar primeiro tira o socket da
+        // latência do Postgres. Vai por `emitToUser` — a sala `user:{id}` só é
+        // entrada com o `sub` do JWT verificado, e o `subscribe` do gateway monta
+        // salas com o prefixo literal `channel:`, então ela não é assinável de
+        // fora. É o que torna seguro mandar a notificação inteira aqui; por
+        // `emitToChannel` o título e o corpo vazariam para qualquer conta.
+        //
+        // O try/catch existe porque este é o primeiro call-site de `emitToUser` em
+        // produção: um throw derrubaria `create`, `markRead` e o resto do funil, e
+        // a entrega pelo SSE (acima) já aconteceu.
+        try {
+            this.realtime.emitToUser(userId, notification_constants_1.NOTIFICATION_REALTIME_EVENT, event);
+        }
+        catch (error) {
+            this.logger.warn('Failed to push notification over realtime', error);
+        }
         const payload = Object.assign(Object.assign({}, event), { userId, originInstanceId: this.instanceId });
         try {
             await this.prisma.$executeRaw `
@@ -305,8 +337,10 @@ exports.NotificationService = NotificationService = NotificationService_1 = __de
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)((0, common_1.forwardRef)(() => api_prisma_1.PrismaService))),
     __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => api_pagination_1.PaginationService))),
+    __param(3, (0, common_1.Inject)((0, common_1.forwardRef)(() => realtime_service_1.RealtimeService))),
     __metadata("design:paramtypes", [api_prisma_1.PrismaService,
         api_pagination_1.PaginationService,
-        event_emitter_1.EventEmitter2])
+        event_emitter_1.EventEmitter2,
+        realtime_service_1.RealtimeService])
 ], NotificationService);
 //# sourceMappingURL=notification.service.js.map

package/dist/notification/notification.service.js.map

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

package/dist/oauth/oauth-token-broker.service.d.ts

@@ -46,12 +46,54 @@ export declare class OAuthTokenBrokerService {
     private readonly cache;
     /** Refresh a bit early so an in-flight request never rides an about-to-expire token. */
     private static readonly EXPIRY_SKEW_MS;
+    /**
+     * Quantas vezes seguir um refresh token que outro processo rotacionou.
+     *
+     * Duas bastam na prática: a corrida acontece quando várias réplicas disparam
+     * o mesmo tick de cron, e a segunda tentativa já parte do token que a
+     * vencedora gravou. O teto existe para o caso patológico de rotações
+     * encadeadas não virar laço.
+     */
+    private static readonly MAX_ROTATION_RETRIES;
     constructor(http: HttpService, setting: SettingService, prisma: PrismaService, security: SecurityService);
     /** Normalizes a provider to the enum form stored in `user_account.provider`. */
     private toAccountProvider;
     /** Setting slug that points at the integration profile for this provider. */
     private profileSettingSlug;
     private resolveProviderConfig;
+    /**
+     * Lê uma coluna `Bytes` que guarda texto cifrado.
+     *
+     * O Prisma 6 passou a devolver `Bytes` como `Uint8Array`, e não mais como
+     * `Buffer`. Os dois têm `.toString()`, mas com significados opostos: o do
+     * Buffer decodifica os bytes como utf8 ("salt:iv:tag:cifra"), o do
+     * Uint8Array imprime os bytes em decimal separados por vírgula
+     * ("115,97,108,116,..."). O `SecurityService.decrypt` então não achava as 4
+     * partes separadas por ":" e lançava — e como toda conta caía nesse mesmo
+     * erro, a mensagem final era "reconecte a conta", que nenhuma reconexão
+     * resolvia. `Buffer.from` normaliza os dois casos.
+     */
+    private readEncryptedColumn;
+    /**
+     * Resumo do erro do provedor para o log. Usa só `error` e `error_description`
+     * — campos que a Microsoft e o Google preenchem com código e explicação
+     * (AADSTS…), nunca com credencial. O corpo inteiro não vai para o log: a
+     * requisição que falhou carrega o client_secret e o refresh token.
+     */
+    private describeGrantError;
+    /**
+     * Relê o refresh token do banco para ver se outro processo já o rotacionou.
+     *
+     * Devolve `true` só quando o valor guardado é DIFERENTE do que acabou de
+     * falhar — é isso que distingue uma corrida entre réplicas (vale tentar de
+     * novo, agora com o token novo) de uma revogação de verdade (não adianta
+     * insistir). Comparar os valores importa: sem essa checagem, uma conta
+     * realmente desconectada entraria em laço de tentativas.
+     *
+     * Nunca lança: qualquer problema aqui vira "não rotacionou", e quem chamou
+     * segue para o erro original, que é a informação correta a dar ao usuário.
+     */
+    private reloadRotatedRefreshToken;
     private loadUserAccount;
     private parseScopes;
     /** Scopes granted to the stored refresh token, from `user_account.scopes`. */
@@ -65,7 +107,14 @@ export declare class OAuthTokenBrokerService {
      *
      * @throws {OAuthTokenBrokerError} with a typed `reason` on any failure.
      */
-    getAccessToken(userId: number, provider: string): Promise<BrokeredAccessToken>;
+    getAccessToken(userId: number, provider: string, 
+    /**
+     * Profundidade da retentativa após uma rotação concorrente. Existe para a
+     * recursão ter fim: numa corrida entre muitas réplicas, cada uma pode
+     * rotacionar de novo entre a nossa falha e a releitura, e sem teto duas
+     * réplicas azaradas ficariam se revezando indefinidamente.
+     */
+    attempt?: number): Promise<BrokeredAccessToken>;
     /** Drops any cached access token for a user/provider (e.g. after disconnect). */
     invalidate(userId: number, provider: string): void;
 }

package/dist/oauth/oauth-token-broker.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-token-broker.service.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth-token-broker.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,GAC9B,eAAe,GACf,iBAAiB,GACjB,eAAe,GACf,yBAAyB,GACzB,kBAAkB,CAAC;AAEvB,qBAAa,qBAAsB,SAAQ,KAAK;IAE5C,QAAQ,CAAC,MAAM,EAAE,sBAAsB;IAEvC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;gBAHf,MAAM,EAAE,sBAAsB,EACvC,OAAO,EAAE,MAAM,EACN,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,OAAO;CAK3B;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,SAAS,EAAE,IAAI,CAAC;IAChB,4FAA4F;IAC5F,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAcD;;;;;;;;;;;;;GAaG;AACH,qBACa,uBAAuB;IAUhC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAErB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAb3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;IAEnE,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IAEvD,wFAAwF;IACxF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAa;gBAGhC,IAAI,EAAE,WAAW,EAEjB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,eAAe;IAG5C,gFAAgF;IAChF,OAAO,CAAC,iBAAiB;IAQzB,6EAA6E;IAC7E,OAAO,CAAC,kBAAkB;YAaZ,qBAAqB;YA4DrB,eAAe;IAyB7B,OAAO,CAAC,WAAW;IAOnB,8EAA8E;IACxE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ3E,gFAAgF;IAC1E,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrE,OAAO,CAAC,QAAQ;IAIhB;;;;;OAKG;IACG,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,mBAAmB,CAAC;IA4H/B,iFAAiF;IACjF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAGnD"}
+{"version":3,"file":"oauth-token-broker.service.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth-token-broker.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,MAAM,sBAAsB,GAC9B,eAAe,GACf,iBAAiB,GACjB,eAAe,GACf,yBAAyB,GACzB,kBAAkB,CAAC;AAEvB,qBAAa,qBAAsB,SAAQ,KAAK;IAE5C,QAAQ,CAAC,MAAM,EAAE,sBAAsB;IAEvC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;gBAHf,MAAM,EAAE,sBAAsB,EACvC,OAAO,EAAE,MAAM,EACN,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,OAAO;CAK3B;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,2CAA2C;IAC3C,SAAS,EAAE,IAAI,CAAC;IAChB,4FAA4F;IAC5F,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAcD;;;;;;;;;;;;;GAaG;AACH,qBACa,uBAAuB;IAoBhC,OAAO,CAAC,QAAQ,CAAC,IAAI;IAErB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAvB3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4C;IAEnE,2DAA2D;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IAEvD,wFAAwF;IACxF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAa;IAEnD;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAK;gBAG9B,IAAI,EAAE,WAAW,EAEjB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,eAAe;IAG5C,gFAAgF;IAChF,OAAO,CAAC,iBAAiB;IAQzB,6EAA6E;IAC7E,OAAO,CAAC,kBAAkB;YAaZ,qBAAqB;IA4DnC;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,mBAAmB;IAI3B;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;;;;;;;;;;OAWG;YACW,yBAAyB;YAqBzB,eAAe;IAyB7B,OAAO,CAAC,WAAW;IAOnB,8EAA8E;IACxE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAQ3E,gFAAgF;IAC1E,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQrE,OAAO,CAAC,QAAQ;IAIhB;;;;;OAKG;IACG,cAAc,CAClB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM;IAChB;;;;;OAKG;IACH,OAAO,SAAI,GACV,OAAO,CAAC,mBAAmB,CAAC;IA0K/B,iFAAiF;IACjF,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAGnD"}

package/dist/oauth/oauth-token-broker.service.js

@@ -110,6 +110,63 @@ let OAuthTokenBrokerService = OAuthTokenBrokerService_1 = class OAuthTokenBroker
         }
         return { tokenUrl, clientId, clientSecret };
     }
+    /**
+     * Lê uma coluna `Bytes` que guarda texto cifrado.
+     *
+     * O Prisma 6 passou a devolver `Bytes` como `Uint8Array`, e não mais como
+     * `Buffer`. Os dois têm `.toString()`, mas com significados opostos: o do
+     * Buffer decodifica os bytes como utf8 ("salt:iv:tag:cifra"), o do
+     * Uint8Array imprime os bytes em decimal separados por vírgula
+     * ("115,97,108,116,..."). O `SecurityService.decrypt` então não achava as 4
+     * partes separadas por ":" e lançava — e como toda conta caía nesse mesmo
+     * erro, a mensagem final era "reconecte a conta", que nenhuma reconexão
+     * resolvia. `Buffer.from` normaliza os dois casos.
+     */
+    readEncryptedColumn(value) {
+        return Buffer.from(value).toString();
+    }
+    /**
+     * Resumo do erro do provedor para o log. Usa só `error` e `error_description`
+     * — campos que a Microsoft e o Google preenchem com código e explicação
+     * (AADSTS…), nunca com credencial. O corpo inteiro não vai para o log: a
+     * requisição que falhou carrega o client_secret e o refresh token.
+     */
+    describeGrantError(error) {
+        var _a, _b, _c;
+        const data = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data;
+        const code = (_b = data === null || data === void 0 ? void 0 : data.error) !== null && _b !== void 0 ? _b : 'unknown';
+        const description = String((_c = data === null || data === void 0 ? void 0 : data.error_description) !== null && _c !== void 0 ? _c : '')
+            .replace(/\s+/g, ' ')
+            .trim();
+        return description ? `${code}: ${description.slice(0, 300)}` : code;
+    }
+    /**
+     * Relê o refresh token do banco para ver se outro processo já o rotacionou.
+     *
+     * Devolve `true` só quando o valor guardado é DIFERENTE do que acabou de
+     * falhar — é isso que distingue uma corrida entre réplicas (vale tentar de
+     * novo, agora com o token novo) de uma revogação de verdade (não adianta
+     * insistir). Comparar os valores importa: sem essa checagem, uma conta
+     * realmente desconectada entraria em laço de tentativas.
+     *
+     * Nunca lança: qualquer problema aqui vira "não rotacionou", e quem chamou
+     * segue para o erro original, que é a informação correta a dar ao usuário.
+     */
+    async reloadRotatedRefreshToken(userId, provider, usedRefreshToken) {
+        try {
+            const account = await this.prisma.user_account.findFirst({
+                where: { user_id: userId, provider: this.toAccountProvider(provider) },
+                select: { refresh_token: true },
+            });
+            if (!(account === null || account === void 0 ? void 0 : account.refresh_token))
+                return false;
+            const stored = this.security.decrypt(this.readEncryptedColumn(account.refresh_token));
+            return Boolean(stored) && stored !== usedRefreshToken;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
     async loadUserAccount(userId, provider) {
         const account = await this.prisma.user_account.findFirst({
             where: {
@@ -159,7 +216,14 @@ let OAuthTokenBrokerService = OAuthTokenBrokerService_1 = class OAuthTokenBroker
      *
      * @throws {OAuthTokenBrokerError} with a typed `reason` on any failure.
      */
-    async getAccessToken(userId, provider) {
+    async getAccessToken(userId, provider, 
+    /**
+     * Profundidade da retentativa após uma rotação concorrente. Existe para a
+     * recursão ter fim: numa corrida entre muitas réplicas, cada uma pode
+     * rotacionar de novo entre a nossa falha e a releitura, e sem teto duas
+     * réplicas azaradas ficariam se revezando indefinidamente.
+     */
+    attempt = 0) {
         var _a, _b, _c;
         const key = this.cacheKey(userId, provider);
         const cached = this.cache.get(key);
@@ -173,9 +237,18 @@ let OAuthTokenBrokerService = OAuthTokenBrokerService_1 = class OAuthTokenBroker
         ]);
         let decryptedRefreshToken;
         try {
-            decryptedRefreshToken = this.security.decrypt(account.refresh_token.toString());
+            decryptedRefreshToken = this.security.decrypt(this.readEncryptedColumn(account.refresh_token));
         }
         catch (error) {
+            // Este caminho e o `invalid_grant` lá embaixo chegam ao usuário com a
+            // MESMA frase ("reconecte a conta"), e as causas não têm nada a ver uma
+            // com a outra: aqui o valor guardado não abre, lá é a Microsoft recusando
+            // o grant. Sem distinguir no log, não há como saber qual dos dois ocorreu.
+            // A mensagem do decrypt separa os dois motivos possíveis daqui — formato
+            // inválido (o valor lido não é o cifrado) e falha de autenticação (chave
+            // diferente da que cifrou) —, e é truncada porque ela ecoa o começo do
+            // valor que tentou decifrar.
+            this.logger.warn(`Stored refresh token could not be decrypted: provider=${provider} userId=${userId} detail=${error instanceof Error ? error.message.split('Value:')[0].trim() : 'unknown'}`);
             throw new OAuthTokenBrokerError('refresh_revoked', `Failed to decrypt stored refresh token for "${provider}".`, provider, error);
         }
         const grantedScopes = this.parseScopes(account.scopes);
@@ -201,8 +274,28 @@ let OAuthTokenBrokerService = OAuthTokenBrokerService_1 = class OAuthTokenBroker
         catch (error) {
             const providerError = (_b = (_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.error;
             if (providerError === 'invalid_grant') {
-                // Refresh token revoked/expired — the user must reconnect.
                 this.cache.delete(key);
+                // Antes de declarar a conta desconectada, checa se outro processo
+                // rotacionou o token enquanto este fazia a troca.
+                //
+                // A Microsoft emite um refresh token novo a cada troca e invalida o
+                // anterior, então basta duas réplicas usarem o mesmo token ao mesmo
+                // tempo para a segunda levar `invalid_grant` — e este serviço roda em
+                // seis. Sem esta releitura, uma corrida entre réplicas era reportada ao
+                // usuário como "reconecte a conta", e reconectar não resolvia nada,
+                // porque a corrida se repetia no ciclo seguinte.
+                const rotated = attempt < OAuthTokenBrokerService_1.MAX_ROTATION_RETRIES &&
+                    (await this.reloadRotatedRefreshToken(userId, provider, decryptedRefreshToken));
+                if (rotated) {
+                    this.logger.log(`Refresh token was rotated by another process; retrying: provider=${provider} userId=${userId} attempt=${attempt + 1}`);
+                    return this.getAccessToken(userId, provider, attempt + 1);
+                }
+                // Nada mudou no banco: o grant foi mesmo recusado. O `error_description`
+                // do provedor é a única coisa que diz POR QUÊ (na Microsoft, o código
+                // AADSTS: token expirado, consentimento faltando, acesso condicional).
+                // Sem ele no log, "reconecte a conta" é tudo que sobra para diagnosticar
+                // — e reconectar não resolve a maioria desses casos.
+                this.logger.warn(`Refresh grant rejected: provider=${provider} userId=${userId} scopesSent="${scopeParam.join(' ')}" detail=${this.describeGrantError(error)}`);
                 throw new OAuthTokenBrokerError('refresh_revoked', `Refresh token for "${provider}" is no longer valid. Reconnect the account.`, provider, error);
             }
             this.logger.warn(`Token refresh failed: provider=${provider} userId=${userId} error=${(_c = providerError !== null && providerError !== void 0 ? providerError : error === null || error === void 0 ? void 0 : error.message) !== null && _c !== void 0 ? _c : 'unknown'}`);
@@ -247,6 +340,15 @@ let OAuthTokenBrokerService = OAuthTokenBrokerService_1 = class OAuthTokenBroker
 exports.OAuthTokenBrokerService = OAuthTokenBrokerService;
 /** Refresh a bit early so an in-flight request never rides an about-to-expire token. */
 OAuthTokenBrokerService.EXPIRY_SKEW_MS = 60 * 1000;
+/**
+ * Quantas vezes seguir um refresh token que outro processo rotacionou.
+ *
+ * Duas bastam na prática: a corrida acontece quando várias réplicas disparam
+ * o mesmo tick de cron, e a segunda tentativa já parte do token que a
+ * vencedora gravou. O teto existe para o caso patológico de rotações
+ * encadeadas não virar laço.
+ */
+OAuthTokenBrokerService.MAX_ROTATION_RETRIES = 2;
 exports.OAuthTokenBrokerService = OAuthTokenBrokerService = OAuthTokenBrokerService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(1, (0, common_1.Inject)((0, common_1.forwardRef)(() => setting_service_1.SettingService))),

package/dist/oauth/oauth-token-broker.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-token-broker.service.js","sourceRoot":"","sources":["../../src/oauth/oauth-token-broker.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth-token-broker.service.js","sourceRoot":"","sources":["../../src/oauth/oauth-token-broker.service.ts"],"names":[],"mappings":"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"}

package/dist/oauth/oauth.controller.d.ts

@@ -27,9 +27,6 @@ export declare class OAuthController {
     microsoftEntraIdRedeem(locale: string, ipAddress: string, userAgent: string, origin: string, referer: string, ref: string, res: any): Promise<{
         accessToken: string;
         refreshToken: string;
-    } | {
-        accessToken: string;
-        refreshToken?: undefined;
     }>;
     /** Redeems a connect `ref` (authenticated: connect binds to the current user). */
     microsoftEntraIdRedeemConnect(locale: string, ipAddress: string, userAgent: string, origin: string, referer: string, { id }: {
@@ -37,9 +34,6 @@ export declare class OAuthController {
     }, ref: string, res: any): Promise<{
         accessToken: string;
         refreshToken: string;
-    } | {
-        accessToken: string;
-        refreshToken?: undefined;
     }>;
     login(origin: string, referer: string, host: string, provider: string, redirectApp: string, res: any): Promise<any>;
     mobileAuthUrl(provider: string, redirectUri: string): Promise<{
@@ -49,17 +43,21 @@ export declare class OAuthController {
     connect(provider: string, redirectApp: string, res: any): Promise<any>;
     callbackLogin(locale: string, ipAddress: string, userAgent: string, origin: string, referer: string, host: string, forwardedHost: string, provider: string, code: string, state: string, redirectUri: string, res: any): Promise<{
         accessToken: string;
+        refreshToken: string;
     }>;
     callbackRegister(locale: string, ipAddress: string, userAgent: string, provider: string, code: string, res: any): Promise<{
         accessToken: string;
+        refreshToken: string;
     }>;
     callbackConnect(locale: string, ipAddress: string, userAgent: string, { id }: {
         id: any;
     }, provider: string, code: string, res: any): Promise<{
         accessToken: string;
+        refreshToken: string;
     }>;
     disconnect(locale: string, ipAddress: string, userAgent: string, provider: string, email: string, res: any): Promise<{
         accessToken: string;
+        refreshToken: string;
     }>;
 }
 //# sourceMappingURL=oauth.controller.d.ts.map

package/dist/oauth/oauth.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth.controller.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth.controller.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBACa,eAAe;IAGd,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAgB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFnF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;gBAE9B,OAAO,EAAE,YAAY,EAAmB,cAAc,EAAE,cAAc;IAEnG,OAAO,CAAC,eAAe;IAkCjB,cAAc,CACH,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACtB,GAAG,KAAA;IAaZ;;;;;;OAMG;IAGG,aAAa,CACH,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACrB,GAAG,KAAA;IAWZ;;;;;;OAMG;IAGG,wBAAwB,CACb,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACN,SAAS,EAAE,MAAM,EAClC,SAAS,EAAE,MAAM,EAChB,GAAG,KAAA;IA0BZ,iFAAiF;IAG3E,sBAAsB,CAChB,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,EACG,GAAG,KAAA;;;;;;;IAcjC,kFAAkF;IAE5E,6BAA6B,CACvB,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAC3B,EAAE,EAAE,EAAE;;KAAA,EACA,GAAG,EAAE,MAAM,EACG,GAAG,KAAA;;;;;;;IAiB3B,KAAK,CACU,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAClC,GAAG,KAAA;IAeN,aAAa,CACE,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM;;;IAarC,QAAQ,CACO,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAClC,GAAG,KAAA;IAaN,OAAO,CACQ,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAClC,GAAG,KAAA;IAaN,aAAa,CACP,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACA,aAAa,EAAE,MAAM,EAC/B,QAAQ,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACP,WAAW,EAAE,MAAM,EACb,GAAG,KAAA;;;IA+B3B,gBAAgB,CACV,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACC,GAAG,KAAA;;;IAO3B,eAAe,CACT,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EAChC,EAAE,EAAE,EAAE;;KAAA,EACK,QAAQ,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACC,GAAG,KAAA;;;IAO3B,UAAU,CACJ,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACA,GAAG,KAAA;;;CAIlC"}
+{"version":3,"file":"oauth.controller.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth.controller.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,qBACa,eAAe;IAGd,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAgB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFnF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;gBAE9B,OAAO,EAAE,YAAY,EAAmB,cAAc,EAAE,cAAc;IAEnG,OAAO,CAAC,eAAe;IAkCjB,cAAc,CACH,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACtB,GAAG,KAAA;IAaZ;;;;;;OAMG;IAGG,aAAa,CACH,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACrB,GAAG,KAAA;IAWZ;;;;;;OAMG;IAGG,wBAAwB,CACb,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACN,SAAS,EAAE,MAAM,EAClC,SAAS,EAAE,MAAM,EAChB,GAAG,KAAA;IA0BZ,iFAAiF;IAG3E,sBAAsB,CAChB,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACrB,GAAG,EAAE,MAAM,EACG,GAAG,KAAA;;;;IAcjC,kFAAkF;IAE5E,6BAA6B,CACvB,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAC3B,EAAE,EAAE,EAAE;;KAAA,EACA,GAAG,EAAE,MAAM,EACG,GAAG,KAAA;;;;IAiB3B,KAAK,CACU,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAClC,GAAG,KAAA;IAeN,aAAa,CACE,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM;;;IAarC,QAAQ,CACO,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAClC,GAAG,KAAA;IAaN,OAAO,CACQ,QAAQ,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EAClC,GAAG,KAAA;IAaN,aAAa,CACP,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACA,aAAa,EAAE,MAAM,EAC/B,QAAQ,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACP,WAAW,EAAE,MAAM,EACb,GAAG,KAAA;;;;IA8B3B,gBAAgB,CACV,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACC,GAAG,KAAA;;;;IAO3B,eAAe,CACT,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EAChC,EAAE,EAAE,EAAE;;KAAA,EACK,QAAQ,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,EACC,GAAG,KAAA;;;;IAO3B,UAAU,CACJ,MAAM,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACA,SAAS,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACA,GAAG,KAAA;;;;CAIlC"}

package/dist/oauth/oauth.controller.js

@@ -154,7 +154,6 @@ let OAuthController = OAuthController_1 = class OAuthController {
             state,
             type: 'login',
             redirectUri,
-            includeRefreshTokenInBody: Boolean(redirectUri),
             requestOrigin: origin,
             requestReferer: referer,
         });