cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-12-26 07:22:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix(auth): block render while logging in

Browse source
This commit is contained in:
Paul 2021-12-24 11:32:59 +00:00
parent 74430b1a8f
commit c31bcd0200
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/context/revoltjs/RevoltClient.tsx
View file

@ -30,7 +30,6 @@ export interface ClientOperations {
export const AppContext = createContext<Client>(null!); export const AppContext = createContext<Client>(null!);
export const StatusContext = createContext<ClientStatus>(null!); export const StatusContext = createContext<ClientStatus>(null!);
export const OperationsContext = createContext<ClientOperations>(null!);
export const LogOutContext = createContext(() => {}); export const LogOutContext = createContext(() => {});
type Props = { type Props = {
@ -57,12 +56,12 @@ export default observer(({ children }: Props) => {
useEffect(() => { useEffect(() => {
if (state.auth.isLoggedIn()) { if (state.auth.isLoggedIn()) {
setLoaded(false);
const client = state.config.createClient(); const client = state.config.createClient();
setClient(client); setClient(client);
client client
.useExistingSession(state.auth.getSession()!) .useExistingSession(state.auth.getSession()!)
.then(() => setLoaded(true))
.catch((err) => { .catch((err) => {
const error = takeError(err); const error = takeError(err);
if (error === "Forbidden" || error === "Unauthorized") { if (error === "Forbidden" || error === "Unauthorized") {
@ -72,7 +71,8 @@ export default observer(({ children }: Props) => {
setStatus(ClientStatus.DISCONNECTED); setStatus(ClientStatus.DISCONNECTED);
openScreen({ id: "error", error }); openScreen({ id: "error", error });
} }
}); })
.finally(() => setLoaded(true));
} else { } else {
setStatus(ClientStatus.READY); setStatus(ClientStatus.READY);
setLoaded(true); setLoaded(true);

3
src/pages/login/forms/FormLogin.tsx
View file

@ -50,7 +50,7 @@ export function FormLogin() {
"x-session-token": session?.token, "x-session-token": session?.token,
}; };
function login() { async function login() {
auth.setSession(session); auth.setSession(session);
} }
@ -58,6 +58,7 @@ export function FormLogin() {
"GET", "GET",
"/onboard/hello", "/onboard/hello",
); );
if (onboarding) { if (onboarding) {
openScreen({ openScreen({
id: "onboarding", id: "onboarding",