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.

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

fix(core): enable CORS on the asset protocol, closes #2965 #2974

Merged
merged 6 commits into from Dec 9, 2021

Conversation

lucasfernog
Copy link
Member

What kind of change does this PR introduce? (check at least one)

  • Bugfix
  • Feature
  • Docs
  • New Binding Issue #___
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change? (check one)

  • Yes. Issue #___
  • No

The PR fulfills these requirements:

  • When resolving a specific issue, it's referenced in the PR's title (e.g. fix: #xxx[,#xxx], where "xxx" is the issue number)
  • A change file is added if any packages will require a version bump due to this PR per the instructions in the readme.

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)

Other information:

@lucasfernog lucasfernog requested a review from a team as a code owner November 27, 2021 17:59
@lucasfernog lucasfernog requested a review from a team November 27, 2021 17:59
@lucasfernog
Copy link
Member Author

Must be merged after #2973.

Comment on lines +306 to +316
let window_url = Url::parse(&pending.url).unwrap();
let window_origin = format!(
"{}://{}{}",
window_url.scheme(),
window_url.host().unwrap(),
if let Some(port) = window_url.port() {
format!(":{}", port)
} else {
"".into()
}
);

Choose a reason for hiding this comment

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

This works as expected running yarn tauri build, but doesn't work when running yarn tauri dev. Same CORS error is displayed on the screen. Don't know how to fix, but my guess is that it is not registering http://localhost:3000 from the vite dev command. I have changed the allowed origin line in my fork to "*" and it works correctly without CORS error.

https://github.com/antoniotorres/tauri/blob/fix/asset-protocol-cors/core/tauri/src/manager.rs#L307

Copy link
Member Author

Choose a reason for hiding this comment

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

ooops i didn't realize i was reassign the url after defining the window origin

Base automatically changed from feat/share-runtime to next December 9, 2021 02:41
@lucasfernog lucasfernog requested a review from a team December 9, 2021 02:41
@lucasfernog lucasfernog merged commit d28ac8a into next Dec 9, 2021
@lucasfernog lucasfernog deleted the fix/asset-protocol-cors branch December 9, 2021 03:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants