Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .changeset/slimy-rats-smoke.md

This file was deleted.

8 changes: 7 additions & 1 deletion packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@baseapp-frontend/core",
"version": "2.5.1",
"version": "2.5.2",
"description": "Core utilities.",
"main": "./src/index.tsx",
"scripts": {
Expand Down
9 changes: 2 additions & 7 deletions packages/core/src/auth/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,14 @@ import type {
ILoginMfaRequest,
ILoginMfaResponse,
ILoginResponse,
IUseUser,
IUserContext,
LoginRequiredServerSideProps,
} from './types'

export function useUser({
redirectTo = '',
redirectIfFound = false,
query = {},
}: IUseUser = {}): IUserContext {
} = {}): IUserContext {
const router = useRouter()
const { user, isLoading, isSuccess, isIdle, status, setUser, refetchUser } = useUserContext()

Expand All @@ -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])

Expand Down
6 changes: 0 additions & 6 deletions packages/core/src/auth/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@ export interface IResetPassword {
mutation: UseMutationResult<unknown, unknown, void, unknown>
}

export interface IUseUser {
redirectTo?: string
redirectIfFound?: boolean
query?: Record<string, string>
}

export interface IUserContext {
user: IUser | null
isLoading: boolean
Expand Down