Merge branch 'hotfix/v2.6.1' of github.com:ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

This commit is contained in:
Alexey Safronov 2024-08-15 16:13:25 +04:00
commit 21f4cbd625
3 changed files with 9 additions and 5 deletions

View File

@ -54,7 +54,10 @@ export const GreetingContainer = styled.div`
}
.tooltip {
p {
.invitation-text {
display: flex;
flex-direction: column;
align-items: center;
text-align: center;
}

View File

@ -485,7 +485,7 @@ const CreateUserForm = (props) => {
<PortalLogo className="portal-logo" />
{linkData.type === "LinkInvite" && (
<div className="tooltip">
<Text fontSize="16px">
<Text fontSize="16px" as="div" className="invitation-text">
{roomName ? (
<Trans
t={t}

View File

@ -220,10 +220,12 @@ class AxiosClient {
}
const loginURL = combineUrl(proxyURL, "/login");
if (!this.isSSR) {
switch (error.response?.status) {
case 401: {
if (options.skipUnauthorized) return Promise.resolve();
if (options.skipUnauthorized || window?.ClientConfig?.isFrame)
return Promise.resolve();
if (options.skipLogout) return Promise.reject(error);
const opt: AxiosRequestConfig = {
@ -244,14 +246,13 @@ class AxiosClient {
break;
case 403: {
const pathname = window.location.pathname;
const isFrame = window?.ClientConfig?.isFrame;
const isArchived = pathname.indexOf("/rooms/archived") !== -1;
const isRooms =
pathname.indexOf("/rooms/shared") !== -1 || isArchived;
if (isRooms && !skipRedirect && !isFrame) {
if (isRooms && !skipRedirect && !window?.ClientConfig?.isFrame) {
setTimeout(() => {
window.DocSpace.navigate(isArchived ? "/archived" : "/");
}, 1000);