IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Bug 68285 - Rooms.InviteUsers. There is no redirection to the room when clicking on the invitation link

Browse Source
This commit is contained in:
Alexey Safronov 2024-07-15 15:55:34 +04:00
parent 15d1263a20
commit 9efe18f60c
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/client/src/helpers/confirmRoute.js
View File

@ -109,7 +109,6 @@ const ConfirmRoute = ({
switch (validationResult) {
case ValidationResult.Ok:
case ValidationResult.UserExisted:
const confirmHeader = search.slice(1);
const linkData = {
...confirmLinkData,
@ -129,6 +128,19 @@ const ConfirmRoute = ({
setState((val) => ({ ...val, isLoaded: true, linkData, roomData }));
break;
case ValidationResult.UserExisted:
const finalUrl = res?.roomId
? `/rooms/shared/${res?.roomId}/filter?folder=${res?.roomId}`
: defaultPage;
console.error("user already exists", {
confirmLinkData,
validationResult,
finalUrl,
});
window.location.replace(finalUrl);
break;
case ValidationResult.Invalid:
console.error("invalid link", {
confirmLinkData,

6
packages/client/src/pages/Confirm/sub-components/createUser.js
View File

@ -212,7 +212,7 @@ const CreateUserForm = (props) => {
});
const finalUrl = roomId
? `/rooms/shared/filter?folder=${roomId}`
? `/rooms/shared/${roomId}/filter?folder=${roomId}`
: defaultPage;
if (roomId) {
@ -324,7 +324,7 @@ const CreateUserForm = (props) => {
signupOAuth(signupAccount)
.then(() => {
const url = roomData.roomId
? `/rooms/shared/filter?folder=${roomData.roomId}/`
? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}/`
: defaultPage;
window.location.replace(url);
})
@ -352,7 +352,7 @@ const CreateUserForm = (props) => {
//console.log({ res });
const finalUrl = roomData.roomId
? `/rooms/shared/filter?folder=${roomData.roomId}`
? `/rooms/shared/${roomData.roomId}/filter?folder=${roomData.roomId}`
: defaultPage;
const isConfirm = typeof res === "string" && res.includes("confirm");