-
Notifications
You must be signed in to change notification settings - Fork 269
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
refactor(oidc): Use the GET /auth_metadata
Matrix endpoint
#4673
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4673 +/- ##
==========================================
+ Coverage 85.83% 85.84% +0.01%
==========================================
Files 292 292
Lines 33758 33765 +7
==========================================
+ Hits 28976 28986 +10
+ Misses 4782 4779 -3 ☔ View full report in Codecov by Sentry. |
96ef642
to
224b975
Compare
Necessary to get the new `/auth_metadata` endpoint. Signed-off-by: Kévin Commaille <[email protected]>
The authorization server metadata is now supposed to be fetched directly from the homeserver, so it's not possible to use a custom issuer. Signed-off-by: Kévin Commaille <[email protected]>
This name reflects its purpose better. We also remove one use of it where it cannot happen. Signed-off-by: Kévin Commaille <[email protected]>
This is the method to get the server metadata in the latest draft of MSC2965. We still keep the old behavior as fallback for now because it has wider server support. Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
224b975
to
b116e5b
Compare
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.
Nice, thanks for keeping the old way around. Hopefully we'll be able to remove it relatively quickly.
Could you just get rid of the merge conflict?
Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Done, I also added a tiny commit because I realized that I forgot to remove an unused error variant. |
Rebase failed
I wonder why rebase keeps failing after I merge the main branch. Maybe I should just rebase instead ? |
When a PR is marked as rebase-and-merge when CI passes, it's usually conflicting with merge commits, because a merge commits makes rebase somewhat harder, if not impossible. In this case, switching to squash-and-merge would resolve it; would you like me to press the button, or would you like to rewrite the history so it doesn't include a merge commit? |
Sure, you can squash and merge, thanks! |
This is the method to get the server metadata in the latest draft of MSC2965.
We still keep the old behavior with
GET /auth_issuer
as fallback for now because it has wider server support.There are some pre-main commit cleanups to simplify the main commit. This can be reviewed commit by commit.
The changes were tested with the oidc_cli example on beta.matrix.org.
Closes #4550.