Merge pull request #53 from teacoder-team/dev

Dev

Author: TeaCoder52

src/api/hooks/useLogout.ts

@@ -4,7 +4,7 @@ import { logout } from '../requests'
 
 export const useLogout = (
 	options?: Omit<
-		UseMutationOptions<void, unknown, void>,
+		UseMutationOptions<unknown, unknown, void>,
 		'mutationKey' | 'mutationFn'
 	>
 ) =>

src/api/hooks/useVerifyMfa.ts

@@ -8,10 +8,14 @@ import {
 	verifyMfa
 } from '../requests'
 
-type MfaVerifyRequest =
-	| VerifyTotpRequest
-	| VerifyPasskeyRequest
-	| VerifyRecoveryRequest
+type AnalyticsMeta = {
+	method?: string
+}
+
+export type MfaVerifyRequest =
+	| (VerifyTotpRequest & AnalyticsMeta)
+	| (VerifyPasskeyRequest & AnalyticsMeta)
+	| (VerifyRecoveryRequest & AnalyticsMeta)
 
 export const useVerifyMfa = (
 	options?: Omit<

src/api/instance.ts

@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 import { APP_CONFIG } from '../constants/app'
-import { getSessionToken } from '../lib/cookies/session'
+import { cookies } from '../lib/cookie'
 
 export const api = axios.create({
 	baseURL: APP_CONFIG.apiUrl
@@ -10,6 +10,6 @@ export const api = axios.create({
 export const instance = axios.create({
 	baseURL: APP_CONFIG.apiUrl,
 	headers: {
-		'X-Session-Token': getSessionToken() ?? ''
+		'X-Session-Token': cookies.get('token') ?? ''
 	}
 })

src/api/requests/account.ts

@@ -9,27 +9,13 @@ import type {
 } from '../generated'
 import { api, instance } from '../instance'
 
-import { setSessionToken } from '@/src/lib/cookies/session'
-
 export const getMe = async () =>
-	await instance
-		.get<AccountResponse>('/auth/account')
-		.then(response => response.data)
-
-export const createAccount = async (data: CreateUserRequest) => {
-	const response = await api.post<CreateUserResponse>(
-		'/auth/account/create',
-		data
-	)
-
-	if (response.data.token) {
-		setSessionToken(response.data.token)
-
-		instance.defaults.headers['X-Session-Token'] = response.data.token
-	}
+	await instance.get<AccountResponse>('/auth/account').then(res => res.data)
 
-	return response.data
-}
+export const createAccount = async (data: CreateUserRequest) =>
+	await api
+		.post<CreateUserResponse>('/auth/account/create', data)
+		.then(res => res.data)
 
 export const sendEmailVerification = () => instance.post('/auth/account/verify')
 

src/api/requests/session.ts

@@ -6,8 +6,6 @@ import type {
 } from '../generated'
 import { api, instance } from '../instance'
 
-import { removeSessionToken } from '@/src/lib/cookies/session'
-
 export const login = async (data: LoginRequest) =>
 	await api
 		.post<
@@ -16,9 +14,7 @@ export const login = async (data: LoginRequest) =>
 		.then(response => response.data)
 
 export const logout = async () =>
-	await instance
-		.post<boolean>('/auth/session/logout')
-		.then(() => removeSessionToken())
+	await instance.post<boolean>('/auth/session/logout')
 
 export const getSessions = async () =>
 	await instance

src/app/(public)/courses/[slug]/page.tsx

@@ -3,8 +3,8 @@ import { notFound } from 'next/navigation'
 
 import { getCourse, getCourseLessons, getCourses } from '@/src/api/requests'
 import { CourseDetails } from '@/src/components/course/course-details'
-import { CourseProvider } from '@/src/components/providers/course-provider'
 import { getMediaSource } from '@/src/lib/utils'
+import { CourseProvider } from '@/src/providers/course-provider'
 
 export async function generateStaticParams() {
 	const courses = await getCourses()

src/app/account/layout.tsx

@@ -2,7 +2,7 @@ import type { ReactNode } from 'react'
 
 import { Header } from '@/src/components/layout/header'
 import { UserNavigation } from '@/src/components/layout/user-navigation'
-import { AccountProvider } from '@/src/components/providers/account-provider'
+import { AccountProvider } from '@/src/providers'
 
 export default function AccountLayout({ children }: { children: ReactNode }) {
 	return (

src/app/auth/callback/page.tsx

@@ -5,7 +5,8 @@ import { useEffect } from 'react'
 
 import { instance } from '@/src/api/instance'
 import { EllipsisLoader } from '@/src/components/shared/ellipsis-loader'
-import { setSessionToken } from '@/src/lib/cookies/session'
+import { ROUTES } from '@/src/constants'
+import { cookies } from '@/src/lib/cookie'
 
 export default function AuthCallbackPage() {
 	const router = useRouter()
@@ -15,9 +16,11 @@ export default function AuthCallbackPage() {
 		const token = new URLSearchParams(hash.slice(1)).get('token')
 
 		if (token) {
-			setSessionToken(token)
+			cookies.set('token', token, { expires: 30 })
+
 			instance.defaults.headers['X-Session-Token'] = token
-			router.push('/account/settings')
+
+			router.push(ROUTES.ACCOUNT.ROOT)
 		}
 	}, [router])
 

src/app/auth/telegram-oauth-finish/page.tsx

@@ -1,15 +1,15 @@
 'use client'
 
 import { useRouter } from 'next/navigation'
-import { useEffect, useState } from 'react'
+import { useEffect } from 'react'
 
 import { TelegramAuthRequest } from '@/src/api/generated'
 import { useTelegramAuth } from '@/src/api/hooks'
 import { instance } from '@/src/api/instance'
 import { EllipsisLoader } from '@/src/components/shared/ellipsis-loader'
 import { ROUTES } from '@/src/constants'
 import { useFingerprint } from '@/src/hooks'
-import { setSessionToken } from '@/src/lib/cookies/session'
+import { cookies } from '@/src/lib/cookie'
 
 function base64DecodeUnicode(str: string) {
 	try {
@@ -32,7 +32,7 @@ export default function TelegramAuthFinishPage() {
 
 	const { mutate } = useTelegramAuth({
 		onSuccess(data) {
-			setSessionToken(data.token)
+			cookies.set('token', data.token, { expires: 30 })
 
 			instance.defaults.headers['X-Session-Token'] = data.token
 

src/app/layout.tsx

@@ -1,16 +1,17 @@
-import { GoogleAnalytics } from '@next/third-parties/google'
 import { GeistSans } from 'geist/font/sans'
 import type { Metadata } from 'next'
 import type { ReactNode } from 'react'
 
-import { YandexMetrika } from '../components/analitycs/yandex-metrika'
-import { BanChecker } from '../components/providers/ban-checker'
-import { FingerprintProvider } from '../components/providers/fingerprint-provider'
-import { PosthogProvider } from '../components/providers/posthog-provider'
-import { TanstackQueryProvider } from '../components/providers/tanstack-query-provider'
-import { ThemeProvider } from '../components/providers/theme-provider'
 import { Toaster } from '../components/shared/sonner'
 import { APP_CONFIG, SEO } from '../constants'
+import { YandexMetrikaScript } from '../lib/analytics/script-providers'
+import {
+	AnalyticsProvider,
+	BanChecker,
+	FingerprintProvider,
+	TanstackQueryProvider,
+	ThemeProvider
+} from '../providers'
 
 import '@/src/styles/globals.css'
 
@@ -73,7 +74,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
 		<html className={GeistSans.variable} lang='ru' suppressHydrationWarning>
 			<body className='flex h-full w-full flex-col font-sans'>
 				<TanstackQueryProvider>
-					<PosthogProvider>
+					<AnalyticsProvider>
 						<FingerprintProvider>
 							<ThemeProvider
 								attribute='class'
@@ -99,25 +100,12 @@ export default function RootLayout({ children }: { children: ReactNode }) {
 								{process.env['NEXT_PUBLIC_NODE_ENV'] ===
 									'production' && (
 									<>
-										<YandexMetrika
-											id={
-												process.env[
-													'NEXT_PUBLIC_YANDEX_METRIKA_ID'
-												] ?? ''
-											}
-										/>
-										<GoogleAnalytics
-											gaId={
-												process.env[
-													'NEXT_PUBLIC_GOOGLE_ANALYTICS_ID'
-												] ?? ''
-											}
-										/>
+										<YandexMetrikaScript />
 									</>
 								)}
 							</ThemeProvider>
 						</FingerprintProvider>
-					</PosthogProvider>
+					</AnalyticsProvider>
 				</TanstackQueryProvider>
 			</body>
 		</html>