This repository was archived by the owner on Sep 11, 2024. It is now read-only.
Repository navigation
ToS for ISes/IMs: prompt on use screen - #3199
Merged
Merged
Conversation
jryans
suggested changes
Jul 10, 2019
jryans
left a comment
jryans
left a comment
Collaborator
There was a problem hiding this comment.
Thanks, this seems like good progress! 😁
This doesn't fully fix element-hq/element-web#10088, does it? (I assumed that was the issue I am about to start...) Assuming it does not, please edit the top comment so the PR doesn't auto-close that issue. (Maybe just say "Part of" instead of "Fixes".)
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
dbkr
commented
Jul 10, 2019
dbkr
left a comment
dbkr
left a comment
Member
Author
There was a problem hiding this comment.
Thanks for picking that lot up! Ready for another look I think.
jryans
self-requested a review
July 10, 2019 15:00
jryans
reviewed
Jul 10, 2019
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
jryans
self-requested a review
July 10, 2019 15:09
jryans
approved these changes
Jul 10, 2019
jryans
left a comment
jryans
left a comment
Collaborator
There was a problem hiding this comment.
Thanks for working this! 😁
turt2live
suggested changes
Jul 11, 2019
To remember what policies the user has agreed to
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Also add a test to make sure it does it
jryans
approved these changes
Jul 11, 2019
jryans
left a comment
jryans
left a comment
Collaborator
There was a problem hiding this comment.
Looks great overall, thanks for working on this! 😁
3 tasks done
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
This was referenced Jul 22, 2019
before passing to js-sdk. We continue to use the full URL for the calls done by matrix-react-sdk, but the standard terms API called by the js-sdk lives on the standard _matrix path. This means we don't support running IMs on a non-root path, but it's the only realistic way of transitioning to _matrix paths since configs in the wild contain bits of the API path. Once we've fully transitioned to _matrix URLs, we can give people a grace period to update their configs, then use the rest url as a regular base url.
turt2live
approved these changes
Jul 23, 2019
turt2live
left a comment
turt2live
left a comment
Member
There was a problem hiding this comment.
works great from a Dimension perspective (thank you!). Looking forward to testing this against scalar-staging when that's available :)
jryans
approved these changes
Jul 23, 2019
jryans
left a comment
jryans
left a comment
Collaborator
There was a problem hiding this comment.
New changes look good to me as well! 😁 A small note for future readers, but otherwise looks good to merge!
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
Implements the prompt when a user tries to contact the integration manager and receives M_TERMS_NOT_SIGNED
Implements MSC2140
If an IM refuses to load a widget (inc. sticker picker) with M_TERMS_NOT_SIGNED, this is not handled by this code (the widget will just display the error page).
Also does a little refactoring: ScalarAuthClient's method are now (hopefully) clearer and IntegrationsManager has and the logic pulled out of it and is now stateless (sorry these aren't in a separate PR).
Requires matrix-org/matrix-js-sdk#988
Fixes element-hq/element-web#6802
Fixes element-hq/element-web#10088