Skip to content

Remove unsafe regex #114

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Remove unsafe regex #114

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a76b8d1
Bump version to v2.18.0-SNAPSHOT
gridsuite-actions[bot] May 5, 2025
6099a42
remove_unsafe_regex
AbdelHedhili May 5, 2025
0c9620e
Merge branch 'main' into remove_unsafe_regex
AbdelHedhili May 5, 2025
c47adfd
Merge branch 'main' into remove_unsafe_regex
AbdelHedhili May 5, 2025
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
12 changes: 11 additions & 1 deletion src/utils/api-ws.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@ export type * from './api';

export function getWsBase(): string {
// We use the `baseURI` (from `<base/>` in index.html) to build the URL, which is corrected by httpd/nginx
return document.baseURI.replace(/^http(s?):\/\//, 'ws$1://').replace(/\/+$/, '') + import.meta.env.VITE_WS_GATEWAY;

let baseUri = document.baseURI.replace(/^http(s?):\/\//, 'ws$1://');
return removeTrailingSlashes(baseUri) + import.meta.env.VITE_WS_GATEWAY;
}

function removeTrailingSlashes(str: string) {
let end = str.length;
while (end > 0 && str[end - 1] === '/') {
end--;
}
return str.slice(0, end);
}

export function getUrlWithToken(baseUrl: string): string {
Expand Down
Loading