Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

2e7fad87

Commit 2e7fad87 authored 5 years ago by Brendan Abolivier

Downloads
- Plain Diff

Merge branch 'anoabolivier/sso-confirm' into 'release-v1.11.1'

Add a confirmation step to the SSO login flow

See merge request new-vector/synapse!2

parents 38012286 b2bd54a2

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

docs/sample_config.yaml 34 additions, 0 deletions

docs/sample_config.yaml
synapse/config/_base.pyi 2 additions, 0 deletions

synapse/config/_base.pyi
synapse/config/homeserver.py 2 additions, 0 deletions

synapse/config/homeserver.py
synapse/config/sso.py 74 additions, 0 deletions

synapse/config/sso.py
synapse/res/templates/sso_redirect_confirm.html 14 additions, 0 deletions

synapse/res/templates/sso_redirect_confirm.html
synapse/rest/client/v1/login.py 34 additions, 6 deletions

synapse/rest/client/v1/login.py
tests/rest/client/v1/test_login.py 85 additions, 0 deletions

tests/rest/client/v1/test_login.py

with 245 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment