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

package/dist/index.es.js

@@ -488,7 +488,7 @@ var MongoRealtimeService = class {
 			const registryCollection = this.driver?.registry?.getCollectionByPath(config.path);
 			if (config.authContext && this.driver) {
 				const mockUser = {
-					uid: config.authContext.userId,
+					uid: config.authContext.uid,
 					roles: config.authContext.roles
 				};
 				rows = await (await this.driver.withAuth(mockUser)).fetchCollection({
@@ -571,7 +571,7 @@ var MongoRealtimeService = class {
 			const registryCollection = this.driver?.registry?.getCollectionByPath(config.path);
 			if (config.authContext && this.driver) {
 				const mockUser = {
-					uid: config.authContext.userId,
+					uid: config.authContext.uid,
 					roles: config.authContext.roles
 				};
 				row = await (await this.driver.withAuth(mockUser)).fetchOne({
@@ -651,7 +651,7 @@ var MongoRealtimeService = class {
 		const ws = this.clients.get(clientId);
 		if (!ws) return;
 		const authContext = _authContext ? {
-			userId: _authContext.userId,
+			uid: _authContext.uid,
 			roles: (_authContext.roles ?? []).map(String)
 		} : void 0;
 		switch (message.type) {
@@ -1357,7 +1357,7 @@ var AuthenticatedMongoDriver = class {
 	listenCollection(props) {
 		const unsubscribe = this.delegate.listenCollection(props);
 		const authContext = {
-			userId: this.user.uid,
+			uid: this.user.uid,
 			roles: this.user.roles ?? []
 		};
 		const subscriptions = this.delegate.getRealtimeService().getSubscriptions();
@@ -1376,7 +1376,7 @@ var AuthenticatedMongoDriver = class {
 	listenOne(props) {
 		const unsubscribe = this.delegate.listenOne(props);
 		const authContext = {
-			userId: this.user.uid,
+			uid: this.user.uid,
 			roles: this.user.roles ?? []
 		};
 		const subscriptions = this.delegate.getRealtimeService().getSubscriptions();
@@ -1852,12 +1852,12 @@ var MongoUserService = class {
 			providerId
 		});
 		if (!identity) return null;
-		return this.getUserById(identity.userId);
+		return this.getUserById(identity.uid);
 	}
-	async getUserIdentities(userId) {
-		return (await this.identitiesCollection.find({ userId }).toArray()).map((doc) => ({
+	async getUserIdentities(uid) {
+		return (await this.identitiesCollection.find({ uid }).toArray()).map((doc) => ({
 			id: doc.id,
-			userId: doc.userId,
+			uid: doc.uid,
 			provider: doc.provider,
 			providerId: doc.providerId,
 			profileData: doc.profileData ?? null,
@@ -1865,7 +1865,7 @@ var MongoUserService = class {
 			updatedAt: new Date(doc.updatedAt)
 		}));
 	}
-	async linkUserIdentity(userId, provider, providerId, profileData) {
+	async linkUserIdentity(uid, provider, providerId, profileData) {
 		const now = /* @__PURE__ */ new Date();
 		await this.identitiesCollection.updateOne({
 			provider,
@@ -1874,7 +1874,7 @@ var MongoUserService = class {
 			$setOnInsert: {
 				_id: new ObjectId().toString(),
 				id: new ObjectId().toString(),
-				userId,
+				uid,
 				provider,
 				providerId,
 				createdAt: now
@@ -1896,8 +1896,8 @@ var MongoUserService = class {
 	}
 	async deleteUser(id) {
 		await this.collection.deleteOne({ id });
-		await this.identitiesCollection.deleteMany({ userId: id });
-		await this.userRolesCollection.deleteMany({ userId: id });
+		await this.identitiesCollection.deleteMany({ uid: id });
+		await this.userRolesCollection.deleteMany({ uid: id });
 	}
 	async listUsers() {
 		return (await this.collection.find().toArray()).map(toUser);
@@ -1920,7 +1920,7 @@ var MongoUserService = class {
 				$options: "i"
 			} }];
 		}
-		if (roleId) query.id = { $in: (await this.userRolesCollection.find({ roleId }).toArray()).map((ur) => ur.userId) };
+		if (roleId) query.id = { $in: (await this.userRolesCollection.find({ roleId }).toArray()).map((ur) => ur.uid) };
 		const sort = {};
 		sort[orderBy] = orderDir === "asc" ? 1 : -1;
 		const total = await this.collection.countDocuments(query);
@@ -1955,8 +1955,8 @@ var MongoUserService = class {
 		const doc = await this.collection.findOne({ emailVerificationToken: token });
 		return doc ? toUser(doc) : null;
 	}
-	async getUserRoles(userId) {
-		const roleIds = (await this.userRolesCollection.find({ userId }).toArray()).map((ur) => ur.roleId);
+	async getUserRoles(uid) {
+		const roleIds = (await this.userRolesCollection.find({ uid }).toArray()).map((ur) => ur.roleId);
 		if (roleIds.length === 0) return [];
 		return (await this.rolesCollection.find({ id: { $in: roleIds } }).toArray()).map((r) => ({
 			id: r.id,
@@ -1966,36 +1966,36 @@ var MongoUserService = class {
 			collectionPermissions: r.collectionPermissions ?? null
 		}));
 	}
-	async getUserRoleIds(userId) {
-		return (await this.userRolesCollection.find({ userId }).toArray()).map((ur) => ur.roleId);
+	async getUserRoleIds(uid) {
+		return (await this.userRolesCollection.find({ uid }).toArray()).map((ur) => ur.roleId);
 	}
-	async setUserRoles(userId, roleIds) {
-		await this.userRolesCollection.deleteMany({ userId });
+	async setUserRoles(uid, roleIds) {
+		await this.userRolesCollection.deleteMany({ uid });
 		if (roleIds.length > 0) {
 			const docs = roleIds.map((roleId) => ({
 				_id: new ObjectId().toString(),
-				userId,
+				uid,
 				roleId
 			}));
 			await this.userRolesCollection.insertMany(docs);
 		}
 	}
-	async assignDefaultRole(userId, roleId) {
+	async assignDefaultRole(uid, roleId) {
 		await this.userRolesCollection.updateOne({
-			userId,
+			uid,
 			roleId
 		}, { $setOnInsert: {
 			_id: new ObjectId().toString(),
-			userId,
+			uid,
 			roleId
 		} }, { upsert: true });
 	}
-	async getUserWithRoles(userId) {
-		const user = await this.getUserById(userId);
+	async getUserWithRoles(uid) {
+		const user = await this.getUserById(uid);
 		if (!user) return null;
 		return {
 			user,
-			roles: await this.getUserRoles(userId)
+			roles: await this.getUserRoles(uid)
 		};
 	}
 };
@@ -2056,18 +2056,18 @@ var MongoRefreshTokenService = class {
 	get collection() {
 		return this.db.collection("rebase_refresh_tokens");
 	}
-	async createToken(userId, tokenHash, expiresAt, userAgent, ipAddress) {
+	async createToken(uid, tokenHash, expiresAt, userAgent, ipAddress) {
 		const safeUserAgent = userAgent || "";
 		const safeIpAddress = ipAddress || "";
 		await this.collection.deleteMany({
-			userId,
+			uid,
 			userAgent: safeUserAgent,
 			ipAddress: safeIpAddress
 		});
 		await this.collection.insertOne({
 			_id: new ObjectId().toString(),
 			id: new ObjectId().toString(),
-			userId,
+			uid,
 			tokenHash,
 			expiresAt,
 			createdAt: /* @__PURE__ */ new Date(),
@@ -2080,7 +2080,7 @@ var MongoRefreshTokenService = class {
 		if (!doc) return null;
 		return {
 			id: doc.id,
-			userId: doc.userId,
+			uid: doc.uid,
 			tokenHash: doc.tokenHash,
 			expiresAt: new Date(doc.expiresAt),
 			createdAt: new Date(doc.createdAt),
@@ -2091,13 +2091,13 @@ var MongoRefreshTokenService = class {
 	async deleteByHash(tokenHash) {
 		await this.collection.deleteOne({ tokenHash });
 	}
-	async deleteAllForUser(userId) {
-		await this.collection.deleteMany({ userId });
+	async deleteAllForUser(uid) {
+		await this.collection.deleteMany({ uid });
 	}
-	async listForUser(userId) {
-		return (await this.collection.find({ userId }).sort({ createdAt: 1 }).toArray()).map((doc) => ({
+	async listForUser(uid) {
+		return (await this.collection.find({ uid }).sort({ createdAt: 1 }).toArray()).map((doc) => ({
 			id: doc.id,
-			userId: doc.userId,
+			uid: doc.uid,
 			tokenHash: doc.tokenHash,
 			expiresAt: new Date(doc.expiresAt),
 			createdAt: new Date(doc.createdAt),
@@ -2105,10 +2105,10 @@ var MongoRefreshTokenService = class {
 			ipAddress: doc.ipAddress
 		}));
 	}
-	async deleteById(id, userId) {
+	async deleteById(id, uid) {
 		await this.collection.deleteOne({
 			id,
-			userId
+			uid
 		});
 	}
 };
@@ -2120,14 +2120,14 @@ var MongoPasswordResetTokenService = class {
 	get collection() {
 		return this.db.collection("rebase_password_reset_tokens");
 	}
-	async createToken(userId, tokenHash, expiresAt) {
+	async createToken(uid, tokenHash, expiresAt) {
 		await this.collection.deleteMany({
-			userId,
+			uid,
 			usedAt: null
 		});
 		await this.collection.insertOne({
 			_id: new ObjectId().toString(),
-			userId,
+			uid,
 			tokenHash,
 			expiresAt,
 			usedAt: null
@@ -2141,15 +2141,15 @@ var MongoPasswordResetTokenService = class {
 		});
 		if (!doc) return null;
 		return {
-			userId: doc.userId,
+			uid: doc.uid,
 			expiresAt: new Date(doc.expiresAt)
 		};
 	}
 	async markAsUsed(tokenHash) {
 		await this.collection.updateOne({ tokenHash }, { $set: { usedAt: /* @__PURE__ */ new Date() } });
 	}
-	async deleteAllForUser(userId) {
-		await this.collection.deleteMany({ userId });
+	async deleteAllForUser(uid) {
+		await this.collection.deleteMany({ uid });
 	}
 	async deleteExpired() {
 		await this.collection.deleteMany({ expiresAt: { $lt: /* @__PURE__ */ new Date() } });
@@ -2164,8 +2164,8 @@ var MongoTokenRepository = class {
 		this.refreshTokenService = new MongoRefreshTokenService(db);
 		this.passwordResetTokenService = new MongoPasswordResetTokenService(db);
 	}
-	async createRefreshToken(userId, tokenHash, expiresAt, userAgent, ipAddress) {
-		await this.refreshTokenService.createToken(userId, tokenHash, expiresAt, userAgent, ipAddress);
+	async createRefreshToken(uid, tokenHash, expiresAt, userAgent, ipAddress) {
+		await this.refreshTokenService.createToken(uid, tokenHash, expiresAt, userAgent, ipAddress);
 	}
 	async findRefreshTokenByHash(tokenHash) {
 		return this.refreshTokenService.findByHash(tokenHash);
@@ -2173,17 +2173,17 @@ var MongoTokenRepository = class {
 	async deleteRefreshToken(tokenHash) {
 		await this.refreshTokenService.deleteByHash(tokenHash);
 	}
-	async deleteAllRefreshTokensForUser(userId) {
-		await this.refreshTokenService.deleteAllForUser(userId);
+	async deleteAllRefreshTokensForUser(uid) {
+		await this.refreshTokenService.deleteAllForUser(uid);
 	}
-	async listRefreshTokensForUser(userId) {
-		return this.refreshTokenService.listForUser(userId);
+	async listRefreshTokensForUser(uid) {
+		return this.refreshTokenService.listForUser(uid);
 	}
-	async deleteRefreshTokenById(id, userId) {
-		await this.refreshTokenService.deleteById(id, userId);
+	async deleteRefreshTokenById(id, uid) {
+		await this.refreshTokenService.deleteById(id, uid);
 	}
-	async createPasswordResetToken(userId, tokenHash, expiresAt) {
-		await this.passwordResetTokenService.createToken(userId, tokenHash, expiresAt);
+	async createPasswordResetToken(uid, tokenHash, expiresAt) {
+		await this.passwordResetTokenService.createToken(uid, tokenHash, expiresAt);
 	}
 	async findValidPasswordResetToken(tokenHash) {
 		return this.passwordResetTokenService.findValidByHash(tokenHash);
@@ -2191,20 +2191,20 @@ var MongoTokenRepository = class {
 	async markPasswordResetTokenUsed(tokenHash) {
 		await this.passwordResetTokenService.markAsUsed(tokenHash);
 	}
-	async deleteAllPasswordResetTokensForUser(userId) {
-		await this.passwordResetTokenService.deleteAllForUser(userId);
+	async deleteAllPasswordResetTokensForUser(uid) {
+		await this.passwordResetTokenService.deleteAllForUser(uid);
 	}
 	async deleteExpiredTokens() {
 		await this.passwordResetTokenService.deleteExpired();
 	}
-	async createMagicLinkToken(userId, tokenHash, expiresAt) {
+	async createMagicLinkToken(uid, tokenHash, expiresAt) {
 		const col = this.db.collection("magic_link_tokens");
 		await col.deleteMany({
-			userId,
+			uid,
 			usedAt: null
 		});
 		await col.insertOne({
-			userId,
+			uid,
 			tokenHash,
 			expiresAt,
 			usedAt: null,
@@ -2219,7 +2219,7 @@ var MongoTokenRepository = class {
 		});
 		if (!doc) return null;
 		return {
-			userId: doc.userId,
+			uid: doc.uid,
 			expiresAt: doc.expiresAt
 		};
 	}
@@ -2250,11 +2250,11 @@ var MongoAuthRepository = class {
 	async getUserByIdentity(provider, providerId) {
 		return this.userService.getUserByIdentity(provider, providerId);
 	}
-	async getUserIdentities(userId) {
-		return this.userService.getUserIdentities(userId);
+	async getUserIdentities(uid) {
+		return this.userService.getUserIdentities(uid);
 	}
-	async linkUserIdentity(userId, provider, providerId, profileData) {
-		return this.userService.linkUserIdentity(userId, provider, providerId, profileData);
+	async linkUserIdentity(uid, provider, providerId, profileData) {
+		return this.userService.linkUserIdentity(uid, provider, providerId, profileData);
 	}
 	async updateUser(id, data) {
 		return this.userService.updateUser(id, data);
@@ -2280,20 +2280,20 @@ var MongoAuthRepository = class {
 	async getUserByVerificationToken(token) {
 		return this.userService.getUserByVerificationToken(token);
 	}
-	async getUserRoles(userId) {
-		return this.userService.getUserRoles(userId);
+	async getUserRoles(uid) {
+		return this.userService.getUserRoles(uid);
 	}
-	async getUserRoleIds(userId) {
-		return this.userService.getUserRoleIds(userId);
+	async getUserRoleIds(uid) {
+		return this.userService.getUserRoleIds(uid);
 	}
-	async setUserRoles(userId, roleIds) {
-		await this.userService.setUserRoles(userId, roleIds);
+	async setUserRoles(uid, roleIds) {
+		await this.userService.setUserRoles(uid, roleIds);
 	}
-	async assignDefaultRole(userId, roleId) {
-		await this.userService.assignDefaultRole(userId, roleId);
+	async assignDefaultRole(uid, roleId) {
+		await this.userService.assignDefaultRole(uid, roleId);
 	}
-	async getUserWithRoles(userId) {
-		return this.userService.getUserWithRoles(userId);
+	async getUserWithRoles(uid) {
+		return this.userService.getUserWithRoles(uid);
 	}
 	async getRoleById(id) {
 		return this.roleService.getRoleById(id);
@@ -2310,8 +2310,8 @@ var MongoAuthRepository = class {
 	async deleteRole(id) {
 		await this.roleService.deleteRole(id);
 	}
-	async createRefreshToken(userId, tokenHash, expiresAt, userAgent, ipAddress) {
-		await this.tokenRepository.createRefreshToken(userId, tokenHash, expiresAt, userAgent, ipAddress);
+	async createRefreshToken(uid, tokenHash, expiresAt, userAgent, ipAddress) {
+		await this.tokenRepository.createRefreshToken(uid, tokenHash, expiresAt, userAgent, ipAddress);
 	}
 	async findRefreshTokenByHash(tokenHash) {
 		return this.tokenRepository.findRefreshTokenByHash(tokenHash);
@@ -2319,17 +2319,17 @@ var MongoAuthRepository = class {
 	async deleteRefreshToken(tokenHash) {
 		await this.tokenRepository.deleteRefreshToken(tokenHash);
 	}
-	async deleteAllRefreshTokensForUser(userId) {
-		await this.tokenRepository.deleteAllRefreshTokensForUser(userId);
+	async deleteAllRefreshTokensForUser(uid) {
+		await this.tokenRepository.deleteAllRefreshTokensForUser(uid);
 	}
-	async listRefreshTokensForUser(userId) {
-		return this.tokenRepository.listRefreshTokensForUser(userId);
+	async listRefreshTokensForUser(uid) {
+		return this.tokenRepository.listRefreshTokensForUser(uid);
 	}
-	async deleteRefreshTokenById(id, userId) {
-		await this.tokenRepository.deleteRefreshTokenById(id, userId);
+	async deleteRefreshTokenById(id, uid) {
+		await this.tokenRepository.deleteRefreshTokenById(id, uid);
 	}
-	async createPasswordResetToken(userId, tokenHash, expiresAt) {
-		await this.tokenRepository.createPasswordResetToken(userId, tokenHash, expiresAt);
+	async createPasswordResetToken(uid, tokenHash, expiresAt) {
+		await this.tokenRepository.createPasswordResetToken(uid, tokenHash, expiresAt);
 	}
 	async findValidPasswordResetToken(tokenHash) {
 		return this.tokenRepository.findValidPasswordResetToken(tokenHash);
@@ -2337,14 +2337,14 @@ var MongoAuthRepository = class {
 	async markPasswordResetTokenUsed(tokenHash) {
 		await this.tokenRepository.markPasswordResetTokenUsed(tokenHash);
 	}
-	async deleteAllPasswordResetTokensForUser(userId) {
-		await this.tokenRepository.deleteAllPasswordResetTokensForUser(userId);
+	async deleteAllPasswordResetTokensForUser(uid) {
+		await this.tokenRepository.deleteAllPasswordResetTokensForUser(uid);
 	}
 	async deleteExpiredTokens() {
 		await this.tokenRepository.deleteExpiredTokens();
 	}
-	async createMagicLinkToken(userId, tokenHash, expiresAt) {
-		await this.tokenRepository.createMagicLinkToken(userId, tokenHash, expiresAt);
+	async createMagicLinkToken(uid, tokenHash, expiresAt) {
+		await this.tokenRepository.createMagicLinkToken(uid, tokenHash, expiresAt);
 	}
 	async findValidMagicLinkToken(tokenHash) {
 		return this.tokenRepository.findValidMagicLinkToken(tokenHash);
@@ -2352,10 +2352,10 @@ var MongoAuthRepository = class {
 	async markMagicLinkTokenUsed(tokenHash) {
 		await this.tokenRepository.markMagicLinkTokenUsed(tokenHash);
 	}
-	async createMfaFactor(userId, factorType, secretEncrypted, friendlyName) {
+	async createMfaFactor(uid, factorType, secretEncrypted, friendlyName) {
 		throw new Error("MFA is not implemented for MongoDB");
 	}
-	async getMfaFactors(userId) {
+	async getMfaFactors(uid) {
 		return [];
 	}
 	async getMfaFactorById(factorId) {
@@ -2364,7 +2364,7 @@ var MongoAuthRepository = class {
 	async verifyMfaFactor(factorId) {
 		throw new Error("MFA is not implemented for MongoDB");
 	}
-	async deleteMfaFactor(factorId, userId) {
+	async deleteMfaFactor(factorId, uid) {
 		throw new Error("MFA is not implemented for MongoDB");
 	}
 	async createMfaChallenge(factorId, ipAddress) {
@@ -2376,17 +2376,17 @@ var MongoAuthRepository = class {
 	async verifyMfaChallenge(challengeId) {
 		throw new Error("MFA is not implemented for MongoDB");
 	}
-	async createRecoveryCodes(userId, codeHashes) {
+	async createRecoveryCodes(uid, codeHashes) {
 		throw new Error("MFA is not implemented for MongoDB");
 	}
-	async useRecoveryCode(userId, codeHash) {
+	async useRecoveryCode(uid, codeHash) {
 		return false;
 	}
-	async getUnusedRecoveryCodeCount(userId) {
+	async getUnusedRecoveryCodeCount(uid) {
 		return 0;
 	}
-	async deleteAllRecoveryCodes(userId) {}
-	async hasVerifiedMfaFactors(userId) {
+	async deleteAllRecoveryCodes(uid) {}
+	async hasVerifiedMfaFactors(uid) {
 		return false;
 	}
 };
@@ -2497,7 +2497,7 @@ function createMongoBootstrapper(mongoConfig) {
 		},
 		mountRoutes() {},
 		async initializeWebsockets(server, realtimeService, driver, config) {
-			const { createMongoWebSocket } = await import("./websocket-DQlwCHFq.js");
+			const { createMongoWebSocket } = await import("./websocket-CoKu1mvm.js");
 			createMongoWebSocket(server, realtimeService, driver, config, cachedAdmin);
 		}
 	};