Skip to content

Commit 3d7b233

Browse files
authored
Remove lazy user/team provisioning from API request handler (#129)
User and team creation now only happens in the OAuth callback. The API request handler fails with a clear error if no team is found instead of silently creating accounts.
1 parent 8f81fb6 commit 3d7b233

1 file changed

Lines changed: 4 additions & 24 deletions

File tree

‎apps/cloud/src/api.ts‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -116,41 +116,21 @@ const resolveAuth = (request: Request) =>
116116
});
117117

118118
const resolveTeamId = (
119-
auth: {
120-
readonly userId: string;
121-
readonly email: string;
122-
readonly firstName: string | null | undefined;
123-
readonly lastName: string | null | undefined;
124-
readonly avatarUrl: string | null | undefined;
125-
},
119+
userId: string,
126120
cookieTeamId: string | null,
127121
) =>
128122
Effect.gen(function* () {
129123
const users = yield* UserStoreService;
130-
const teams = yield* users.use((store) => store.getTeamsForUser(auth.userId));
124+
const teams = yield* users.use((store) => store.getTeamsForUser(userId));
131125

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

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

140-
const user = yield* users.use((store) =>
141-
store.upsertUser({
142-
id: auth.userId,
143-
email: auth.email,
144-
name: `${auth.firstName ?? ""} ${auth.lastName ?? ""}`.trim() || undefined,
145-
avatarUrl: auth.avatarUrl ?? undefined,
146-
}),
147-
);
148-
149-
const team = yield* users.use((store) =>
150-
store.createTeam(`${user.name ?? user.email}'s Team`),
151-
);
152-
yield* users.use((store) => store.addMember(team.id, user.id, "owner"));
153-
return team.id;
133+
return yield* Effect.fail(new Error("No team found — user may not have completed signup"));
154134
});
155135

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

227207
const cookieTeamId = parseCookie(request.headers.get("cookie"), "executor_team");
228-
const teamId = yield* resolveTeamId(auth, cookieTeamId);
208+
const teamId = yield* resolveTeamId(auth.userId, cookieTeamId);
229209

230210
const executor = yield* Effect.acquireRelease(
231211
resolveExecutor(teamId),

0 commit comments

Comments
 (0)