mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-31 10:18:19 +02:00 
			
		
		
		
	a little cleanup after SSO merge (#6153)
* fix some typos * rename scss variable to sso_enabled * refactor is_mobile to device * also mask sensitive sso config options
This commit is contained in:
		| @@ -342,11 +342,11 @@ async fn post_set_password(data: Json<SetPasswordData>, headers: Headers, mut co | ||||
|     let mut user = headers.user; | ||||
|  | ||||
|     if user.private_key.is_some() { | ||||
|         err!("Account already intialized cannot set password") | ||||
|         err!("Account already initialized, cannot set password") | ||||
|     } | ||||
|  | ||||
|     // Check against the password hint setting here so if it fails, the user | ||||
|     // can retry without losing their invitation below. | ||||
|     // Check against the password hint setting here so if it fails, | ||||
|     // the user can retry without losing their invitation below. | ||||
|     let password_hint = clean_password_hint(&data.master_password_hint); | ||||
|     enforce_password_hint_setting(&password_hint)?; | ||||
|  | ||||
|   | ||||
| @@ -2310,7 +2310,7 @@ struct OrgImportData { | ||||
|     users: Vec<OrgImportUserData>, | ||||
| } | ||||
|  | ||||
| /// This function seems to be deprected | ||||
| /// This function seems to be deprecated | ||||
| /// It is only used with older directory connectors | ||||
| /// TODO: Cleanup Tech debt | ||||
| #[post("/organizations/<org_id>/import", data = "<data>")] | ||||
|   | ||||
| @@ -641,9 +641,9 @@ async fn stream_to_bytes_limit(res: Response, max_size: usize) -> Result<Bytes, | ||||
|     let mut buf = BytesMut::new(); | ||||
|     let mut size = 0; | ||||
|     while let Some(chunk) = stream.next().await { | ||||
|         // It is possible that there might occure UnexpectedEof errors or others | ||||
|         // It is possible that there might occur UnexpectedEof errors or others | ||||
|         // This is most of the time no issue, and if there is no chunked data anymore or at all parsing the HTML will not happen anyway. | ||||
|         // Therfore if chunk is an err, just break and continue with the data be have received. | ||||
|         // Therefore if chunk is an err, just break and continue with the data be have received. | ||||
|         if chunk.is_err() { | ||||
|             break; | ||||
|         } | ||||
|   | ||||
| @@ -293,7 +293,7 @@ async fn _sso_login( | ||||
|         } | ||||
|     }; | ||||
|  | ||||
|     // We passed 2FA get full user informations | ||||
|     // We passed 2FA get full user information | ||||
|     let auth_user = sso::redeem(&user_infos.state, conn).await?; | ||||
|  | ||||
|     if sso_user.is_none() { | ||||
| @@ -1060,12 +1060,12 @@ async fn oidcsignin_redirect( | ||||
|     wrapper: impl FnOnce(OIDCState) -> sso::OIDCCodeWrapper, | ||||
|     conn: &DbConn, | ||||
| ) -> ApiResult<Redirect> { | ||||
|     let state = sso::deocde_state(base64_state)?; | ||||
|     let state = sso::decode_state(base64_state)?; | ||||
|     let code = sso::encode_code_claims(wrapper(state.clone())); | ||||
|  | ||||
|     let nonce = match SsoNonce::find(&state, conn).await { | ||||
|         Some(n) => n, | ||||
|         None => err!(format!("Failed to retrive redirect_uri with {state}")), | ||||
|         None => err!(format!("Failed to retrieve redirect_uri with {state}")), | ||||
|     }; | ||||
|  | ||||
|     let mut url = match url::Url::parse(&nonce.redirect_uri) { | ||||
|   | ||||
| @@ -61,7 +61,7 @@ fn vaultwarden_css() -> Cached<Css<String>> { | ||||
|         "mail_enabled": CONFIG.mail_enabled(), | ||||
|         "sends_allowed": CONFIG.sends_allowed(), | ||||
|         "signup_disabled": CONFIG.is_signup_disabled(), | ||||
|         "sso_disabled": !CONFIG.sso_enabled(), | ||||
|         "sso_enabled": CONFIG.sso_enabled(), | ||||
|         "sso_only": CONFIG.sso_enabled() && CONFIG.sso_only(), | ||||
|         "yubico_enabled": CONFIG._enable_yubico() && CONFIG.yubico_client_id().is_some() && CONFIG.yubico_secret_key().is_some(), | ||||
|     }); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user