From a8aaa8ebc01eb1469f608fc4dfea85ab4a87e0f6 Mon Sep 17 00:00:00 2001 From: Filipe de Castro Oliveira Date: Sun, 12 Mar 2023 20:35:28 +0000 Subject: [PATCH] Fix redirectTo after unnecessary change --- .changeset/slimy-rats-smoke.md | 5 ----- packages/core/CHANGELOG.md | 8 +++++++- packages/core/package.json | 2 +- packages/core/src/auth/login.tsx | 9 ++------- packages/core/src/auth/types.d.ts | 6 ------ 5 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 .changeset/slimy-rats-smoke.md diff --git a/.changeset/slimy-rats-smoke.md b/.changeset/slimy-rats-smoke.md deleted file mode 100644 index 5f1c699b..00000000 --- a/.changeset/slimy-rats-smoke.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@baseapp-frontend/core": minor ---- - -Adding cammelcase on axios error responses and option to send query param to the redirectTo route on useUser diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index d48427e6..81c8c3dc 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -1,10 +1,16 @@ # @baseapp-frontend/core +## 2.5.2 + +### Patch Changes + +- Fix redirectTo after unnecessary change + ## 2.5.1 ### Minor Changes -- bde037a: Adding cammelcase on axios error responses and option to send query param to the redirectTo route on useUser +- Adding cammelcase on axios error responses and option to send query param to the redirectTo route on useUser ## 2.4.1 diff --git a/packages/core/package.json b/packages/core/package.json index 0458fabb..a27a69de 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@baseapp-frontend/core", - "version": "2.5.1", + "version": "2.5.2", "description": "Core utilities.", "main": "./src/index.tsx", "scripts": { diff --git a/packages/core/src/auth/login.tsx b/packages/core/src/auth/login.tsx index 9399cad9..efee9a44 100644 --- a/packages/core/src/auth/login.tsx +++ b/packages/core/src/auth/login.tsx @@ -21,7 +21,6 @@ import type { ILoginMfaRequest, ILoginMfaResponse, ILoginResponse, - IUseUser, IUserContext, LoginRequiredServerSideProps, } from './types' @@ -29,8 +28,7 @@ import type { export function useUser({ redirectTo = '', redirectIfFound = false, - query = {}, -}: IUseUser = {}): IUserContext { +} = {}): IUserContext { const router = useRouter() const { user, isLoading, isSuccess, isIdle, status, setUser, refetchUser } = useUserContext() @@ -45,10 +43,7 @@ export function useUser({ // If redirectIfFound is also set, redirect if the user was found (redirectIfFound && user) ) { - router.push({ - pathname: redirectTo, - query, - }) + router.push(redirectTo) } }, [user, redirectIfFound, redirectTo, isLoading]) diff --git a/packages/core/src/auth/types.d.ts b/packages/core/src/auth/types.d.ts index 79bdfb05..2a434856 100644 --- a/packages/core/src/auth/types.d.ts +++ b/packages/core/src/auth/types.d.ts @@ -84,12 +84,6 @@ export interface IResetPassword { mutation: UseMutationResult } -export interface IUseUser { - redirectTo?: string - redirectIfFound?: boolean - query?: Record -} - export interface IUserContext { user: IUser | null isLoading: boolean