fix: enable CORS with hot-reloaded origins #3601
Merged
Conversation
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
zepatrik
commented
Aug 10, 2023
aeneasr
previously approved these changes
Aug 10, 2023
zepatrik
commented
Aug 11, 2023
| @@ -78,11 +74,11 @@ func RunServeAdmin(slOpts []servicelocatorx.Option, dOpts []driver.OptionsModifi | |||
| ctx := cmd.Context() | |||
| sl := servicelocatorx.NewOptions(slOpts...) | |||
|
|
|||
| d, err := driver.New(cmd.Context(), sl, append(dOpts, driver.WithOptions(configx.WithFlags(cmd.Flags())))) | |||
| d, err := driver.New(cmd.Context(), sl, append(dOpts, driver.WithOptions(append(cOpts, configx.WithFlags(cmd.Flags()))...))) | |||
There was a problem hiding this comment.
Not sure why those options were not passed on?
cmd/server/handler.go
Outdated
| @@ -312,6 +308,9 @@ func serve( | |||
| ) { | |||
| defer wg.Done() | |||
|
|
|||
| cfg, _ := d.Config().CORS(ctx, iface) | |||
| handler = cors.New(cfg).Handler(handler) | |||
There was a problem hiding this comment.
Always enabled now because the function hot-reloads "enabled" as well.
Codecov Report
@@ Coverage Diff @@
## master #3601 +/- ##
==========================================
- Coverage 76.28% 76.27% -0.01%
==========================================
Files 132 132
Lines 9984 9987 +3
==========================================
+ Hits 7616 7618 +2
- Misses 1848 1849 +1
Partials 520 520
|
aeneasr
previously approved these changes
Aug 14, 2023
# Conflicts: # go.mod # go.sum
aeneasr
approved these changes
Aug 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As far as I can tell CORS cannot work right now 😅
See ory/kratos#3423