appservice: Introduce appservice mode on Client #266
Merged
Conversation
This file contains 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
johannescpk
commented
Jun 10, 2021
|
|
||
| - name: Clippy without default features | ||
| uses: actions-rs/cargo@v1 | ||
| with: | ||
| command: clippy | ||
| # TODO: add `--all-targets` once all warnings in examples are resolved | ||
| args: --workspace --exclude matrix-sdk-appservice --no-default-features --features native-tls -- -D warnings | ||
| args: --no-default-features --features native-tls,warp -- -D warnings |
There was a problem hiding this comment.
warp here is required as otherwise the appservice crate errors on the compile-time webserver feature check
Comment on lines
-482
to
496
| /// Default is only sending authorization if it is required | ||
| #[cfg(any(feature = "require_auth_for_profile_requests", feature = "appservice"))] | ||
| #[cfg_attr(feature = "docs", doc(cfg(any(require_auth_for_profile_requests, appservice))))] | ||
| /// Default is only sending authorization if it is required. | ||
| pub(crate) fn force_auth(mut self) -> Self { |
There was a problem hiding this comment.
Should be OK to do this given it's pub(crate)
Comment on lines
+1378
to
+1382
| let config = if self.appservice_mode { | ||
| Some(self.http_client.request_config.force_auth()) | ||
| } else { | ||
| None | ||
| }; |
There was a problem hiding this comment.
Given that the appservice_mode can only be switched with appservice feature active this should be OK as runtime check
Comment on lines
-128
to
127
| #[cfg(not(feature = "appservice"))] | ||
| let request = self.try_into_http_request(request, session, config).await?; | ||
|
|
||
| #[cfg(feature = "appservice")] | ||
| let request = if !self.request_config.assert_identity { | ||
| self.try_into_http_request(request, session, config).await? | ||
| } else { |
There was a problem hiding this comment.
Given that assert_identity can only be switched with appservice feature active this should be OK as runtime check
poljar
approved these changes
Jun 10, 2021
|
Thanks, merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Follow-up to #265 (comment)
Part of #228
Closes #265