remove useless code
This commit is contained in:
parent
678230deec
commit
40b80b65b3
@ -1,4 +1,4 @@
|
|||||||
import { CreateUserRequest, User } from "@root/model/auth";
|
import { User } from "@root/model/auth";
|
||||||
import { authStore } from "@root/stores/makeRequest";
|
import { authStore } from "@root/stores/makeRequest";
|
||||||
|
|
||||||
|
|
||||||
@ -7,38 +7,16 @@ const authUrl = process.env.NODE_ENV === "production" ? "/auth" : "https://hub.p
|
|||||||
|
|
||||||
const makeRequest = authStore.getState().makeRequest;
|
const makeRequest = authStore.getState().makeRequest;
|
||||||
|
|
||||||
export async function getOrCreateUser({ userId, email, password }: {
|
export async function getOrCreateUser({ userId }: {
|
||||||
userId: string;
|
userId: string;
|
||||||
email: string | null;
|
|
||||||
password: string | null;
|
|
||||||
}): Promise<User | null> {
|
}): Promise<User | null> {
|
||||||
try {
|
return makeRequest<never, User>({
|
||||||
return await makeRequest<never, User>({
|
|
||||||
url: `${apiUrl}/${userId}`,
|
url: `${apiUrl}/${userId}`,
|
||||||
contentType: true,
|
contentType: true,
|
||||||
method: "GET",
|
method: "GET",
|
||||||
useToken: false,
|
useToken: false,
|
||||||
withCredentials: false,
|
withCredentials: false,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
|
||||||
console.log("get user error", error);
|
|
||||||
|
|
||||||
if (!email || !password) return null;
|
|
||||||
|
|
||||||
return makeRequest<CreateUserRequest, User>({
|
|
||||||
url: apiUrl,
|
|
||||||
contentType: true,
|
|
||||||
method: "POST",
|
|
||||||
useToken: true,
|
|
||||||
withCredentials: false,
|
|
||||||
body: {
|
|
||||||
email,
|
|
||||||
login: email,
|
|
||||||
password,
|
|
||||||
phoneNumber: "-",
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function logout() {
|
export function logout() {
|
||||||
|
@ -28,19 +28,17 @@ import { setUser, useUserStore } from "./stores/user";
|
|||||||
const App = () => {
|
const App = () => {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const userId = useUserStore(state => state.userId);
|
const userId = useUserStore(state => state.userId);
|
||||||
const email = useUserStore(state => state.email);
|
|
||||||
const password = useUserStore(state => state.password);
|
|
||||||
|
|
||||||
useEffect(function fetchUserData() {
|
useEffect(function fetchUserData() {
|
||||||
if (!userId) return;
|
if (!userId) return;
|
||||||
|
|
||||||
getOrCreateUser({ userId, email, password }).then(result => {
|
getOrCreateUser({ userId }).then(result => {
|
||||||
setUser(result);
|
setUser(result);
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
console.log("Error fetching user", error);
|
console.log("Error fetching user", error);
|
||||||
enqueueSnackbar(error.response?.data?.message ?? error.message ?? "Error fetching user");
|
enqueueSnackbar(error.response?.data?.message ?? error.message ?? "Error fetching user");
|
||||||
});
|
});
|
||||||
}, [email, password, userId]);
|
}, [userId]);
|
||||||
|
|
||||||
const state = (location.state as { backgroundLocation?: Location; });
|
const state = (location.state as { backgroundLocation?: Location; });
|
||||||
|
|
||||||
|
@ -23,13 +23,6 @@ export interface LoginRequest {
|
|||||||
|
|
||||||
export type LoginResponse = RegisterResponse;
|
export type LoginResponse = RegisterResponse;
|
||||||
|
|
||||||
export interface CreateUserRequest {
|
|
||||||
login: string;
|
|
||||||
email: string;
|
|
||||||
password: string;
|
|
||||||
phoneNumber: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export interface User {
|
export interface User {
|
||||||
_id: string;
|
_id: string;
|
||||||
login: string;
|
login: string;
|
||||||
|
@ -11,7 +11,7 @@ import { Link as RouterLink } from "react-router-dom";
|
|||||||
import { object, string } from "yup";
|
import { object, string } from "yup";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { LoginRequest, LoginResponse } from "@root/model/auth";
|
import { LoginRequest, LoginResponse } from "@root/model/auth";
|
||||||
import { setUserId, setUserEmail, setUserPassword } from "@root/stores/user";
|
import { setUserId } from "@root/stores/user";
|
||||||
|
|
||||||
|
|
||||||
interface Values {
|
interface Values {
|
||||||
@ -50,8 +50,6 @@ export default function SigninDialog() {
|
|||||||
withCredentials: true,
|
withCredentials: true,
|
||||||
}).then(result => {
|
}).then(result => {
|
||||||
setUserId(result._id);
|
setUserId(result._id);
|
||||||
setUserEmail(result.email);
|
|
||||||
setUserPassword(values.password);
|
|
||||||
navigate("/tariffs");
|
navigate("/tariffs");
|
||||||
}).catch((error: any) => {
|
}).catch((error: any) => {
|
||||||
enqueueSnackbar(error.response?.data?.message ?? error.message ?? "Unknown error");
|
enqueueSnackbar(error.response?.data?.message ?? error.message ?? "Unknown error");
|
||||||
|
@ -11,7 +11,7 @@ import { Link as RouterLink } from "react-router-dom";
|
|||||||
import { object, ref, string } from "yup";
|
import { object, ref, string } from "yup";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { RegisterRequest, RegisterResponse } from "@root/model/auth";
|
import { RegisterRequest, RegisterResponse } from "@root/model/auth";
|
||||||
import { setUserEmail, setUserPassword, setUserId } from "@root/stores/user";
|
import { setUserId } from "@root/stores/user";
|
||||||
|
|
||||||
|
|
||||||
interface Values {
|
interface Values {
|
||||||
@ -55,8 +55,6 @@ export default function SignupDialog() {
|
|||||||
withCredentials: true,
|
withCredentials: true,
|
||||||
}).then(result => {
|
}).then(result => {
|
||||||
setUserId(result._id);
|
setUserId(result._id);
|
||||||
setUserEmail(result.email);
|
|
||||||
setUserPassword(values.password);
|
|
||||||
navigate("/tariffs");
|
navigate("/tariffs");
|
||||||
}).catch((error: any) => {
|
}).catch((error: any) => {
|
||||||
enqueueSnackbar(error.response?.data?.message ?? error.message ?? "Unknown error");
|
enqueueSnackbar(error.response?.data?.message ?? error.message ?? "Unknown error");
|
||||||
|
@ -5,15 +5,11 @@ import { createJSONStorage, devtools, persist } from "zustand/middleware";
|
|||||||
|
|
||||||
interface UserStore {
|
interface UserStore {
|
||||||
userId: string | null;
|
userId: string | null;
|
||||||
email: string | null;
|
|
||||||
password: string | null;
|
|
||||||
user: User | null;
|
user: User | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const initialState: UserStore = {
|
const initialState: UserStore = {
|
||||||
userId: null,
|
userId: null,
|
||||||
email: null,
|
|
||||||
password: null,
|
|
||||||
user: null,
|
user: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -36,8 +32,6 @@ export const useUserStore = create<UserStore>()(
|
|||||||
);
|
);
|
||||||
|
|
||||||
export const setUserId = (userId: string | null) => useUserStore.setState({ userId });
|
export const setUserId = (userId: string | null) => useUserStore.setState({ userId });
|
||||||
export const setUserEmail = (email: string | null) => useUserStore.setState({ email });
|
|
||||||
export const setUserPassword = (password: string | null) => useUserStore.setState({ password });
|
|
||||||
export const setUser = (user: User | null) => useUserStore.setState({ user });
|
export const setUser = (user: User | null) => useUserStore.setState({ user });
|
||||||
|
|
||||||
export const clearUser = () => useUserStore.setState({ ...initialState });
|
export const clearUser = () => useUserStore.setState({ ...initialState });
|
Loading…
Reference in New Issue
Block a user