@robelest/convex-auth 0.0.4-preview.32 → 0.0.4-preview.34

package/dist/server/core.js

@@ -44,14 +44,14 @@ function createCoreDomains(deps) {
 		return Array.from(grants).sort();
 	};
 	async function userGet(ctx, input) {
-		if (typeof input === "string") return await cached(ctx, `user:${input}`, () => ctx.runQuery(config.component.public.userGetById, { userId: input }));
+		if (typeof input === "string") return await cached(ctx, `user:${input}`, () => ctx.runQuery(config.component.user.get, { id: input }));
 		const userIds = input;
 		if (userIds.length === 0) return [];
 		const unique = Array.from(new Set(userIds));
 		const toFetch = [];
 		for (const id of unique) if (!ctxCacheHas(ctx, `user:${id}`)) toFetch.push(id);
 		if (toFetch.length > 0) {
-			const sharedFetch = ctx.runQuery(config.component.public["userGetMany"], { userIds: toFetch });
+			const sharedFetch = ctx.runQuery(config.component.user.get, { ids: toFetch });
 			for (let i = 0; i < toFetch.length; i += 1) {
 				const id = toFetch[i];
 				const indexInBatch = i;
@@ -60,56 +60,86 @@ function createCoreDomains(deps) {
 				});
 			}
 		}
-		return await Promise.all(userIds.map((id) => cached(ctx, `user:${id}`, () => ctx.runQuery(config.component.public.userGetById, { userId: id }))));
+		return await Promise.all(userIds.map((id) => cached(ctx, `user:${id}`, () => ctx.runQuery(config.component.user.get, { id }))));
 	}
 	const user = {
 		get: userGet,
 		list: async (ctx, opts = {}) => {
-			return await ctx.runQuery(config.component.public.userList, opts);
+			return await ctx.runQuery(config.component.user.list, opts);
 		},
 		viewer: async (ctx) => {
 			const userId = await getSessionUserId(ctx);
 			if (userId === null) return null;
 			return await user.get(ctx, userId);
 		},
+		email: (() => {
+			async function primary(ctx, emailOrOpts, maybeOpts) {
+				const setting = typeof emailOrOpts === "string";
+				const userId = (setting ? maybeOpts : emailOrOpts)?.userId ?? await getSessionUserId(ctx);
+				if (userId === null || userId === void 0) {
+					if (setting) throw new ConvexError({
+						code: "NOT_SIGNED_IN",
+						message: "Authentication required."
+					});
+					return null;
+				}
+				if (setting) {
+					await ctx.runMutation(config.component.user.email.setPrimary, {
+						userId,
+						email: emailOrOpts.toLowerCase()
+					});
+					return { email: emailOrOpts.toLowerCase() };
+				}
+				return (await ctx.runQuery(config.component.user.email.list, { userId })).find((r) => r.isPrimary) ?? null;
+			}
+			return {
+				list: async (ctx, opts) => {
+					const userId = opts?.userId ?? await getSessionUserId(ctx);
+					if (userId === null || userId === void 0) return [];
+					return await ctx.runQuery(config.component.user.email.list, { userId });
+				},
+				add: async (ctx, email, opts) => {
+					const userId = opts?.userId ?? await getSessionUserId(ctx);
+					if (userId === null || userId === void 0) throw new ConvexError({
+						code: "NOT_SIGNED_IN",
+						message: "Authentication required."
+					});
+					const addr = email.toLowerCase();
+					await ctx.runMutation(config.component.user.email.upsert, {
+						userId,
+						email: addr,
+						verified: false,
+						isPrimary: false,
+						source: "password"
+					});
+					return { email: addr };
+				},
+				remove: async (ctx, email, opts) => {
+					const userId = opts?.userId ?? await getSessionUserId(ctx);
+					if (userId === null || userId === void 0) throw new ConvexError({
+						code: "NOT_SIGNED_IN",
+						message: "Authentication required."
+					});
+					const addr = email.toLowerCase();
+					await ctx.runMutation(config.component.user.email.delete, {
+						userId,
+						email: addr
+					});
+					return { email: addr };
+				},
+				primary
+			};
+		})(),
 		update: async (ctx, userId, data) => {
-			await ctx.runMutation(config.component.public.userPatch, {
+			await ctx.runMutation(config.component.user.update, {
 				userId,
 				data
 			});
 			invalidateCtxCache(ctx, `user:${userId}`);
 			return { userId };
 		},
-		setActiveGroup: async (ctx, opts) => {
-			const doc = await user.get(ctx, opts.userId);
-			const existingExtend = doc !== null && doc.extend !== null && typeof doc.extend === "object" && !Array.isArray(doc.extend) ? { ...doc.extend } : {};
-			if (opts.groupId === null) {
-				const { lastActiveGroup: _omit, ...rest } = existingExtend;
-				await user.update(ctx, opts.userId, { extend: rest });
-				return {
-					userId: opts.userId,
-					groupId: null
-				};
-			}
-			await user.update(ctx, opts.userId, { extend: {
-				...existingExtend,
-				lastActiveGroup: opts.groupId
-			} });
-			return {
-				userId: opts.userId,
-				groupId: opts.groupId
-			};
-		},
-		getActiveGroup: async (ctx, opts) => {
-			const doc = await user.get(ctx, opts.userId);
-			if (doc !== null && doc.extend !== null && typeof doc.extend === "object" && !Array.isArray(doc.extend)) {
-				const val = doc.extend.lastActiveGroup;
-				if (typeof val === "string") return val;
-			}
-			return null;
-		},
 		delete: async (ctx, userId, opts) => {
-			await ctx.runMutation(config.component.public.userDelete, {
+			await ctx.runMutation(config.component.user.delete, {
 				userId,
 				cascade: opts?.cascade !== false
 			});
@@ -126,10 +156,10 @@ function createCoreDomains(deps) {
 			};
 		},
 		get: async (ctx, sessionId) => {
-			return await cached(ctx, `session:${sessionId}`, () => ctx.runQuery(config.component.public.sessionGetById, { sessionId }));
+			return await cached(ctx, `session:${sessionId}`, () => ctx.runQuery(config.component.session.get, { sessionId }));
 		},
 		list: async (ctx, opts) => {
-			return await ctx.runQuery(config.component.public.sessionListByUser, { userId: opts.userId });
+			return await ctx.runQuery(config.component.session.list, { userId: opts.userId });
 		}
 	};
 	const account = {
@@ -146,31 +176,31 @@ function createCoreDomains(deps) {
 			return { accountId: args.account.id };
 		},
 		delete: async (ctx, accountId) => {
-			await ctx.runMutation(config.component.public.accountDelete, {
+			await ctx.runMutation(config.component.account.delete, {
 				accountId,
 				requireOtherAccount: true
 			});
 			return { accountId };
 		},
 		listPasskeys: async (ctx, opts) => {
-			return await ctx.runQuery(config.component.public.passkeyListByUserId, opts);
+			return await ctx.runQuery(config.component.factor.passkey.list, opts);
 		},
 		renamePasskey: async (ctx, passkeyId, name) => {
-			await ctx.runMutation(config.component.public.passkeyUpdateMeta, {
+			await ctx.runMutation(config.component.factor.passkey.update, {
 				passkeyId,
 				data: { name }
 			});
 			return { passkeyId };
 		},
 		deletePasskey: async (ctx, passkeyId) => {
-			await ctx.runMutation(config.component.public.passkeyDelete, { passkeyId });
+			await ctx.runMutation(config.component.factor.passkey.delete, { passkeyId });
 			return { passkeyId };
 		},
 		listTotps: async (ctx, opts) => {
-			return await ctx.runQuery(config.component.public.totpListByUserId, opts);
+			return await ctx.runQuery(config.component.factor.totp.list, opts);
 		},
 		deleteTotp: async (ctx, totpId) => {
-			await ctx.runMutation(config.component.public.totpDelete, { totpId });
+			await ctx.runMutation(config.component.factor.totp.delete, { totpId });
 			return { totpId };
 		}
 	};
@@ -178,14 +208,14 @@ function createCoreDomains(deps) {
 		return deps.signInForProvider(ctx, providerConfig, args);
 	} : void 0 };
 	async function groupGet(ctx, input) {
-		if (typeof input === "string") return await cached(ctx, `group:${input}`, () => ctx.runQuery(config.component.public.groupGet, { groupId: input }));
+		if (typeof input === "string") return await cached(ctx, `group:${input}`, () => ctx.runQuery(config.component.group.get, { id: input }));
 		const groupIds = input;
 		if (groupIds.length === 0) return [];
 		const unique = Array.from(new Set(groupIds));
 		const toFetch = [];
 		for (const id of unique) if (!ctxCacheHas(ctx, `group:${id}`)) toFetch.push(id);
 		if (toFetch.length > 0) {
-			const sharedFetch = ctx.runQuery(config.component.public["groupGetMany"], { groupIds: toFetch });
+			const sharedFetch = ctx.runQuery(config.component.group.get, { ids: toFetch });
 			for (let i = 0; i < toFetch.length; i += 1) {
 				const id = toFetch[i];
 				const indexInBatch = i;
@@ -194,15 +224,50 @@ function createCoreDomains(deps) {
 				});
 			}
 		}
-		return await Promise.all(groupIds.map((id) => cached(ctx, `group:${id}`, () => ctx.runQuery(config.component.public.groupGet, { groupId: id }))));
+		return await Promise.all(groupIds.map((id) => cached(ctx, `group:${id}`, () => ctx.runQuery(config.component.group.get, { id }))));
+	}
+	async function groupGetEx(ctx, input, opts) {
+		if (typeof input === "object" && input !== null && !Array.isArray(input) && "slug" in input) {
+			const { items } = await group.list(ctx, {
+				where: { slug: input.slug },
+				limit: 1
+			});
+			return items[0] ?? null;
+		}
+		if (opts?.tree === true && typeof input === "string") {
+			const current = await groupGet(ctx, input);
+			if (current === null) return null;
+			const parentId = typeof current.parentGroupId === "string" ? current.parentGroupId : null;
+			const [parent, childrenPage] = await Promise.all([parentId !== null ? groupGet(ctx, parentId) : Promise.resolve(null), group.list(ctx, {
+				where: { parentGroupId: input },
+				limit: 100
+			})]);
+			const ancestors = [];
+			let walk = parentId;
+			const seen = new Set([input]);
+			while (walk !== null && !seen.has(walk)) {
+				seen.add(walk);
+				const ancestor = await groupGet(ctx, walk);
+				if (ancestor === null) break;
+				ancestors.push(ancestor);
+				walk = typeof ancestor.parentGroupId === "string" ? ancestor.parentGroupId : null;
+			}
+			return {
+				current,
+				parent,
+				children: childrenPage.items,
+				ancestors
+			};
+		}
+		return groupGet(ctx, input);
 	}
 	const group = {
 		create: async (ctx, data) => {
-			return { groupId: await ctx.runMutation(config.component.public.groupCreate, data) };
+			return { groupId: await ctx.runMutation(config.component.group.create, data) };
 		},
-		get: groupGet,
+		get: groupGetEx,
 		list: async (ctx, opts) => {
-			return await ctx.runQuery(config.component.public.groupList, {
+			return await ctx.runQuery(config.component.group.list, {
 				where: opts?.where,
 				limit: opts?.limit,
 				cursor: opts?.cursor,
@@ -211,7 +276,7 @@ function createCoreDomains(deps) {
 			});
 		},
 		update: async (ctx, groupId, data) => {
-			await ctx.runMutation(config.component.public.groupUpdate, {
+			await ctx.runMutation(config.component.group.update, {
 				groupId,
 				data
 			});
@@ -219,15 +284,14 @@ function createCoreDomains(deps) {
 			return { groupId };
 		},
 		delete: async (ctx, groupId) => {
-			await ctx.runMutation(config.component.public.groupDelete, { groupId });
+			await ctx.runMutation(config.component.group.delete, { groupId });
 			invalidateCtxCache(ctx, `group:${groupId}`);
 			invalidateCtxCache(ctx, "member");
 			invalidateCtxCache(ctx, "member-inspect");
 			return { groupId };
 		},
 		ancestors: async (ctx, opts) => {
-			const ancestorsRef = config.component.public["groupAncestors"];
-			const result = await ctx.runQuery(ancestorsRef, {
+			const result = await ctx.runQuery(config.component.group.ancestors, {
 				groupId: opts.groupId,
 				maxDepth: opts.maxDepth,
 				includeSelf: opts.includeSelf
@@ -247,7 +311,7 @@ function createCoreDomains(deps) {
 			const toFetch = [];
 			for (const groupId of unique) if (!ctxCacheHas(ctx, `member-inspect:${userId}:${groupId}:n`)) toFetch.push(groupId);
 			if (toFetch.length > 0) {
-				const sharedFetch = ctx.runQuery(config.component.public["memberGetByGroupAndUserMany"], {
+				const sharedFetch = ctx.runQuery(config.component.group.member.get, {
 					userId,
 					groupIds: toFetch
 				});
@@ -260,7 +324,7 @@ function createCoreDomains(deps) {
 				}
 			}
 			return await Promise.all(groupIds.map(async (groupId) => {
-				const membership$1 = await cached(ctx, `member-inspect:${userId}:${groupId}:n`, () => ctx.runQuery(config.component.public.memberGetByGroupAndUser, {
+				const membership$1 = await cached(ctx, `member-inspect:${userId}:${groupId}:n`, () => ctx.runQuery(config.component.group.member.get, {
 					userId,
 					groupId
 				}));
@@ -281,15 +345,13 @@ function createCoreDomains(deps) {
 		const maxDepth = useAncestry ? Math.max(0, Math.floor(opts.maxDepth ?? 32)) : 0;
 		const cacheKey = `member-inspect:${opts.userId}:${opts.groupId}:${useAncestry ? `a${maxDepth}` : "n"}`;
 		let membership = null;
-		if (useAncestry) {
-			const memberResolveRef = config.component.public["memberResolve"];
-			membership = (await cached(ctx, cacheKey, () => ctx.runQuery(memberResolveRef, {
-				userId: opts.userId,
-				groupId: opts.groupId,
-				maxDepth,
-				ancestry: true
-			}))).membership;
-		} else membership = await cached(ctx, cacheKey, () => ctx.runQuery(config.component.public.memberGetByGroupAndUser, {
+		if (useAncestry) membership = (await cached(ctx, cacheKey, () => ctx.runQuery(config.component.group.member.resolve, {
+			userId: opts.userId,
+			groupId: opts.groupId,
+			maxDepth,
+			ancestry: true
+		}))).membership;
+		else membership = await cached(ctx, cacheKey, () => ctx.runQuery(config.component.group.member.get, {
 			userId: opts.userId,
 			groupId: opts.groupId
 		}));
@@ -309,7 +371,7 @@ function createCoreDomains(deps) {
 	const member = {
 		create: async (ctx, data) => {
 			const roleIds = normalizeRoleIds(data.roleIds);
-			const memberId = await ctx.runMutation(config.component.public.memberAdd, {
+			const memberId = await ctx.runMutation(config.component.group.member.create, {
 				...data,
 				roleIds
 			});
@@ -317,19 +379,37 @@ function createCoreDomains(deps) {
 			return { memberId };
 		},
 		get: async (ctx, memberId) => {
-			return await cached(ctx, `member:${memberId}`, () => ctx.runQuery(config.component.public.memberGet, { memberId }));
+			return await cached(ctx, `member:${memberId}`, () => ctx.runQuery(config.component.group.member.get, { id: memberId }));
 		},
 		list: async (ctx, opts) => {
-			return await ctx.runQuery(config.component.public.memberList, {
+			const page = await ctx.runQuery(config.component.group.member.list, {
 				where: opts?.where,
 				limit: opts?.limit,
 				cursor: opts?.cursor,
 				orderBy: opts?.orderBy,
 				order: opts?.order
 			});
+			if (opts?.withGroup !== true && opts?.withGrants !== true) return page;
+			const groupDocs = opts?.withGroup ? await group.get(ctx, page.items.map((m) => m.groupId)) : null;
+			return {
+				items: await Promise.all(page.items.map(async (m, i) => {
+					let enriched = { ...m };
+					if (groupDocs !== null) enriched.group = groupDocs[i] ?? null;
+					if (opts?.withGrants === true) {
+						const resolved = await memberInspect(ctx, {
+							userId: m.userId,
+							groupId: m.groupId
+						});
+						enriched.roleIds = resolved.roleIds;
+						enriched.grants = resolved.grants;
+					}
+					return enriched;
+				})),
+				nextCursor: page.nextCursor
+			};
 		},
 		delete: async (ctx, memberId) => {
-			await ctx.runMutation(config.component.public.memberRemove, { memberId });
+			await ctx.runMutation(config.component.group.member.delete, { memberId });
 			invalidateCtxCache(ctx, "member");
 			invalidateCtxCache(ctx, "member-inspect");
 			return { memberId };
@@ -337,7 +417,7 @@ function createCoreDomains(deps) {
 		update: async (ctx, memberId, data) => {
 			const nextData = { ...data };
 			if ("roleIds" in nextData) nextData.roleIds = normalizeRoleIds(Array.isArray(nextData.roleIds) ? nextData.roleIds : void 0);
-			await ctx.runMutation(config.component.public.memberUpdate, {
+			await ctx.runMutation(config.component.group.member.update, {
 				memberId,
 				data: nextData
 			});
@@ -376,13 +456,70 @@ function createCoreDomains(deps) {
 			return result;
 		}
 	};
+	const readLastActiveGroup = (doc) => {
+		const val = doc?.lastActiveGroup;
+		return typeof val === "string" ? val : null;
+	};
+	/**
+	* The current user's active group — the workspace selection persisted
+	* natively on `User.lastActiveGroup`. Reuses the existing `get/set/clear`
+	* vocabulary instead of bespoke `setActiveGroup`/`getActiveGroup`.
+	*/
+	const active = {
+		get: async (ctx, opts) => {
+			const userId = opts?.userId ?? await getSessionUserId(ctx);
+			if (userId === null || userId === void 0) return null;
+			const [userDoc, { items: memberships }] = await Promise.all([user.get(ctx, userId), member.list(ctx, {
+				where: { userId },
+				limit: 100
+			})]);
+			if (memberships.length === 0) return null;
+			const stored = readLastActiveGroup(userDoc);
+			const chosen = memberships.find((m) => m.groupId === stored) ?? memberships[0];
+			const groupDoc = await group.get(ctx, chosen.groupId);
+			return {
+				groupId: chosen.groupId,
+				group: groupDoc,
+				membership: chosen
+			};
+		},
+		set: async (ctx, groupId, opts) => {
+			const userId = opts?.userId ?? await getSessionUserId(ctx);
+			if (userId === null || userId === void 0) throw new ConvexError({
+				code: "NOT_SIGNED_IN",
+				message: "Authentication required."
+			});
+			const { items } = await member.list(ctx, {
+				where: {
+					userId,
+					groupId
+				},
+				limit: 1
+			});
+			if (items.length === 0) throw new ConvexError({
+				code: "NOT_A_MEMBER",
+				message: "User is not a member of this group."
+			});
+			await user.update(ctx, userId, { lastActiveGroup: groupId });
+			return { groupId };
+		},
+		clear: async (ctx, opts) => {
+			const userId = opts?.userId ?? await getSessionUserId(ctx);
+			if (userId === null || userId === void 0) throw new ConvexError({
+				code: "NOT_SIGNED_IN",
+				message: "Authentication required."
+			});
+			await user.update(ctx, userId, { lastActiveGroup: void 0 });
+			return { groupId: null };
+		}
+	};
 	const invite = {
 		create: async (ctx, data) => {
 			const roleIds = normalizeRoleIds(data.roleIds);
 			const token = generateRandomString(inviteTokenLength, inviteTokenAlphabet);
 			const tokenHash = await sha256(token);
 			return {
-				inviteId: await ctx.runMutation(config.component.public.inviteCreate, {
+				inviteId: await ctx.runMutation(config.component.group.invite.create, {
 					...data,
 					roleIds,
 					tokenHash,
@@ -392,23 +529,23 @@ function createCoreDomains(deps) {
 			};
 		},
 		get: async (ctx, inviteId) => {
-			return await ctx.runQuery(config.component.public.inviteGet, { inviteId });
+			return await ctx.runQuery(config.component.group.invite.get, { id: inviteId });
 		},
 		token: {
 			get: async (ctx, token) => {
 				const tokenHash = await sha256(token);
-				return await ctx.runQuery(config.component.public.inviteGetByTokenHash, { tokenHash });
+				return await ctx.runQuery(config.component.group.invite.get, { tokenHash });
 			},
 			accept: async (ctx, args) => {
 				const tokenHash = await sha256(args.token);
-				return { ...await ctx.runMutation(config.component.public.inviteAcceptByToken, {
+				return { ...await ctx.runMutation(config.component.group.invite.redeem, {
 					tokenHash,
 					acceptedByUserId: args.acceptedByUserId
 				}) };
 			}
 		},
 		list: async (ctx, opts) => {
-			return await ctx.runQuery(config.component.public.inviteList, {
+			return await ctx.runQuery(config.component.group.invite.list, {
 				where: opts?.where,
 				limit: opts?.limit,
 				cursor: opts?.cursor,
@@ -417,7 +554,7 @@ function createCoreDomains(deps) {
 			});
 		},
 		accept: async (ctx, inviteId, acceptedByUserId) => {
-			await ctx.runMutation(config.component.public.inviteAccept, {
+			await ctx.runMutation(config.component.group.invite.accept, {
 				inviteId,
 				...acceptedByUserId ? { acceptedByUserId } : {}
 			});
@@ -427,7 +564,7 @@ function createCoreDomains(deps) {
 			};
 		},
 		revoke: async (ctx, inviteId) => {
-			await ctx.runMutation(config.component.public.inviteRevoke, { inviteId });
+			await ctx.runMutation(config.component.group.invite.revoke, { inviteId });
 			return { inviteId };
 		}
 	};
@@ -435,7 +572,7 @@ function createCoreDomains(deps) {
 		create: async (ctx, opts) => {
 			const { raw, hashedKey, displayPrefix } = await generateApiKey("sk_");
 			return {
-				keyId: await ctx.runMutation(config.component.public.keyInsert, {
+				keyId: await ctx.runMutation(config.component.user.key.create, {
 					userId: opts.userId,
 					prefix: displayPrefix,
 					hashedKey,
@@ -450,7 +587,7 @@ function createCoreDomains(deps) {
 		},
 		verify: async (ctx, rawKey) => {
 			const hashedKey = await hashApiKey(rawKey);
-			const doc = await ctx.runQuery(config.component.public.keyGetByHashedKey, { hashedKey });
+			const doc = await ctx.runQuery(config.component.user.key.get, { hashedKey });
 			if (!doc) throw new ConvexError({
 				code: "INVALID_API_KEY",
 				message: "Invalid API key."
@@ -473,7 +610,7 @@ function createCoreDomains(deps) {
 				});
 				patchData.rateLimitState = newState;
 			}
-			await ctx.runMutation(config.component.public.keyPatch, {
+			await ctx.runMutation(config.component.user.key.update, {
 				keyId: k._id,
 				data: patchData
 			});
@@ -484,7 +621,7 @@ function createCoreDomains(deps) {
 			};
 		},
 		list: async (ctx, opts) => {
-			return await ctx.runQuery(config.component.public.keyList, {
+			return await ctx.runQuery(config.component.user.key.list, {
 				where: opts?.where,
 				limit: opts?.limit,
 				cursor: opts?.cursor,
@@ -493,28 +630,28 @@ function createCoreDomains(deps) {
 			});
 		},
 		get: async (ctx, keyId) => {
-			return await ctx.runQuery(config.component.public.keyGetById, { keyId }) ?? null;
+			return await ctx.runQuery(config.component.user.key.get, { id: keyId }) ?? null;
 		},
 		update: async (ctx, keyId, data) => {
-			await ctx.runMutation(config.component.public.keyPatch, {
+			await ctx.runMutation(config.component.user.key.update, {
 				keyId,
 				data
 			});
 			return { keyId };
 		},
 		revoke: async (ctx, keyId) => {
-			await ctx.runMutation(config.component.public.keyPatch, {
+			await ctx.runMutation(config.component.user.key.update, {
 				keyId,
 				data: { revoked: true }
 			});
 			return { keyId };
 		},
 		delete: async (ctx, keyId) => {
-			await ctx.runMutation(config.component.public.keyDelete, { keyId });
+			await ctx.runMutation(config.component.user.key.delete, { keyId });
 			return { keyId };
 		},
 		rotate: async (ctx, keyId, opts) => {
-			const existing = await ctx.runQuery(config.component.public.keyGetById, { keyId });
+			const existing = await ctx.runQuery(config.component.user.key.get, { id: keyId });
 			if (!existing) throw new ConvexError({
 				code: "INVALID_PARAMETERS",
 				message: "The provided parameters are invalid."
@@ -524,7 +661,7 @@ function createCoreDomains(deps) {
 				code: "API_KEY_REVOKED",
 				message: "This API key has been revoked."
 			});
-			await ctx.runMutation(config.component.public.keyPatch, {
+			await ctx.runMutation(config.component.user.key.update, {
 				keyId,
 				data: { revoked: true }
 			});
@@ -546,7 +683,8 @@ function createCoreDomains(deps) {
 		group,
 		member,
 		invite,
-		key
+		key,
+		active
 	};
 }