Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC-7171 - TSC: Logout with open tldraw tab leads to wrong page #120

Merged
merged 8 commits into from
Dec 20, 2024
Merged

BC-7171 - TSC: Logout with open tldraw tab leads to wrong page #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a38e928
BC-7171 - add `TLDRAW_NOT_AUTHENTICATED_REDIRECT_URL` to config response
bergatco Dec 12, 2024
ec2d5c1
Merge branch 'main' into BC-7171
bergatco Dec 17, 2024
edcefbe
BC-7171 - Add support for TSP login redirection and new public system…
bergatco Dec 17, 2024
5a9286e
BC-7171 - Remove TLDRAW_NOT_AUTHENTICATED_REDIRECT_URL from configura…
bergatco Dec 18, 2024
0c6319b
BC-7171 - Refactor API configuration to remove deprecated login redir…
bergatco Dec 18, 2024
898aec7
BC-7171 - Revert some changes to minimize diff
bergatco Dec 18, 2024
20758f8
BC-7171 - Revert missing change
bergatco Dec 18, 2024
63439df
BC-7171 - Fix redirect URL construction to handle query parameters co…
bergatco Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/configuration/api/api.configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export const API = {
FILE_UPLOAD: "/api/v3/file/upload/school/SCHOOLID/boardnodes/CONTEXTID",
FILE_DELETE: "/api/v3/file/delete/FILERECORD_ID",
FILE_RESTORE: "/api/v3/file/restore/FILERECORD_ID",
LOGIN_REDIRECT: "/login?redirect=/tldraw?parentId=PARENTID",
USER_DATA: `/api/v3/user/me`,
CONFIG_PATH: `/api/tldraw/config/public`,
};
3 changes: 3 additions & 0 deletions src/mapper/configuration.mapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const checkEnvType = (obj: Record<string, unknown>): void => {
obj,
"TLDRAW_ASSETS_ALLOWED_MIME_TYPES_LIST",
);
TypeGuard.checkKeyAndValueExists(obj, "NOT_AUTHENTICATED_REDIRECT_URL");
TypeGuard.checkBoolean(obj.FEATURE_TLDRAW_ENABLED);
TypeGuard.checkNumber(obj.TLDRAW_ASSETS_MAX_SIZE_BYTES);
TypeGuard.checkArray(obj.TLDRAW_ASSETS_ALLOWED_MIME_TYPES_LIST);
Expand All @@ -33,6 +34,8 @@ export class ConfigurationMapper {
TLDRAW_ASSETS_MAX_SIZE_BYTES: configuration.TLDRAW_ASSETS_MAX_SIZE_BYTES,
TLDRAW_ASSETS_ALLOWED_MIME_TYPES_LIST:
configuration.TLDRAW_ASSETS_ALLOWED_MIME_TYPES_LIST,
NOT_AUTHENTICATED_REDIRECT_URL:
configuration.NOT_AUTHENTICATED_REDIRECT_URL,
};

return mappedConfiguration;
Expand Down
1 change: 1 addition & 0 deletions src/types/Envs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ export type Envs = {
TLDRAW_ASSETS_MAX_SIZE_BYTES: number;
TLDRAW_ASSETS_ALLOWED_MIME_TYPES_LIST: string[];
TLDRAW_WEBSOCKET_URL: string;
NOT_AUTHENTICATED_REDIRECT_URL: string;
};
1 change: 1 addition & 0 deletions src/utils/envConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const getEnvs = async (): Promise<Envs> => {
"image/svg+xml",
],
FEATURE_TLDRAW_ENABLED: true,
NOT_AUTHENTICATED_REDIRECT_URL: "http://localhost:4000/login",
};

return configuration;
Expand Down
17 changes: 7 additions & 10 deletions src/utils/redirectUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { API } from "../configuration/api/api.configuration";
import { Envs } from "../types/Envs";
import { HttpStatusCode } from "../types/StatusCodeEnums";
import { UserResult } from "../types/User";
import { setErrorData } from "./errorData";
import { validateId } from "./validator";
import { getEnvs } from "./envConfig";

const getParentId = () => {
const urlParams = new URLSearchParams(window.location.search);
Expand All @@ -14,16 +14,13 @@ const getParentId = () => {
return parentId;
};

const redirectToLoginPage = () => {
const redirectToLoginPage = async () => {
const envs = await getEnvs();
const parentId = getParentId();
if (import.meta.env.PROD) {
const redirectUrl = API.LOGIN_REDIRECT.replace("PARENTID", parentId);
window.location.assign(redirectUrl);
} else {
window.location.assign(
`http://localhost:4000/login?redirect=tldraw?parentId=${parentId}`,
);
}
let redirectUrl = envs.NOT_AUTHENTICATED_REDIRECT_URL;
const separator = redirectUrl.includes("?") ? "&" : "?";
redirectUrl += `${separator}redirect=/tldraw?parentId=${parentId}`;
window.location.assign(redirectUrl);
};

const redirectToErrorPage = () => {
Expand Down
Loading