matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-08-06 06:02:40 +03:00
Code Activity

Stop generating the device ID automatically (#285)

Browse Source
This commit is contained in:
Quentin Gliech
2022-07-21 10:34:55 -05:00
committed by GitHub
parent fa1f71452c
commit a263330ea5
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/handlers/src/oauth2/authorization/mod.rs
View File

@@ -21,7 +21,7 @@ use axum_extra::extract::PrivateCookieJar;
use hyper::StatusCode; use hyper::StatusCode;
use mas_axum_utils::SessionInfoExt; use mas_axum_utils::SessionInfoExt;
use mas_config::Encrypter; use mas_config::Encrypter;
use mas_data_model::{AuthorizationCode, Device, Pkce}; use mas_data_model::{AuthorizationCode, Pkce};
use mas_iana::oauth::OAuthAuthorizationEndpointResponseType; use mas_iana::oauth::OAuthAuthorizationEndpointResponseType;
use mas_router::{PostAuthAction, Route}; use mas_router::{PostAuthAction, Route};
use mas_storage::oauth2::{ use mas_storage::oauth2::{
@@ -250,23 +250,13 @@ pub(crate) async fn get(
None None
}; };
// Generate the device ID
let device = Device::generate(&mut thread_rng());
let device_scope = device.to_scope_token();
let scope = {
let mut s = params.auth.scope.clone();
s.insert(device_scope);
s
};
let requires_consent = params.auth.prompt == Some(Prompt::Consent); let requires_consent = params.auth.prompt == Some(Prompt::Consent);
let grant = new_authorization_grant( let grant = new_authorization_grant(
&mut txn, &mut txn,
client, client,
redirect_uri.clone(), redirect_uri.clone(),
scope, params.auth.scope,
code, code,
params.auth.state.clone(), params.auth.state.clone(),
params.auth.nonce, params.auth.nonce,