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

Jump to bottom

Fix flaky auth test with console error "Failed to fetch" #3287

Merged
merged 16 commits into from
Mar 13, 2024
Merged

Fix flaky auth test with console error "Failed to fetch" #3287

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
20c1af1
Attempt to fix flaky test
apedroferreira Mar 11, 2024
ab380d2
Remove test.only
apedroferreira Mar 11, 2024
2605fdc
Just ignore?
apedroferreira Mar 11, 2024
972f147
What if we try this craziness
apedroferreira Mar 11, 2024
b9327a0
Remove test.only
apedroferreira Mar 11, 2024
bcd3bdb
Nevermind
apedroferreira Mar 11, 2024
3c52c4f
This seems like a good fix
apedroferreira Mar 13, 2024
15f6342
Add comment
apedroferreira Mar 13, 2024
271fc15
Merge remote-tracking branch 'upstream/master' into flaky-test-fix
apedroferreira Mar 13, 2024
8f6370c
adjust comment
apedroferreira Mar 13, 2024
8e2da66
Better comment again
apedroferreira Mar 13, 2024
1910476
Merge remote-tracking branch 'upstream/master' into flaky-test-fix
apedroferreira Mar 13, 2024
22fd1c0
Wait for sign up form to render instead
apedroferreira Mar 13, 2024
de4355e
Remove test.only
apedroferreira Mar 13, 2024
1cdbd22
Fix lockfile
apedroferreira Mar 13, 2024
f8c9451
Re-add Firefox ignores
apedroferreira Mar 13, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"format-util": "1.0.5",
"globby": "14.0.1",
"jsdom": "24.0.0",
"lerna": "8.1.2",
"lerna": "7.4.2",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using lerna 7 until this gets fixed: lerna/lerna#3964

"markdownlint-cli2": "0.12.1",
"prettier": "3.2.5",
"pretty-quick": "4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/toolpad-studio/src/runtime/SignInPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default function SignInPage() {
React.useEffect(() => {
const authError = urlParams.get(AUTH_ERROR_URL_PARAM);

if (authError === 'AuthorizedCallbackError') {
if (authError === 'AuthorizedCallbackError' || authError === 'CredentialsSignin') {
setErrorSnackbarMessage('Access unauthorized.');
} else if (authError === 'CallbackRouteError') {
setErrorSnackbarMessage(
Expand Down
9 changes: 8 additions & 1 deletion packages/toolpad-studio/src/server/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,16 @@ export async function createRequireAuthMiddleware(project: ToolpadProject) {

const isPageRequest = req.get('sec-fetch-dest') === 'document';
const signInPath = `${base}/signin`;
const editorPath = `${base}/editor`;

const requestPath = req.originalUrl.split('?')[0];

let isAuthorized = true;
if ((!project.options.dev || isPageRequest) && req.originalUrl.split('?')[0] !== signInPath) {
if (
(!project.options.dev || isPageRequest) &&
!requestPath.startsWith(signInPath) &&
!requestPath.startsWith(editorPath)
) {
const token = await getUserToken(req);
if (!token) {
isAuthorized = false;
Expand Down
Loading
Loading