Matthias Meister
3aaad38e06
- Integrated NextImage for logo display in the canvas sidebar, enhancing visual consistency. - Updated canvas name handling in the toolbar to ensure proper display and accessibility. - Refactored sidebar layout for better responsiveness and user experience. - Improved state management for category collapsibility in the sidebar, allowing for a more intuitive navigation experience.
72 lines
2.1 KiB
TypeScript
72 lines
2.1 KiB
TypeScript
import { QueryCtx, MutationCtx } from "./_generated/server";
|
|
import { authComponent } from "./auth";
|
|
|
|
const AUTH_PERFORMANCE_LOG_THRESHOLD_MS = 100;
|
|
|
|
type SafeAuthUser = NonNullable<
|
|
Awaited<ReturnType<typeof authComponent.safeGetAuthUser>>
|
|
>;
|
|
|
|
/** Better-Auth-User mit für die App garantierter userId (Convex-_id als Fallback). */
|
|
export type AuthUser = Omit<SafeAuthUser, "userId"> & { userId: string };
|
|
|
|
/**
|
|
* Erfordert einen authentifizierten User und gibt dessen userId zurück.
|
|
* Wirft einen Error wenn nicht eingeloggt — für Mutations und geschützte Queries.
|
|
*/
|
|
export async function requireAuth(
|
|
ctx: QueryCtx | MutationCtx
|
|
): Promise<AuthUser> {
|
|
const startedAt = Date.now();
|
|
const user = await authComponent.safeGetAuthUser(ctx);
|
|
const durationMs = Date.now() - startedAt;
|
|
if (durationMs >= AUTH_PERFORMANCE_LOG_THRESHOLD_MS) {
|
|
console.warn("[requireAuth] slow auth lookup", {
|
|
durationMs,
|
|
});
|
|
}
|
|
if (!user) {
|
|
const identity = await ctx.auth.getUserIdentity();
|
|
console.error("[requireAuth] safeGetAuthUser returned null", {
|
|
durationMs,
|
|
hasIdentity: Boolean(identity),
|
|
identityIssuer: identity?.issuer ?? null,
|
|
identitySubject: identity?.subject ?? null,
|
|
});
|
|
throw new Error("Unauthenticated");
|
|
}
|
|
const userId = user.userId ?? String(user._id);
|
|
if (!userId) {
|
|
console.error("[requireAuth] safeGetAuthUser returned user without userId", {
|
|
durationMs,
|
|
userRecordId: String(user._id),
|
|
});
|
|
throw new Error("Unauthenticated");
|
|
}
|
|
return { ...user, userId };
|
|
}
|
|
|
|
/**
|
|
* Gibt den User zurück oder null — für optionale Auth-Checks (z.B. public Queries).
|
|
*/
|
|
export async function optionalAuth(
|
|
ctx: QueryCtx | MutationCtx
|
|
): Promise<AuthUser | null> {
|
|
const startedAt = Date.now();
|
|
const user = await authComponent.safeGetAuthUser(ctx);
|
|
const durationMs = Date.now() - startedAt;
|
|
if (durationMs >= AUTH_PERFORMANCE_LOG_THRESHOLD_MS) {
|
|
console.warn("[optionalAuth] slow auth lookup", {
|
|
durationMs,
|
|
});
|
|
}
|
|
if (!user) {
|
|
return null;
|
|
}
|
|
const userId = user.userId ?? String(user._id);
|
|
if (!userId) {
|
|
return null;
|
|
}
|
|
return { ...user, userId };
|
|
}
|