merge: branch 'master' into production

This commit is contained in:
Paul Makles 2022-07-13 13:06:47 +01:00
commit c9066aba2d
2 changed files with 11 additions and 2 deletions

View file

@ -10,6 +10,7 @@ import Auth from "../../mobx/stores/Auth";
import { resetMemberSidebarFetched } from "../../components/navigation/right/MemberSidebar";
import { modalController } from "../modals/ModalController";
import Session from "./Session";
import { takeError } from "./jsx/error";
/**
* Controls the lifecycles of clients
@ -156,12 +157,20 @@ class ClientController {
configuration: this.configuration!,
knowledge,
})
.catch((error) => {
.catch((err) => {
const error = takeError(err);
if (error === "Forbidden" || error === "Unauthorized") {
this.sessions.delete(user_id);
this.current = null;
this.pickNextSession();
state.auth.removeSession(user_id);
modalController.push({ type: "signed_out" });
session.destroy();
} else {
modalController.push({
type: "error",
error,
});
}
});
}

View file

@ -202,7 +202,7 @@ export default class Session {
}
}
this.continueLogin(data);
await this.continueLogin(data);
break;
}