Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Implement MSC3356 to support additional fields in the OpenID user info #10384

Open
wants to merge 37 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f3a6ac5
Add option to include additional fields in the OpenID user info (curr…
jkanefendt Jul 13, 2021
d982fd1
Added changelog entry
jkanefendt Jul 13, 2021
3f88ab2
Fix unhandled KeyError
jkanefendt Jul 27, 2021
9f71e78
Merge branch 'develop' of https://github.com/jkanefendt/synapse into …
jkanefendt Aug 24, 2021
486af13
Merge branch 'develop' into add-openid-userinfo-fields
jkanefendt Sep 10, 2021
92e663c
Accept a user defined set of extra OpenId user info fields instead of…
jkanefendt Sep 10, 2021
f15047e
Fix coding style
jkanefendt Sep 16, 2021
7a62795
Fix coding style
jkanefendt Sep 16, 2021
587bebd
Fix typing warning
jkanefendt Sep 16, 2021
5c34abc
Add unstable prefixes for API field names and constants
jkanefendt Dec 3, 2021
a9b1940
Merge branch 'master' into add-openid-userinfo-fields
jkanefendt Dec 3, 2021
08034e5
Merge branch 'develop' into add-openid-userinfo-fields
jkanefendt Dec 3, 2021
1d2edab
Fixed trailing whitespace
jkanefendt Dec 3, 2021
2582fb0
Fix typing
jkanefendt Dec 3, 2021
12e952a
Include the verbatim power levels event content according to [the lat…
jkanefendt Dec 22, 2021
f938530
Merge branch 'develop' into add-openid-userinfo-fields
jkanefendt Dec 22, 2021
bc1fbb8
Merge branch 'develop' into add-openid-userinfo-fields
jkanefendt Jan 20, 2022
e3b9ade
Merge branch 'master' into add-openid-userinfo-fields
jkanefendt Apr 12, 2022
f6a7ab4
Merge branch 'develop' into add-openid-userinfo-fields
jkanefendt Apr 12, 2022
89691f4
Fix datastore retrieval
jkanefendt Apr 12, 2022
ea34fee
Refactored enumeration OpenIdUserInfoField
jkanefendt Apr 12, 2022
4f0ac8e
Use string interpolation where applicable
jkanefendt Apr 12, 2022
d3c574f
Assert valid type of org.matrix.msc3356.userinfo_fields
jkanefendt Apr 12, 2022
597dd31
Fix type hint
jkanefendt Apr 12, 2022
b429c47
Experimental feature MSC3356 must be explicetely enabled per `experim…
jkanefendt Apr 12, 2022
46bfefe
Merge branch 'develop' of https://github.com/matrix-org/synapse into …
jkanefendt Apr 26, 2022
0cef603
Update changelog.d/10384.misc
jkanefendt Jun 1, 2022
22e673a
Update synapse/storage/databases/main/openid.py
jkanefendt Jun 1, 2022
54c7f16
Merge branch 'develop' into add-openid-userinfo-fields
jkanefendt Jun 1, 2022
29664b1
MSC3356: Only pull the power levels from room state
jkanefendt Jun 1, 2022
f96343d
Add description for OpenIdUserInfoFields constants
jkanefendt Jun 1, 2022
372b9dc
Simplify some things as the list returned by get_user_id_and_userinfo…
jkanefendt Jun 1, 2022
48a9bf1
Add docstring for on_openid_userinfo (synapse.federation.federation_s…
jkanefendt Jun 1, 2022
d7b3ea1
Fix linting
jkanefendt Jun 1, 2022
ed7f4b2
Add docstring for function get_user_id_and_userinfo_fields_for_open_i…
jkanefendt Jun 1, 2022
e145f9b
Add description for schema delta 72/01openid_token_userinfo_fields.sql
jkanefendt Jun 1, 2022
96e7a9c
Add code comment
jkanefendt Jun 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into add-openid-userinfo-fields
  • Loading branch information
jkanefendt committed Dec 3, 2021
commit a9b1940d511c569a2ba1d6b24ade5a01a1b0da37
15 changes: 11 additions & 4 deletions synapse/storage/schema/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# When updating these values, please leave a short summary of the changes below.

SCHEMA_VERSION = 64
SCHEMA_VERSION = 66 # remember to update the list below when updating
"""Represents the expectations made by the codebase about the database schema

This should be incremented whenever the codebase changes its requirements on the
Expand Down Expand Up @@ -42,8 +40,17 @@
https://github.com/matrix-org/synapse/pull/10565

Changes in SCHEMA_VERSION = 64:
- MSC2716: Rename related tables and columns from "chunks" to "batches".

Changes in SCHEMA_VERSION = 65:
- MSC2716: Remove unique event_id constraint from insertion_event_edges
because an insertion event can have multiple edges.
- Remove unused tables `user_stats_historical` and `room_stats_historical`.

Changes in SCHEMA_VERSION = 66:
- Add column `userinfo_fields` to table `open_id_tokens`. The new column is used
to persist the additional open id token fields requested by the user.
to persist the additional open id token fields requested by the user according to
MSC3356.
"""


Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.