Commit aa719c5d67a730198271016d5c3bd799079b555f
2023-01-12T14:09:37
Simplify parameter handling in URL generation, fix invalid step in tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
diff --git a/src/lib.rs b/src/lib.rs
index b80ee32..4c2812b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -621,22 +621,21 @@ impl TOTP {
if self.algorithm == Algorithm::Steam {
host = "steam";
}
- let account_name: String = urlencoding::encode(self.account_name.as_str()).to_string();
- let mut label: String = format!("{}?", account_name);
- if self.issuer.is_some() {
- let issuer: String =
- urlencoding::encode(self.issuer.as_ref().unwrap().as_str()).to_string();
- label = format!("{0}:{1}?issuer={0}&", issuer, account_name);
- }
+ let account_name = urlencoding::encode(self.account_name.as_str()).to_string();
+ let mut params = vec![
+ format!("secret={}", self.get_secret_base32()),
+ format!("digits={}", self.digits),
+ format!("algorithm={}", self.algorithm),
+ ];
+ let label = if self.issuer.is_some() {
+ let issuer = urlencoding::encode(self.issuer.as_ref().unwrap().as_str()).to_string();
+ params.push(format!("issuer={}", issuer));
+ format!("{0}:{1}", issuer, account_name)
+ } else {
+ account_name
+ };
- format!(
- "otpauth://{}/{}secret={}&digits={}&algorithm={}",
- host,
- label,
- self.get_secret_base32(),
- self.digits,
- self.algorithm,
- )
+ format!("otpauth://{}/{}?{}", host, label, params.join("&"))
}
#[cfg(feature = "qr")]
@@ -871,7 +870,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
None,
"constantoine@github.com".to_string(),
@@ -888,14 +887,14 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
)
.unwrap();
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA1");
+ assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA1&issuer=Github");
}
#[test]
@@ -905,14 +904,14 @@ mod tests {
Algorithm::SHA256,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
)
.unwrap();
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA256");
+ assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA256&issuer=Github");
}
#[test]
@@ -922,14 +921,14 @@ mod tests {
Algorithm::SHA512,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
)
.unwrap();
let url = totp.get_url();
- assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?issuer=Github&secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA512");
+ assert_eq!(url.as_str(), "otpauth://totp/Github:constantoine%40github.com?secret=KRSXG5CTMVRXEZLUKN2XAZLSKNSWG4TFOQ&digits=6&algorithm=SHA512&issuer=Github");
}
#[test]
@@ -1121,7 +1120,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github".to_string()),
"constantoine@github.com".to_string(),
@@ -1156,7 +1155,7 @@ mod tests {
Algorithm::SHA1,
6,
1,
- 1,
+ 30,
"TestSecretSuperSecret".as_bytes().to_vec(),
Some("Github@".to_string()),
"constantoine@github.com".to_string(),