Skip to content

feat(sdk): Add support for the stable m.oauth UIAA type#5917

Merged
poljar merged 1 commit into
matrix-org:mainfrom
zecakeh:oauth-uiaa-stable
Dec 5, 2025
Merged

feat(sdk): Add support for the stable m.oauth UIAA type#5917
poljar merged 1 commit into
matrix-org:mainfrom
zecakeh:oauth-uiaa-stable

Conversation

@zecakeh

@zecakeh zecakeh commented Dec 2, 2025

Copy link
Copy Markdown
Collaborator

By replacing the custom implementation with the one in Ruma.

It landed recently in the spec: matrix-org/matrix-spec#2234.

By replacing the custom implementation with the one in Ruma.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh zecakeh requested a review from a team as a code owner December 2, 2025 13:08
@zecakeh zecakeh requested review from poljar and removed request for a team December 2, 2025 13:08
@codspeed-hq

codspeed-hq Bot commented Dec 2, 2025

Copy link
Copy Markdown

CodSpeed Performance Report

Merging #5917 will not alter performance

Comparing zecakeh:oauth-uiaa-stable (08db260) with main (19b7036)

Summary

✅ 50 untouched

Comment thread Cargo.toml
reqwest = { version = "0.12.24", default-features = false }
rmp-serde = "1.3.0"
ruma = { version = "0.14.0", features = [
ruma = { git = "https://github.com/ruma/ruma", rev = "a67081e402dce14365089b34f50489dacc9c53b5", features = [

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We still didn't get the release out because of #5923. So this will need to wait for a bit.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

How long will it take? Because we could do a "patch" release of ruma if necessary.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It should happen this week, I still need to write a small patch before we can release though.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Okay, let's wait then.

@jmartinesp

Copy link
Copy Markdown
Contributor

AFAICT this worked fine when tested on Element X Android, although I'm not sure I tested the right thing. Is logging using OIDC enought?

@zecakeh

zecakeh commented Dec 4, 2025

Copy link
Copy Markdown
Collaborator Author

To test this code you need to reset the cross-signing keys. In the bindings it is exposed as Encryption::reset_identity() I believe.

@jmartinesp

Copy link
Copy Markdown
Contributor

Ok, I re-tested this by resetting the identity in one of my test accounts and it seemed to work fine.

@poljar poljar left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks, looks good.

@poljar poljar enabled auto-merge (rebase) December 5, 2025 08:20
@poljar poljar disabled auto-merge December 5, 2025 08:20
@poljar poljar merged commit b0574c1 into matrix-org:main Dec 5, 2025
52 checks passed
@codecov

codecov Bot commented Dec 8, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 88.23529% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.65%. Comparing base (19b7036) to head (08db260).
⚠️ Report is 46 commits behind head on main.
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
crates/matrix-sdk/src/encryption/mod.rs 60.00% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5917      +/-   ##
==========================================
- Coverage   88.65%   88.65%   -0.01%     
==========================================
  Files         363      363              
  Lines      104691   104701      +10     
  Branches   104691   104701      +10     
==========================================
+ Hits        92817    92818       +1     
- Misses       7519     7526       +7     
- Partials     4355     4357       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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