Skip to content

oidc: Use the correct types to compare the status codes in the oidc example #3363

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 4 commits into from
Apr 30, 2024

Conversation

poljar
Copy link
Contributor

@poljar poljar commented Apr 30, 2024

Something went wrong while #3305 was merged. This fixes the issue introduced by the github rebase.

@poljar poljar requested a review from a team as a code owner April 30, 2024 10:53
@poljar poljar requested review from Hywan and removed request for a team April 30, 2024 10:53
Copy link

codecov bot commented Apr 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.48%. Comparing base (856dd01) to head (f79aaed).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3363   +/-   ##
=======================================
  Coverage   83.48%   83.48%           
=======================================
  Files         243      243           
  Lines       25052    25052           
=======================================
  Hits        20914    20914           
  Misses       4138     4138           

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

@poljar poljar requested review from bnjbvr and removed request for Hywan April 30, 2024 11:06
@zecakeh
Copy link
Collaborator

zecakeh commented Apr 30, 2024

I believe this should not be necessary if #3362 is merged.

@zecakeh
Copy link
Collaborator

zecakeh commented Apr 30, 2024

Actually, we could fully qualify StatusCode in this case with matrix_sdk::reqwest::StatusCode.

@poljar
Copy link
Contributor Author

poljar commented Apr 30, 2024

I believe this should not be necessary if #3362 is merged.

Hah yeah, though I think it makes sense to fix the bodged merge of #3305 with the smallest possible patch.

@poljar
Copy link
Contributor Author

poljar commented Apr 30, 2024

Actually, we could fully qualify StatusCode in this case with matrix_sdk::reqwest::StatusCode.

You mean post merge or in this PR?

@zecakeh
Copy link
Collaborator

zecakeh commented Apr 30, 2024

You mean post merge or in this PR?

In this PR, that should work at any time.

Actually the best option would probably be to not depend directly on http, but use axum::http types for interactions with axum types, and matrix::reqwest types for interacting with the SDK's types.

@poljar
Copy link
Contributor Author

poljar commented Apr 30, 2024

You mean post merge or in this PR?

In this PR, that should work at any time.

Actually the best option would probably be to not depend directly on http, but use axum::http types for interactions with axum types, and matrix::reqwest types for interacting with the SDK's types.

Right: 344c77b

@poljar poljar force-pushed the poljar/fix-oidc-merge branch from 344c77b to ed8c7f1 Compare April 30, 2024 12:10
@poljar poljar enabled auto-merge (rebase) April 30, 2024 12:10
@poljar poljar disabled auto-merge April 30, 2024 12:13
@poljar poljar changed the title oidc: Compare status codes as an u16 until the HTTP transition finishes oidc: Use the correct types to compare the status codes in the oidc example Apr 30, 2024
@poljar poljar enabled auto-merge (squash) April 30, 2024 12:35
@poljar poljar merged commit fb9982f into main Apr 30, 2024
35 checks passed
@poljar poljar deleted the poljar/fix-oidc-merge branch April 30, 2024 13:02
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