refactor(oidc): Start replacing mas-oidc-client with oauth2#4761
Merged
poljar merged 7 commits intomatrix-org:mainfrom Mar 6, 2025
Merged
refactor(oidc): Start replacing mas-oidc-client with oauth2#4761poljar merged 7 commits intomatrix-org:mainfrom
poljar merged 7 commits intomatrix-org:mainfrom
Conversation
zecakeh
requested review from
poljar and
stefanceriu
and removed request for
a team and
stefanceriu
Avoids to use 2 similar types with the same name. Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4761 +/- ##
=======================================
Coverage 86.26% 86.27%
=======================================
Files 290 291 +1
Lines 34286 34291 +5
=======================================
+ Hits 29578 29585 +7
+ Misses 4708 4706 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
poljar
requested changes
Mar 6, 2025
Contributor
poljar
left a comment
poljar
left a comment
There was a problem hiding this comment.
Looks mostly good, I left a small nit about the documentation.
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
poljar
approved these changes
Mar 6, 2025
Contributor
poljar
left a comment
poljar
left a comment
There was a problem hiding this comment.
Very nice. Thank you very much.
stefanceriu
added a commit
to element-hq/element-x-ios
that referenced
this pull request
Mar 12, 2025
…org/matrix-rust-sdk#4761 ``` /// * `prompt` - The desired user experience in the web UI. No value means /// that the user wishes to login into an existing account, and a value of /// `Create` means that the user wishes to register a new account. ```
stefanceriu
added a commit
to element-hq/element-x-ios
that referenced
this pull request
Mar 13, 2025
* Bump the RustSDK to v25.03.11 * Replace oidc login prompt with nil following the changes from matrix-org/matrix-rust-sdk#4761 ``` /// * `prompt` - The desired user experience in the web UI. No value means /// that the user wishes to login into an existing account, and a value of /// `Create` means that the user wishes to register a new account. ``` * Fix trailing closure warnings * Update the client proxy after making `getNotificationSettings()` and `cachedAvatarUrl()` async (they used to be blocking on the rust side). * Move `Room.isEncrypted` to the info publisher and manually update the encryption state when creating the room. * Bump the SDK again to v25.03.12 - This introduces a new way to configure the tokio runtime that we can use to have extensions use less memory - introduce a new Target struct that takes care of setting up rust services (tracing and tokio) for our various targets - cleanup MXLog and friends * Address PR comments * Bump the SDK again, switch back to using `.consent` as the OIDC login prompt (which was reintroduced in matrix-org/matrix-rust-sdk/pull/4791)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This makes use of the oauth2 crate for the authorization code grant and the refresh token grant.
There is still the token revocation that can use oauth2, but it requires changes in the HTTP client so it will be done separately. And the remaining parts (account management URL, fallback discovery, registration) will need to be included in the SDK to get rid of mas-oidc-client.