matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-11-20 12:02:22 +03:00
Code Activity

Tidy up upstream linking templates

Browse Source
This commit is contained in:
Quentin Gliech
2022-11-24 17:00:50 +01:00
parent fcb6190a56
commit 07636dd9e7
12 changed files with 155 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/handlers/src/upstream_oauth2/link.rs
View File

@@ -34,7 +34,10 @@ use mas_storage::{
},
LookupResultExt,
};
use mas_templates::{EmptyContext, TemplateContext, Templates, UpstreamExistingLinkContext};
use mas_templates::{
EmptyContext, TemplateContext, Templates, UpstreamExistingLinkContext, UpstreamRegister,
UpstreamSuggestLink,
};
use serde::Deserialize;
use sqlx::PgPool;
use thiserror::Error;
@@ -174,7 +177,7 @@ pub(crate) async fn get(
(Some(user_session), None) => {
// Session not linked, but user logged in: suggest linking account
let ctx = EmptyContext
let ctx = UpstreamSuggestLink::new(link.id)
.with_session(user_session)
.with_csrf(csrf_token.form_value());
@@ -193,7 +196,7 @@ pub(crate) async fn get(
(None, None) => {
// Session not linked and used not logged in: suggest creating an
// account or logging in an existing user
let ctx = EmptyContext.with_csrf(csrf_token.form_value());
let ctx = UpstreamRegister::new(link.id).with_csrf(csrf_token.form_value());
templates.render_upstream_oauth2_do_register(&ctx).await?
}