From 7d4e33e7f4ba5a241684acfe9befeb9945933ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Sun, 22 Jun 2025 17:42:37 +0200 Subject: [PATCH] pl-fe: fix signup on Pleroma? MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/pl-api/lib/client.ts | 4 ++++ packages/pl-api/package.json | 2 +- packages/pl-fe/src/actions/accounts.ts | 4 ++-- packages/pl-fe/src/actions/auth.ts | 10 +++++++--- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/pl-api/lib/client.ts b/packages/pl-api/lib/client.ts index b3bcf8eff..d036bcb54 100644 --- a/packages/pl-api/lib/client.ts +++ b/packages/pl-api/lib/client.ts @@ -1297,6 +1297,10 @@ class PlApiClient { body: { language: params.locale, birthday: params.date_of_birth, ...params }, }); + if ('identifier' in response.json) return v.parse(v.object({ + message: v.string(), + identifier: v.string(), + }), response.json); return v.parse(tokenSchema, response.json); }, diff --git a/packages/pl-api/package.json b/packages/pl-api/package.json index 6ad541ae8..7559556f2 100644 --- a/packages/pl-api/package.json +++ b/packages/pl-api/package.json @@ -1,6 +1,6 @@ { "name": "pl-api", - "version": "1.0.0-rc.81", + "version": "1.0.0-rc.82", "type": "module", "homepage": "https://codeberg.org/mkljczk/pl-fe/src/branch/develop/packages/pl-api", "repository": { diff --git a/packages/pl-fe/src/actions/accounts.ts b/packages/pl-fe/src/actions/accounts.ts index b9f778fa8..7fc71d94d 100644 --- a/packages/pl-fe/src/actions/accounts.ts +++ b/packages/pl-fe/src/actions/accounts.ts @@ -34,8 +34,8 @@ const noOp = () => new Promise(f => f(undefined)); const createAccount = (params: CreateAccountParams) => async (dispatch: AppDispatch, getState: () => RootState) => - getClient(getState()).settings.createAccount(params).then((token) => - ({ params, token }), + getClient(getState()).settings.createAccount(params).then((response) => + ({ params, response }), ); const fetchAccount = (accountId: string) => diff --git a/packages/pl-fe/src/actions/auth.ts b/packages/pl-fe/src/actions/auth.ts index a9ffc168a..59b03f19b 100644 --- a/packages/pl-fe/src/actions/auth.ts +++ b/packages/pl-fe/src/actions/auth.ts @@ -302,9 +302,13 @@ const register = (params: CreateAccountParams) => const { app } = await dispatch(createAppAndToken()); return dispatch(createAccount(params)) - .then(({ token }: { token: Token }) => { - dispatch(startOnboarding()); - return dispatch(authLoggedIn(token, app)); + .then(({ response }) => { + if ('identifier' in response) { + toast.info(response.message); + } else { + dispatch(startOnboarding()); + return dispatch(authLoggedIn(response, app)); + } }); };