[Query API] Use the exact redirect URL provided in the ?url= query param #1945
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -171,10 +171,16 @@ export async function setupPlatformLevelMuPlugins(php: UniversalPHP) { | |||
| $parts = explode('/', $redirect_url); | ||||
| $redirect_url = '/' . implode('/', array_slice($parts, 2)); | ||||
| } | ||||
| $redirect_url = home_url($redirect_url); | ||||
|
There was a problem hiding this comment. @adamziel we don't need to force this to a absolute URL anymore because we have a a fix for the relative URL redirects in Safari.
Suggested change
There was a problem hiding this comment. I hope that you don't mind, that I merged trunk into your PR and resolved the conflict with the Safari redirect fix. |
||||
|
|
||||
| /** | ||||
| * Intentionally do not use wp_redirect() here. It removes | ||||
| * %0A and %0D sequences from the URL, which we don't want. | ||||
| * There are valid use-cases for encoded newlines in the query string, | ||||
| * for example html-api-debugger accepts markup with newlines | ||||
| * encoded as %0A via the query string. | ||||
| */ | ||||
| header( "Location: $redirect_url", true, 302 ); | ||||
| exit; | ||||
| } | ||||
| /** | ||||
|
|
||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,112 +1,81 @@ | ||
| { | ||
| "compileOnSave": false, | ||
| "compilerOptions": { | ||
| "rootDir": ".", | ||
| "sourceMap": true, | ||
| "declaration": false, | ||
| "moduleResolution": "node", | ||
| "esModuleInterop": true, | ||
| "emitDecoratorMetadata": true, | ||
| "experimentalDecorators": true, | ||
| "importHelpers": true, | ||
| "resolveJsonModule": true, | ||
| "jsx": "react", | ||
| "target": "ES2021", | ||
| "module": "esnext", | ||
| "lib": ["ES2022", "esnext.disposable", "dom"], | ||
| "skipLibCheck": true, | ||
| "skipDefaultLibCheck": true, | ||
| "baseUrl": ".", | ||
| "paths": { | ||
| "@php-wasm/cli": ["packages/php-wasm/cli/src/main.ts"], | ||
| "@php-wasm/fs-journal": [ | ||
| "packages/php-wasm/fs-journal/src/index.ts" | ||
| ], | ||
| "@php-wasm/logger": ["packages/php-wasm/logger/src/index.ts"], | ||
| "@php-wasm/node": ["packages/php-wasm/node/src/index.ts"], | ||
| "@php-wasm/node-polyfills": [ | ||
| "packages/php-wasm/node-polyfills/src/index.ts" | ||
| ], | ||
| "@php-wasm/private": ["packages/php-wasm/private/src/index.ts"], | ||
| "@php-wasm/progress": ["packages/php-wasm/progress/src/index.ts"], | ||
| "@php-wasm/scopes": ["packages/php-wasm/scopes/src/index.ts"], | ||
| "@php-wasm/stream-compression": [ | ||
| "packages/php-wasm/stream-compression/src/index.ts" | ||
| ], | ||
| "@php-wasm/universal": ["packages/php-wasm/universal/src/index.ts"], | ||
| "@php-wasm/util": ["packages/php-wasm/util/src/index.ts"], | ||
| "@php-wasm/web": ["packages/php-wasm/web/src/index.ts"], | ||
| "@php-wasm/web-service-worker": [ | ||
| "packages/php-wasm/web-service-worker/src/index.ts" | ||
| ], | ||
| "@wp-playground/blueprints": [ | ||
| "packages/playground/blueprints/src/index.ts" | ||
| ], | ||
| "@wp-playground/cli": ["packages/playground/cli/src/cli.ts"], | ||
| "@wp-playground/client": [ | ||
| "packages/playground/client/src/index.ts" | ||
| ], | ||
| "@wp-playground/common": [ | ||
| "packages/playground/common/src/index.ts" | ||
| ], | ||
| "@wp-playground/components": [ | ||
| "packages/playground/components/src/index.ts" | ||
| ], | ||
| "@wp-playground/nx-extensions": [ | ||
| "packages/nx-extensions/src/index.ts" | ||
| ], | ||
| "@wp-playground/remote": [ | ||
| "packages/playground/remote/src/index.ts" | ||
| ], | ||
| "@wp-playground/storage": [ | ||
| "packages/playground/storage/src/index.ts" | ||
| ], | ||
| "@wp-playground/sync": ["packages/playground/sync/src/index.ts"], | ||
| "@wp-playground/unit-test-utils": [ | ||
| "packages/playground/unit-test-utils/src/index.ts" | ||
| ], | ||
| "@wp-playground/website": [ | ||
| "packages/playground/website/src/index.ts" | ||
| ], | ||
| "@wp-playground/wordpress": [ | ||
| "packages/playground/wordpress/src/index.ts" | ||
| ], | ||
| "@wp-playground/wordpress-builds": [ | ||
| "packages/playground/wordpress-builds/src/index.ts" | ||
| ], | ||
| "isomorphic-git": ["./isomorphic-git/src"] | ||
| } | ||
| }, | ||
| "exclude": ["node_modules", "tmp"] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could this be related to the async event handler?
I've done some testing (not on playground) and with an async event handler the behavior seemed less reliable. However, with the sync event handler,
e.target.contentWindow.location.hrefseemed to reliably be the expected value.I don't know whether
target/currentTargetmatters, I suspect not, buttargetseemed to work well in my testing the load event on the iframe.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, the information is lost after the
await. I was thinking it's related to React and how it clearscurrentTargetafter the synchronous event handler returns, but now that I think about it, React shouldn't be in the mix here. You may be right about thetarget/currentTarget– was the latter affected by bubbling?