Quentin Gliech
e484a810a7
Typos and error message rewording
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-12-01 11:03:04 +01:00
Quentin Gliech
3e65ff54b7
Merge branch 'main' into quenting/upstream-oauth/better-conflict-options
2025-11-28 18:10:22 +01:00
Quentin Gliech
450b1fa24c
Check for the new on_conflict options & update docs
2025-11-28 16:10:07 +01:00
Quentin Gliech
ef563f33c6
Allow linking upstream accounts to matching users without confirmation ( #5293 )
2025-11-28 14:43:42 +01:00
Quentin Gliech
bdffeb6ef5
Document the new conflict options
2025-11-28 11:57:46 +01:00
Quentin Gliech
868a50030a
Add tests for the new on_conflict options
2025-11-28 11:55:34 +01:00
Quentin Gliech
f97f56ed11
Add more options to deal with localpart conflicts on upstream OAuth 2.0 logins
2025-11-28 10:53:28 +01:00
Quentin Gliech
b634632314
Add Shibboleth sample configuration to SSO documentation ( #5294 )
2025-11-27 18:02:28 +01:00
copilot-swe-agent[bot]
6d7fa77bdb
Add complete Shibboleth metadata file example
...
Co-authored-by: sandhose <1549952+sandhose@users.noreply.github.com >
2025-11-27 16:48:00 +00:00
Quentin Gliech
5e1100d22f
Apply suggestions from code review
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-11-27 17:23:10 +01:00
copilot-swe-agent[bot]
e2ed843429
Remove deprecated set_email_verification option from docs
...
Co-authored-by: sandhose <1549952+sandhose@users.noreply.github.com >
2025-11-27 15:47:37 +00:00
Olivier 'reivilibre
65e46a2fc2
Fix documentation of --usage-limit and --unlimited parameters on issue-user-registration-token command. ( #5285 )
2025-11-27 15:47:16 +00:00
copilot-swe-agent[bot]
4053c34a93
Remove unnecessary userinfo_endpoint from Shibboleth config
...
Co-authored-by: sandhose <1549952+sandhose@users.noreply.github.com >
2025-11-27 15:38:21 +00:00
copilot-swe-agent[bot]
197815ae7a
Add Shibboleth sample configuration to SSO documentation
...
Co-authored-by: sandhose <1549952+sandhose@users.noreply.github.com >
2025-11-27 15:31:20 +00:00
copilot-swe-agent[bot]
ea6d11adba
Initial plan
2025-11-27 15:26:55 +00:00
Quentin Gliech
e90f11b8f8
Remove unused login_link.html template
2025-11-27 16:18:18 +01:00
Quentin Gliech
8b2addbe0e
Allow linking upstream accounts to matching users without confirmation
...
This reworks the link flow to handle many edge cases better. One major
functionality change is that when we had a new upstream account with no
user linked, but the localpart matching an existing user, if
`on_conflict` was set to `add`, we prompt the user to link the existing
account. This prompt is now skipped and the user is linked automatically.
2025-11-27 16:18:17 +01:00
Quentin Gliech
aeaf63b001
Unify registrations for local passwords and upstream OAuth registrations ( #5281 )
2025-11-27 16:13:03 +01:00
Quentin Gliech
7b653ce04e
Fix test name
2025-11-27 16:05:13 +01:00
Quentin Gliech
bd3173baa1
Create the new index CONCURRENTLY
2025-11-27 16:04:23 +01:00
Olivier 'reivilibre
07febe3ca6
Modify example Nginx compatibility-layer location block to also forward /_synapse/mas to Synapse ( #5240 )
2025-11-27 12:32:26 +00:00
Olivier 'reivilibre
3fcbbfe567
Update docs/setup/reverse-proxy.md
2025-11-27 12:31:48 +00:00
matrixbot
a6a9d468fc
Automatic merge back to main ( #5290 )
2025-11-26 20:13:37 +01:00
github-actions[bot]
150df576f3
1.7.0
2025-11-26 19:06:26 +00:00
matrixbot
5093855abe
Translations updates for v1.7 ( #5289 )
2025-11-26 20:04:57 +01:00
github-actions[bot]
189329b40d
Translations updates
2025-11-26 18:57:50 +00:00
Olivier 'reivilibre
1d2f7fecf8
Add experimental and preliminary policy-driven session limiting when logging in OAuth 2 sessions. ( #5221 )
2025-11-25 15:24:02 +00:00
Olivier 'reivilibre
281f50b118
cli docs: Fix --usage-limit and --unlimited
2025-11-25 12:05:32 +00:00
reivilibre
96b596fa0c
templates check: Add --stabilise flag to make renders reproducible ( #5214 )
2025-11-24 16:16:11 +00:00
Quentin Gliech
43d4c8af53
Fix typo in error message
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-11-24 17:00:05 +01:00
Quentin Gliech
45159e03e9
Create user registrations for upstream OAuth registrations
2025-11-24 16:52:09 +01:00
Quentin Gliech
e50664a711
Associate the upstream link with the new user if present on the
...
registration
2025-11-21 19:37:05 +01:00
Quentin Gliech
5a9fbcb98e
Don't error out if there is no email associated to the registration
...
In case an email is required for password auth, we create a user
authentication which we force the user to complete. We used to
double-check that the email is required before completing the
registration, which was only really useful when the config flipped from
not being required to being required, in the 1h window in which running
registrations were still valid. We think this is a fine trade-off.
2025-11-21 19:36:04 +01:00
Quentin Gliech
c9b89c2f8d
Store upstream OAuth sessions on user registrations
...
This will allow us creating user registrations from upstream OAuth auth
sessions
2025-11-21 19:31:37 +01:00
Quentin Gliech
ad9f04c8ba
Allow completing user email authentications using an upstream session
...
This will let us push emails in user registrations using an upstream
session
2025-11-21 19:28:26 +01:00
Quentin Gliech
5664238a73
build(deps): bump the i18next group in /frontend with 2 updates ( #5273 )
2025-11-21 14:09:33 +01:00
Quentin Gliech
619aa79310
build(deps-dev): bump vite from 7.2.2 to 7.2.4 in /frontend in the vite group ( #5272 )
2025-11-21 14:09:05 +01:00
dependabot[bot]
3096dbc80b
build(deps): bump the i18next group in /frontend with 2 updates
...
Bumps the i18next group in /frontend with 2 updates: [react-i18next](https://github.com/i18next/react-i18next ) and [i18next-cli](https://github.com/i18next/i18next-cli ).
Updates `react-i18next` from 16.3.4 to 16.3.5
- [Changelog](https://github.com/i18next/react-i18next/blob/master/CHANGELOG.md )
- [Commits](https://github.com/i18next/react-i18next/compare/v16.3.4...v16.3.5 )
Updates `i18next-cli` from 1.24.17 to 1.24.20
- [Changelog](https://github.com/i18next/i18next-cli/blob/main/CHANGELOG.md )
- [Commits](https://github.com/i18next/i18next-cli/compare/v1.24.17...v1.24.20 )
---
updated-dependencies:
- dependency-name: react-i18next
dependency-version: 16.3.5
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: i18next
- dependency-name: i18next-cli
dependency-version: 1.24.20
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: i18next
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-11-20 13:12:58 +00:00
dependabot[bot]
aa6d24cd0d
build(deps-dev): bump vite in /frontend in the vite group
...
Bumps the vite group in /frontend with 1 update: [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite ).
Updates `vite` from 7.2.2 to 7.2.4
- [Release notes](https://github.com/vitejs/vite/releases )
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md )
- [Commits](https://github.com/vitejs/vite/commits/v7.2.4/packages/vite )
---
updated-dependencies:
- dependency-name: vite
dependency-version: 7.2.4
dependency-type: direct:development
update-type: version-update:semver-patch
dependency-group: vite
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-11-20 13:12:42 +00:00
matrixbot
23c31d0e43
Automatic merge back to main ( #5270 )
2025-11-19 16:24:25 +01:00
github-actions[bot]
95daa435c2
1.7.0-rc.0
2025-11-19 15:17:03 +00:00
matrixbot
ac21cb8f36
Translations updates for main ( #5269 )
2025-11-19 16:11:30 +01:00
github-actions[bot]
8420fc7fe1
Translations updates
2025-11-19 15:04:18 +00:00
Andrew Morgan
d03e9789ad
Minor grammatical fix ( #5268 )
2025-11-19 14:54:58 +00:00
Andrew Morgan
d2c76bc546
Minor grammatical fix
2025-11-19 14:47:04 +00:00
Quentin Gliech
e16ace45ad
build(deps): bump @vector-im/compound-design-tokens from 6.0.0 to 6.4.0 in /frontend ( #5264 )
2025-11-19 14:45:13 +01:00
Quentin Gliech
0c38fe0678
Merge branch 'main' into dependabot/npm_and_yarn/frontend/vector-im/compound-design-tokens-6.4.0
2025-11-19 14:38:00 +01:00
Quentin Gliech
d76212615f
build(deps): bump @vector-im/compound-web from 8.2.4 to 8.2.5 in /frontend ( #5265 )
2025-11-19 14:28:21 +01:00
Quentin Gliech
159ae98616
build(deps): bump hyper-util from 0.1.17 to 0.1.18 ( #5266 )
2025-11-19 14:28:08 +01:00
Quentin Gliech
fb8d7671d2
build(deps-dev): bump the types group in /frontend with 3 updates ( #5263 )
2025-11-19 14:27:30 +01:00