-
-
Notifications
You must be signed in to change notification settings - Fork 117
Spec terms of service at registration (MSC1692) #1812
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
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
55f7657
Improve comments in `render-object-table`
richvdh 6f403f5
Pass `additionalProperties` and `patternProperties` into `render-obje…
richvdh 6aabf11
Include `additionalProperties` data in object tables
richvdh b020b1d
changelog
richvdh f2ebb40
Address review comments
richvdh 5181a26
Merge branch 'rav/additional_properties'
richvdh c0dc863
Remove spurious indentation of HTTP headers
richvdh 7d17e07
Define `m.login.terms` authentication
richvdh c118d7d
Changelog
richvdh 90c5e30
minor edits
richvdh cffcea0
Merge remote-tracking branch 'origin/main' into rav/registration_terms
richvdh 1654236
Apply suggestions from code review
richvdh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Specify terms of services at registration, as per [MSC1692](https://github.com/matrix-org/matrix-spec-proposals/pull/1692). |
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
82 changes: 82 additions & 0 deletions
82
data/api/client-server/definitions/m.login.terms_params.yaml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
# Copyright 2024 The Matrix.org Foundation C.I.C. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
type: object | ||
title: m.login.terms params | ||
description: Schema for `m.login.terms` entry in the `params` object in a User-Interactive Authentication response. | ||
required: ['policies'] | ||
properties: | ||
policies: | ||
type: object | ||
description: | | ||
A map from "Policy ID" to the current definition of this policy document. The Policy ID is a unique | ||
identifier for a given policy document, using the [Opaque Identifier Grammar](/appendices/#opaque-identifiers). | ||
additionalProperties: | ||
type: object | ||
title: Policy Definition | ||
required: [version] | ||
properties: | ||
version: | ||
type: string | ||
description: | | ||
The version of this policy document. This is provided as a convenience for the client, | ||
and uses the [Opaque Identifier Grammar](/appendices/#opaque-identifiers). | ||
additionalProperties: | ||
type: object | ||
title: Policy Translation | ||
required: [name, url] | ||
description: | | ||
Map from language codes to details of the document in that language. | ||
Language codes SHOULD be formatted as per [Section 2.2 of RFC | ||
5646](https://datatracker.ietf.org/doc/html/rfc5646#section-2.2), | ||
though some implementations may use an underscore instead of dash | ||
(for example, `en_US` instead of `en-US`). | ||
properties: | ||
name: | ||
type: string | ||
description: | | ||
The name of this document, in the appropriate language. An | ||
arbitrary string with no specified maximum length. | ||
url: | ||
type: string | ||
description: | | ||
A link to the text of this document, in the appropriate | ||
language. MUST be a valid URI with scheme `https://` or | ||
`http://`. Insecure HTTP is discouraged. | ||
example: { | ||
"policies": { | ||
"terms_of_service": { | ||
"version": "1.2", | ||
"en": { | ||
"name": "Terms of Service", | ||
"url": "https://example.org/somewhere/terms-1.2-en.html" | ||
}, | ||
"fr": { | ||
"name": "Conditions d'utilisation", | ||
"url": "https://example.org/somewhere/terms-1.2-fr.html" | ||
} | ||
}, | ||
"privacy_policy": { | ||
"version": "1.2", | ||
"en": { | ||
"name": "Privacy Policy", | ||
"url": "https://example.org/somewhere/privacy-1.2-en.html" | ||
}, | ||
"fr": { | ||
"name": "Politique de confidentialité", | ||
"url": "https://example.org/somewhere/privacy-1.2-fr.html" | ||
} | ||
} | ||
} | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.