Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Sync OAuth profile fields on login (#6376)
Oleg Isonen9963c95ef8d1
diff --git a/apps/builder/app/shared/db/user.server.test.ts b/apps/builder/app/shared/db/user.server.test.tsindex d98a28e386..d749ac764a 100644--- a/apps/builder/app/shared/db/user.server.test.ts+++ b/apps/builder/app/shared/db/user.server.test.ts@@ -10,6 +10,7 @@ import { AuthorizationError } from "@webstudio-is/trpc-interface/index.server";import {getUserById,createOrLoginWithDev,+ createOrLoginWithOAuth,updateUserProjectsTags,} from "./user.server";@@ -151,7 +152,44 @@ describe("createOrLoginWithDev (msw)", () => {});});-// ─── updateUserProjectsTags ────────────────────────────────────+// ─── createOrLoginWithOAuth ───────────────────────────────────++describe("createOrLoginWithOAuth (msw)", () => {+ test("syncs changed profile fields for an existing user", async () => {+ const updatedUser = {+ ...userRow,+ username: "new-github-username",+ image: "https://avatars.example.com/new",+ provider: "github",+ };+ let capturedBody: unknown;++ server.use(+ db.get("User", () => json(userRow)),+ db.patch("User", async ({ request }) => {+ capturedBody = await request.json();+ return json(updatedUser);+ }),+ db.get("Workspace", () => json({ id: "ws-1" }))+ );++ const result = await createOrLoginWithOAuth(createContext(), {+ provider: "github",+ displayName: "new-github-username",+ emails: [{ value: "[email protected]" }],+ photos: [{ value: "https://avatars.example.com/new" }],+ } as Parameters<typeof createOrLoginWithOAuth>[1]);++ expect(capturedBody).toEqual({+ username: "new-github-username",+ image: "https://avatars.example.com/new",+ provider: "github",+ });+ expect(result.username).toBe("new-github-username");+ });+});++// ─── updateUserProjectsTags ───────────────────────────────────describe("updateUserProjectsTags (msw)", () => {const tags = [{ id: "tag-1", label: "Design" }];diff --git a/apps/builder/app/shared/db/user.server.ts b/apps/builder/app/shared/db/user.server.tsindex 690f65490e..57904cc0fc 100644--- a/apps/builder/app/shared/db/user.server.ts+++ b/apps/builder/app/shared/db/user.server.ts@@ -44,7 +44,8 @@ const genericCreateAccount = async (username: string;image: string;provider: string;- }+ },+ syncProfile = false): Promise<User> => {const dbUser = await context.postgrest.client.from("User")@@ -53,6 +54,33 @@ const genericCreateAccount = async (.single();if (dbUser.error == null) {+ let user = dbUser.data;++ if (+ syncProfile &&+ (user.username !== userData.username ||+ user.image !== userData.image ||+ user.provider !== userData.provider)+ ) {+ const updatedUser = await context.postgrest.client+ .from("User")+ .update({+ username: userData.username,+ image: userData.image,+ provider: userData.provider,+ })+ .eq("id", user.id)+ .select()+ .single();++ if (updatedUser.error) {+ console.error(updatedUser.error);+ throw new Error("Failed to update user profile");+ }++ user = updatedUser.data;+ }+// Ensure the user has a default workspace — it may be missing if// the original workspace insert failed after user creation.const existingWorkspace = await context.postgrest.client@@ -78,7 +106,7 @@ const genericCreateAccount = async (}}- return formatUser(dbUser.data);+ return formatUser(user);}// https://github.com/PostgREST/postgrest/blob/bfbd033c6e9f38cfbc8b1cfe19ee009a9379e3dd/docs/references/errors.rst#L234@@ -132,7 +160,7 @@ export const createOrLoginWithOAuth = async (image: (profile.photos ?? [])[0]?.value,provider: profile.provider,};- const newUser = await genericCreateAccount(context, userData);+ const newUser = await genericCreateAccount(context, userData, true);return newUser;};