Skip to content

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

Merged
merged 1 commit into from
Feb 8, 2021
Merged

fix: Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 #108

merged 1 commit into from
Feb 8, 2021

Conversation

ericb-summit
Copy link

Also removed all unnecessary deltas over master.

Based on previous commits in hydra-integration branch by:

Other squashed commit messages:

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

  • I have read the contributing guidelines
    and signed the CLA.
  • I have read the security policy.
  • I confirm that this pull request does not address a security
    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.
  • I have added tests that prove my fix is effective or that my feature
    works.
  • I have added necessary documentation within the code base (if
    appropriate).

Further comments

We really ought to add some coverage to this.

@ericb-summit ericb-summit changed the title Hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 Jan 29, 2021
@ericb-summit ericb-summit changed the title Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 Fix: Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 Jan 29, 2021
@ericb-summit ericb-summit changed the title Fix: Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 fix: Make hydra integration branch compatible with kratos-0.5.4, hydra-1.8.5 Jan 29, 2021
@vinckr
Copy link
Member

vinckr commented Jan 29, 2021

Beautiful PR :)
I will check it out over the weekend!

@ericb-summit
Copy link
Author

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.

@aeneasr aeneasr changed the base branch from master to hydra-integration February 1, 2021 09:43
@aeneasr aeneasr changed the base branch from hydra-integration to master February 1, 2021 09:46
@aeneasr aeneasr changed the base branch from master to hydra-integration-2021 February 1, 2021 09:47
Copy link
Member

@aeneasr aeneasr left a 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 :)

@ericb-summit
Copy link
Author

@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.

@ericb-summit ericb-summit changed the base branch from hydra-integration-2021 to master February 1, 2021 17:42
Copy link
Member

@aeneasr aeneasr left a 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,
Copy link
Member

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

Copy link
Author

Choose a reason for hiding this comment

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

Agreed

@ericb-summit ericb-summit changed the base branch from master to hydra-integration-2021 February 3, 2021 03:56
@ericb-summit
Copy link
Author

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!

Fair enough. I changed the target branch back to hydra-integration-2021.

@ericb-summit
Copy link
Author

BTW, what framework would we use to add tests to this?

@aeneasr
Copy link
Member

aeneasr commented Feb 5, 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!

@aeneasr
Copy link
Member

aeneasr commented Feb 5, 2021

Oh and could you please run npm run format to pass the CI? :)

Copy link
Member

@aeneasr aeneasr left a 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
@ericb-summit
Copy link
Author

Oh and could you please run npm run format to pass the CI? :)

Actually there were changes the format in package.json, that's wht broke CI. I reverted, now it passes.

@aeneasr aeneasr merged commit 3463165 into ory:hydra-integration-2021 Feb 8, 2021
@aeneasr
Copy link
Member

aeneasr commented Feb 8, 2021

🥳

supercairos pushed a commit to supercairos/kratos-selfservice-ui-node that referenced this pull request Feb 14, 2022
…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
supercairos pushed a commit to supercairos/kratos-selfservice-ui-node that referenced this pull request Feb 18, 2022
…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
web-kat added a commit to powerhome/kratos-selfservice-ui-node that referenced this pull request Mar 24, 2022
web-kat added a commit to powerhome/kratos-selfservice-ui-node that referenced this pull request Mar 24, 2022
aeneasr added a commit to ory/kratos that referenced this pull request Oct 26, 2022
peturgeorgievv pushed a commit to senteca/kratos-fork that referenced this pull request Jun 30, 2023
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.

3 participants