mirror of
https://github.com/fromchat-messenger/web.git
synced 2026-09-22 19:15:08 +03:00
Fix user restore logic
This commit is contained in:
@@ -121,7 +121,6 @@ def register(request: RegisterRequest, db: Session = Depends(get_db)):
|
||||
"message": "Регистрация прошла успешно Теперь вы можете войти."
|
||||
}
|
||||
|
||||
|
||||
@router.get("/crypto/public-key")
|
||||
def get_public_key(current_user: User = Depends(get_current_user), db: Session = Depends(get_db)):
|
||||
row = db.query(CryptoPublicKey).filter(CryptoPublicKey.user_id == current_user.id).first()
|
||||
|
||||
@@ -4,6 +4,7 @@ import { request } from "../core/websocket";
|
||||
import { MessagePanel } from "./panels/MessagePanel";
|
||||
import { PublicChatPanel } from "./panels/PublicChatPanel";
|
||||
import { DMPanel, type DMPanelData } from "./panels/DMPanel";
|
||||
import { getAuthHeaders } from "../auth/api";
|
||||
|
||||
type Page = "login" | "register" | "chat"
|
||||
export type ChatTabs = "chats" | "channels" | "contacts" | "dms"
|
||||
@@ -192,13 +193,15 @@ export const useAppState = create<AppState>((set, get) => ({
|
||||
currentPage: "login"
|
||||
}));
|
||||
},
|
||||
restoreUserFromStorage: () => {
|
||||
restoreUserFromStorage: async () => {
|
||||
try {
|
||||
const token = localStorage.getItem('authToken');
|
||||
const userStr = localStorage.getItem('currentUser');
|
||||
|
||||
if (token && userStr) {
|
||||
const user = JSON.parse(userStr) as User;
|
||||
if (token) {
|
||||
const user: User = await (await fetch("/api/user/profile", {
|
||||
headers: getAuthHeaders(token)
|
||||
})).json();
|
||||
|
||||
set(() => ({
|
||||
user: {
|
||||
currentUser: user,
|
||||
|
||||
Reference in New Issue
Block a user