-
-
Notifications
You must be signed in to change notification settings - Fork 218
fix: Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 #108
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: Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 #108
Conversation
Beautiful PR :) |
Cool. FYI, circleci fails because the base (master) is not prettied. I don't think it a good idea to add unrelated stuff to this PR. |
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.
Awesome, thank you for your contribution! This looks pretty good and I have some ideas how to improve it further :)
@aeneasr updated per your comments. Given these changes have no impact on how the project works if not integrated with hydra, can I suggest that we merge this to master? This way, as the kratos/hydra APIs are updated, the hydra.ts code will at a minimum compile. |
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.
Given these changes have no impact on how the project works if not integrated with hydra, can I suggest that we merge this to master?
This way, as the kratos/hydra APIs are updated, the hydra.ts code will at a minimum compile.
First of all, thank you for your effort! The reason I am reluctant to merge this into master is that we did not properly audit it and that there are no e2e tests. Otherwise I would be completely open to adopt it in the master branch!
src/config.ts
Outdated
@@ -31,6 +38,8 @@ export default { | |||
SECURITY_MODE_JWT, | |||
SECURITY_MODE_STANDALONE, | |||
|
|||
cookieSecret: process.env.COOKIE_SECRET || cookieSecret, |
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.
I would move this key under hydra
and also prefix it HYDRA_COOKIE_SECRET
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.
Agreed
Fair enough. I changed the target branch back to hydra-integration-2021. |
BTW, what framework would we use to add tests to this? |
Basically we check out the repo in ory kratos and start it up together with some databases and kratos itself, and then run cypress tests: https://github.com/ory/kratos/tree/master/test/e2e I will now look over your changes! |
Oh and could you please run |
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.
Awesome 🎉
Thank you for your contribution! (everthing except format looks good!)
…a-1.8.5 Also removed all unnecessary deltas over master. Based on previous commits in hydra-integration branch by: - Kim Neunert <[email protected]> - Jeremy Bogle <[email protected]> - hackerman <[email protected]> - Alexander Konotop <[email protected]> Other squashed commit messages: - preliminary ORY Hydra integration (#50) - fix: redirect issues for hydra integration in domain (not port) based env (#68) See #67
Actually there were changes the format in |
🥳 |
…a-1.10.6 (ory#108) Also removed all unnecessary deltas over master. Based on previous commits in hydra-integration branch by: - Kim Neunert <[email protected]> - Jeremy Bogle <[email protected]> - hackerman <[email protected]> - Alexander Konotop <[email protected]> Other squashed commit messages: - preliminary ORY Hydra integration (ory#50) - fix: redirect issues for hydra integration in domain (not port) based env (ory#68) See ory#67
…a-1.10.6 (ory#108) Also removed all unnecessary deltas over master. Based on previous commits in hydra-integration branch by: - Kim Neunert <[email protected]> - Jeremy Bogle <[email protected]> - hackerman <[email protected]> - Alexander Konotop <[email protected]> Other squashed commit messages: - preliminary ORY Hydra integration (ory#50) - fix: redirect issues for hydra integration in domain (not port) based env (ory#68) See ory#67
This feature allows Ory Kratos to act as a login provider for Ory Hydra using the `oauth2_provider.url` configuration value. Closes #273 Closes #2293 See ory/kratos-selfservice-ui-node#50 See ory/kratos-selfservice-ui-node#68 See ory/kratos-selfservice-ui-node#108 See ory/kratos-selfservice-ui-node#111 See ory/kratos-selfservice-ui-node#149 See ory/kratos-selfservice-ui-node#170 See ory/kratos-selfservice-ui-node#198 See ory/kratos-selfservice-ui-node#207
This feature allows Ory Kratos to act as a login provider for Ory Hydra using the `oauth2_provider.url` configuration value. Closes ory#273 Closes ory#2293 See ory/kratos-selfservice-ui-node#50 See ory/kratos-selfservice-ui-node#68 See ory/kratos-selfservice-ui-node#108 See ory/kratos-selfservice-ui-node#111 See ory/kratos-selfservice-ui-node#149 See ory/kratos-selfservice-ui-node#170 See ory/kratos-selfservice-ui-node#198 See ory/kratos-selfservice-ui-node#207
Also removed all unnecessary deltas over master.
Based on previous commits in hydra-integration branch by:
Other squashed commit messages:
See Redirects and wrong headers in hydra integration branch #67
Related issue
Sending PR as discussed with @vinckr on slack
Proposed changes
This PR makes the hydra-integration branch work with recent version components, kratos-0.5.4, hydra-1.8.5
Other irrelevant changes of hydra-integration over master (formatting, coded moved around, console vs logger) were removed, so next person doing a rebase can do so more easily.
Affected code is formatted using
npm run format
, unaffected code is not.npm test
seems fine, not aware of any other tests. Known issue of the hydra_integration branch, works on firefox, not on chrome (I may tackle that later); that issue persists.Checklist
and signed the CLA.
vulnerability. If this pull request addresses a security vulnerability, I
confirm that I got green light (please contact
[email protected]) from the maintainers to push
the changes.
works.
appropriate).
Further comments
We really ought to add some coverage to this.