diff --git a/client/src/services/auth.ts b/client/src/services/auth.ts deleted file mode 100644 index f1e8f8e..0000000 --- a/client/src/services/auth.ts +++ /dev/null @@ -1,22 +0,0 @@ -import api from '../api/api'; -import { useUserStore } from '../store/user'; -import { Auth } from '../types/auth'; - -export class AuthService { - static async login(auth: Auth) { - const token = await api.login(auth); - console.log(token); - localStorage.setItem('accessToken', token.accessToken); - } - - static async logout() { - useUserStore.getState().removeUser(); - localStorage.removeItem('userInfo'); - localStorage.removeItem('accessToken'); - } - - static async refresh() { - const token = await api.refreshToken(); - localStorage.setItem('accessToken', token.accessToken); - } -} diff --git a/client/src/services/authService.ts b/client/src/services/authService.ts new file mode 100644 index 0000000..d24250d --- /dev/null +++ b/client/src/services/authService.ts @@ -0,0 +1,30 @@ +import api from '../api/api'; +import { useAuthStore } from '../store/authStore'; +import { useUserStore } from '../store/userStore'; +import { Auth } from '../types/auth'; +import { UserService } from './userService'; + +export class AuthService { + static async login(auth: Auth) { + const token = await api.login(auth); + useAuthStore.getState().setAccessToken(token.accessToken); + localStorage.setItem('refreshToken', token.refreshToken); + await UserService.getProfile().then((user) => { + useUserStore.getState().setUser(user); + }); + } + + static async logout() { + console.log('logout'); + useUserStore.getState().setUser(null); + useAuthStore.getState().setAccessToken(null); + localStorage.removeItem('userInfo'); + localStorage.removeItem('refreshToken'); + } + + static async refresh() { + console.log('refresh'); + const token = await api.refreshToken(); + useAuthStore.getState().setAccessToken(token.accessToken); + } +} diff --git a/client/src/services/user.ts b/client/src/services/userService.ts similarity index 53% rename from client/src/services/user.ts rename to client/src/services/userService.ts index 9834eb6..16e6bcf 100644 --- a/client/src/services/user.ts +++ b/client/src/services/userService.ts @@ -3,8 +3,14 @@ import { User } from '../types/user'; export class UserService { static async getProfile(): Promise { + console.log('getProfile'); const user = api.getProfile(); return user; } + + static async getUsers(page: number = 1, limit: number = 10): Promise { + const users = api.getUsers(page, limit); + return users; + } }