From a263330ea5ff61ee33b957717885aa3b471c244f Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Thu, 21 Jul 2022 10:34:55 -0500 Subject: [PATCH] Stop generating the device ID automatically (#285) --- crates/handlers/src/oauth2/authorization/mod.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/crates/handlers/src/oauth2/authorization/mod.rs b/crates/handlers/src/oauth2/authorization/mod.rs index e6b72b3f..a6dda439 100644 --- a/crates/handlers/src/oauth2/authorization/mod.rs +++ b/crates/handlers/src/oauth2/authorization/mod.rs @@ -21,7 +21,7 @@ use axum_extra::extract::PrivateCookieJar; use hyper::StatusCode; use mas_axum_utils::SessionInfoExt; use mas_config::Encrypter; -use mas_data_model::{AuthorizationCode, Device, Pkce}; +use mas_data_model::{AuthorizationCode, Pkce}; use mas_iana::oauth::OAuthAuthorizationEndpointResponseType; use mas_router::{PostAuthAction, Route}; use mas_storage::oauth2::{ @@ -250,23 +250,13 @@ pub(crate) async fn get( 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 grant = new_authorization_grant( &mut txn, client, redirect_uri.clone(), - scope, + params.auth.scope, code, params.auth.state.clone(), params.auth.nonce,