Skip to content

Remove lazy user/team provisioning from API request handler #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RhysSullivan merged 1 commit into from
Apr 9, 2026
Merged

Remove lazy user/team provisioning from API request handler #129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions apps/cloud/src/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,41 +116,21 @@ const resolveAuth = (request: Request) =>
});

const resolveTeamId = (
auth: {
readonly userId: string;
readonly email: string;
readonly firstName: string | null | undefined;
readonly lastName: string | null | undefined;
readonly avatarUrl: string | null | undefined;
},
userId: string,
cookieTeamId: string | null,
) =>
Effect.gen(function* () {
const users = yield* UserStoreService;
const teams = yield* users.use((store) => store.getTeamsForUser(auth.userId));
const teams = yield* users.use((store) => store.getTeamsForUser(userId));

if (cookieTeamId) {
const hasAccess = teams.some((t) => t.teamId === cookieTeamId);
if (hasAccess) return cookieTeamId;
// Cookie references a team the user doesn't belong to — ignore it
}

if (teams.length > 0) return teams[0]!.teamId;

const user = yield* users.use((store) =>
store.upsertUser({
id: auth.userId,
email: auth.email,
name: `${auth.firstName ?? ""} ${auth.lastName ?? ""}`.trim() || undefined,
avatarUrl: auth.avatarUrl ?? undefined,
}),
);

const team = yield* users.use((store) =>
store.createTeam(`${user.name ?? user.email}'s Team`),
);
yield* users.use((store) => store.addMember(team.id, user.id, "owner"));
return team.id;
return yield* Effect.fail(new Error("No team found — user may not have completed signup"));
});

const resolveExecutor = (teamId: string) =>
Expand Down Expand Up @@ -225,7 +205,7 @@ export const handleApiRequest = async (request: Request): Promise<Response> => {
if (!auth) return unauthorized("Unauthorized");

const cookieTeamId = parseCookie(request.headers.get("cookie"), "executor_team");
const teamId = yield* resolveTeamId(auth, cookieTeamId);
const teamId = yield* resolveTeamId(auth.userId, cookieTeamId);

const executor = yield* Effect.acquireRelease(
resolveExecutor(teamId),
Expand Down