@rebasepro/server-mongo 0.9.1-canary.fd3754b → 0.10.0

package/src/services/MongoDriver.ts

@@ -781,7 +781,7 @@ export class AuthenticatedMongoDriver implements DataDriver {
 
     listenCollection<M extends Record<string, any>>(props: ListenCollectionProps<M>): () => void {
         const unsubscribe = this.delegate.listenCollection(props);
-        const authContext = { userId: this.user.uid,
+        const authContext = { uid: this.user.uid,
 roles: this.user.roles ?? [] };
         const subscriptions = this.delegate.getRealtimeService().getSubscriptions();
         const lastEntry = Array.from(subscriptions.entries()).pop();
@@ -806,7 +806,7 @@ roles: this.user.roles ?? [] };
 
     listenOne<M extends Record<string, any>>(props: ListenOneProps<M>): () => void {
         const unsubscribe = this.delegate.listenOne(props);
-        const authContext = { userId: this.user.uid,
+        const authContext = { uid: this.user.uid,
 roles: this.user.roles ?? [] };
         const subscriptions = this.delegate.getRealtimeService().getSubscriptions();
         const lastEntry = Array.from(subscriptions.entries()).pop();

package/src/services/MongoRealtimeService.ts

@@ -17,7 +17,7 @@ import {
 import { WebSocket } from "ws";
 import { MongoDataService } from "../db/MongoDataService";
 
-import { MongoDriver } from "./MongoDriver";
+import type { MongoDriver } from "./MongoDriver";
 import { logger } from "@rebasepro/server";
 
 interface Subscription {
@@ -25,7 +25,7 @@ interface Subscription {
     config: CollectionSubscriptionConfig | SingleSubscriptionConfig;
     changeStream?: ChangeStream;
     callback?: (data: any) => void;
-    authContext?: { userId: string; roles: string[] };
+    authContext?: { uid: string; roles: string[] };
 }
 
 /**
@@ -60,7 +60,7 @@ export class MongoRealtimeService implements RealtimeProvider {
      */
     subscribeToCollection(
         subscriptionId: string,
-        config: CollectionSubscriptionConfig & { authContext?: { userId: string; roles: string[] } },
+        config: CollectionSubscriptionConfig & { authContext?: { uid: string; roles: string[] } },
         callback?: (rows: Record<string, unknown>[]) => void
     ): void {
         // Clean up existing subscription if any
@@ -133,7 +133,7 @@ export class MongoRealtimeService implements RealtimeProvider {
      */
     private async fetchAndNotifyCollection(
         subscriptionId: string,
-        config: CollectionSubscriptionConfig & { authContext?: { userId: string; roles: string[] } },
+        config: CollectionSubscriptionConfig & { authContext?: { uid: string; roles: string[] } },
         callback?: (rows: Record<string, unknown>[]) => void
     ): Promise<void> {
         try {
@@ -141,7 +141,7 @@ export class MongoRealtimeService implements RealtimeProvider {
             const registryCollection = this.driver?.registry?.getCollectionByPath(config.path);
 
             if (config.authContext && this.driver) {
-                const mockUser = { uid: config.authContext.userId,
+                const mockUser = { uid: config.authContext.uid,
 roles: config.authContext.roles } as User;
                 const authenticatedDriver = await this.driver.withAuth(mockUser);
                 rows = await authenticatedDriver.fetchCollection({
@@ -179,7 +179,7 @@ roles: config.authContext.roles } as User;
      */
     subscribeToOne(
         subscriptionId: string,
-        config: SingleSubscriptionConfig & { authContext?: { userId: string; roles: string[] } },
+        config: SingleSubscriptionConfig & { authContext?: { uid: string; roles: string[] } },
         callback?: (row: Record<string, unknown> | null) => void
     ): void {
         // Clean up existing subscription if any
@@ -257,7 +257,7 @@ roles: config.authContext.roles } as User;
      */
     private async fetchAndNotifyOne(
         subscriptionId: string,
-        config: SingleSubscriptionConfig & { authContext?: { userId: string; roles: string[] } },
+        config: SingleSubscriptionConfig & { authContext?: { uid: string; roles: string[] } },
         callback?: (row: Record<string, unknown> | null) => void
     ): Promise<void> {
         try {
@@ -265,7 +265,7 @@ roles: config.authContext.roles } as User;
             const registryCollection = this.driver?.registry?.getCollectionByPath(config.path);
 
             if (config.authContext && this.driver) {
-                const mockUser = { uid: config.authContext.userId,
+                const mockUser = { uid: config.authContext.uid,
 roles: config.authContext.roles } as User;
                 const authenticatedDriver = await this.driver.withAuth(mockUser);
                 row = await authenticatedDriver.fetchOne({
@@ -376,12 +376,12 @@ roles: config.authContext.roles } as User;
     async handleClientMessage(
         clientId: string,
         message: { type: string; payload?: any; subscriptionId?: string },
-        _authContext?: { userId: string; roles: unknown[] }
+        _authContext?: { uid: string; roles: unknown[] }
     ): Promise<void> {
         const ws = this.clients.get(clientId);
         if (!ws) return;
 
-        const authContext = _authContext ? { userId: _authContext.userId,
+        const authContext = _authContext ? { uid: _authContext.uid,
 roles: (_authContext.roles ?? []).map(String) } : undefined;
 
         switch (message.type) {

package/src/websocket.ts

@@ -110,7 +110,7 @@ code } } }));
                         }
                         ws.send(JSON.stringify({ type: "AUTH_SUCCESS",
 requestId,
-payload: { userId: user.userId,
+payload: { uid: user.uid,
 roles: user.roles } }));
                     } else {
                         sendError("AUTH_ERROR", "INVALID_TOKEN", "Invalid or expired token");
@@ -155,7 +155,7 @@ roles: user.roles } }));
                     if (session?.user && isDriverWithAuth(driver)) {
                         try {
                             const userForAuth: User = {
-                                uid: session.user.userId,
+                                uid: session.user.uid,
                                 email: session.user.email ?? "",
                                 displayName: session.user.displayName ?? "",
                                 photoURL: session.user.photoURL ?? "",
@@ -273,7 +273,7 @@ requestId }));
                     case "subscribe_one":
                     case "unsubscribe": {
                         const session = clientSessions.get(clientId);
-                        const authContext = session?.user ? { userId: session.user.userId,
+                        const authContext = session?.user ? { uid: session.user.uid,
 roles: session.user.roles ?? [] } : undefined;
                         await realtimeService.handleClientMessage(clientId, {
                             type,