Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 36a5f46

Browse filesBrowse files
committed
fix(auth) re persist auth
1 parent fcc3c1d commit 36a5f46
Copy full SHA for 36a5f46

File tree

Expand file treeCollapse file tree

5 files changed

+16
-7
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+16
-7
lines changed

‎components/layout/navbar.vue

Copy file name to clipboardExpand all lines: components/layout/navbar.vue
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ watch(user, async () => {
135135
clip-rule="evenodd" />
136136
</svg>
137137
</span>
138-
139138
<User :isLoggedIn="isLoggedIn" class="hidden md:block" />
140139
</div>
141140
</div>

‎composables/useAuth.ts

Copy file name to clipboardExpand all lines: composables/useAuth.ts
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ import consolaGlobalInstance from "consola";
55

66
export const useAuthCookie = () => useCookie('auth_token')
77

8-
export async function useUser(): Promise<IUser> {
8+
export async function useUser(): Promise<IUser|null> {
99
const authCookie = useAuthCookie().value
10-
const user = useState<IUser>('user')
10+
const user = useState<IUser|null>('user')
1111

1212
if (authCookie && !user.value) {
1313

14+
const cookieHeaders = useRequestHeaders(['cookie'])
15+
1416
const { data } = await useFetch(`/api/auth/getByAuthToken`, {
15-
headers: useRequestHeaders(['cookie']),
17+
headers: cookieHeaders as HeadersInit,
1618
})
1719

1820
user.value = data.value

‎server/api/auth/getByAuthToken.ts

Copy file name to clipboardExpand all lines: server/api/auth/getByAuthToken.ts
+7-2Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ import { IUser } from '~/types/IUser';
22
import { getCookie } from 'h3'
33
import { getUserBySessionToken } from '~~/server/services/sessionService'
44

5-
export default defineEventHandler<IUser>(async (event) => {
6-
const authToken = getCookie(event.req, 'auth_token')
5+
export default defineEventHandler<IUser|null>(async (event) => {
6+
const authToken = getCookie(event, 'auth_token')
7+
8+
if(!authToken) {
9+
return null
10+
}
11+
712
const user = await getUserBySessionToken(authToken)
813

914
return user
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-- AlterTable
2+
ALTER TABLE `Subscription` MODIFY `startDate` INTEGER NULL,
3+
MODIFY `lastEventDate` INTEGER NULL;

‎server/services/userService.ts

Copy file name to clipboardExpand all lines: server/services/userService.ts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export async function validateUser(data: RegistationRequest): Promise<FormValida
1717
return { hasErrors: false }
1818
}
1919

20-
export function sanitizeUserForFrontend(user: IUser | undefined): IUser {
20+
export function sanitizeUserForFrontend(user: IUser | undefined): IUser | undefined {
2121

2222
if (!user) {
2323
return user

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.