feat: parse user-agent device info #402
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 7 commits
November 7, 2023 10:29
blazej-teonite
changed the title
moubctez
reviewed
Nov 13, 2023
src/headers.rs
Outdated
| } | ||
|
|
||
| pub fn get_device_type(user_agent_client: Option<Client>) -> String { | ||
| let mut device_type = "".to_string(); |
There was a problem hiding this comment.
Suggested change
| let mut device_type = "".to_string(); | |
| let mut device_type = String::new(); |
moubctez
reviewed
Nov 13, 2023
src/headers.rs
Outdated
| context | ||
| } | ||
|
|
||
| pub fn get_user_agent_device(user_agent_client: Client) -> String { |
There was a problem hiding this comment.
Suggested change
| pub fn get_user_agent_device(user_agent_client: Client) -> String { | |
| pub fn get_user_agent_device(user_agent_client: &Client) -> String { |
moubctez
reviewed
Nov 13, 2023
src/headers.rs
Outdated
| let mut context = Context::new(); | ||
|
|
||
| if let Some(client) = user_agent_client { | ||
| let device_type = get_user_agent_device(client.clone()); |
There was a problem hiding this comment.
Suggested change
| let device_type = get_user_agent_device(client.clone()); | |
| let device_type = get_user_agent_device(&client); |
moubctez
reviewed
Nov 13, 2023
src/headers.rs
Outdated
| } | ||
|
|
||
| pub fn get_user_agent_device(user_agent_client: Client) -> String { | ||
| let device_type = match user_agent_client.device.model { |
There was a problem hiding this comment.
Suggested change
| let device_type = match user_agent_client.device.model { | |
| let device_type = user_agent_client.device.model.unwrap_or("unknown model"); |
moubctez
reviewed
Nov 13, 2023
src/headers.rs
Outdated
| None => "".to_string(), | ||
| }; | ||
|
|
||
| let device_os_major = match user_agent_client.os.major { |
There was a problem hiding this comment.
Suggested change
| let device_os_major = match user_agent_client.os.major { | |
| let device_version = String::new(); | |
| if let Some(major) = user_agent_client.os.major { | |
| device_version.push(major); | |
| if let Some(minor) = user_agent_client.os.minor { | |
| device_version.push('.'); | |
| device_version.push(minor); | |
| if let Some(patch) = user_agent_client.os.patch { | |
| device_version.push('.'); | |
| device_version.push(patch); | |
| } | |
| } | |
| } |
moubctez
reviewed
Nov 13, 2023
src/templates.rs
Outdated
| ) -> Result<String, TemplateError> { | ||
| let (mut tera, mut context) = get_base_tera(None)?; | ||
| context.insert("device_name", device_name); | ||
| context.insert("public_key", public_key); | ||
| context.insert("locations", template_locations); | ||
|
|
||
| if device_type.is_some() { |
There was a problem hiding this comment.
Nie powinno być if let Some(device_type) = device_type {?
moubctez
reviewed
Nov 13, 2023
moubctez
reviewed
Nov 13, 2023
Cargo.toml
Outdated
| @@ -81,6 +81,7 @@ webauthn-rs = { version = "0.4", features = [ | |||
| ] } | |||
| webauthn-rs-proto = "0.4" | |||
| x25519-dalek = { version = "2.0", features = ["static_secrets"] } | |||
| uaparser = "0.6.1" | |||
There was a problem hiding this comment.
Suggested change
| uaparser = "0.6.1" | |
| uaparser = "0.6" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.