diff --git a/.idea/dictionaries/bt.xml b/.idea/dictionaries/bt.xml
index 9f6dca8dc5..50b698c5ca 100644
--- a/.idea/dictionaries/bt.xml
+++ b/.idea/dictionaries/bt.xml
@@ -5,6 +5,7 @@
backfill
cashapp
cheermote
+ crockford
fakeyou
hifigan
scrollback
diff --git a/crates/lib/tokens/src/jobs/inference.rs b/crates/lib/tokens/src/jobs/inference.rs
index 6186ce87b3..e098df07bf 100644
--- a/crates/lib/tokens/src/jobs/inference.rs
+++ b/crates/lib/tokens/src/jobs/inference.rs
@@ -2,4 +2,4 @@
pub struct InferenceToken(String);
impl_string_token!(InferenceToken);
-impl_crockford_generator!(InferenceToken, 32usize, "infj_", false);
+impl_crockford_generator!(InferenceToken, 32usize, "infj_", CrockfordLower);
diff --git a/crates/lib/tokens/src/lib.rs b/crates/lib/tokens/src/lib.rs
index 0a3c5389d7..166909263e 100644
--- a/crates/lib/tokens/src/lib.rs
+++ b/crates/lib/tokens/src/lib.rs
@@ -18,9 +18,16 @@
#![allow(non_snake_case)]
// Crockford characters
+// https://en.wikipedia.org/wiki/Base32#Crockford's_Base32
pub(crate) const CROCKFORD_UPPERCASE_CHARSET: &[u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZ";
-
pub(crate) const CROCKFORD_LOWERCASE_CHARSET: &[u8] = b"0123456789abcdefghjkmnpqrstvwxyz";
+pub(crate) const CROCKFORD_MIXED_CASE_CHARSET: &[u8] = b"0123456789ABCDEFGHJKMNPQRSTVWXYZabcdefghjkmnpqrstvwxyz";
+
+pub(crate) enum TokenCharacterSet {
+ CrockfordUpper,
+ CrockfordLower,
+ CrockfordMixed,
+}
#[macro_use]
mod macros;
diff --git a/crates/lib/tokens/src/macros.rs b/crates/lib/tokens/src/macros.rs
index f9a7f46965..75af54bec2 100644
--- a/crates/lib/tokens/src/macros.rs
+++ b/crates/lib/tokens/src/macros.rs
@@ -30,14 +30,18 @@ macro_rules! impl_string_token {
}
macro_rules! impl_crockford_generator {
- ($t:ident, $total_string_length:literal, $token_prefix:literal, $uppercase:literal) => {
+ ($t:ident, $total_string_length:literal, $token_prefix:literal, $character_case:ident) => {
impl $t {
/// Constructor for a new token.
#[inline]
pub fn generate() -> Self {
use rand::Rng;
- let charset = if $uppercase { crate::CROCKFORD_UPPERCASE_CHARSET } else { crate::CROCKFORD_LOWERCASE_CHARSET };
+ let charset = match crate::TokenCharacterSet::$character_case {
+ crate::TokenCharacterSet::CrockfordUpper => crate::CROCKFORD_UPPERCASE_CHARSET,
+ crate::TokenCharacterSet::CrockfordLower => crate::CROCKFORD_LOWERCASE_CHARSET,
+ crate::TokenCharacterSet::CrockfordMixed => crate::CROCKFORD_MIXED_CASE_CHARSET,
+ };
let mut rng = rand::thread_rng();
diff --git a/crates/lib/tokens/src/users/user.rs b/crates/lib/tokens/src/users/user.rs
index 9fa52275c2..5261ad3b9b 100644
--- a/crates/lib/tokens/src/users/user.rs
+++ b/crates/lib/tokens/src/users/user.rs
@@ -26,7 +26,7 @@ pub struct UserToken(pub String);
// }
impl_string_token!(UserToken);
-impl_crockford_generator!(UserToken, 15usize, "U:", true);
+impl_crockford_generator!(UserToken, 15usize, "U:", CrockfordUpper);
#[cfg(test)]
mod tests {