Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Centralize random ID generation

Manav Rathia83abcd6ff3c
diff --git a/rust/crates/cast/src/lib.rs b/rust/crates/cast/src/lib.rs
index 817129590f..ff42f09af8 100644
--- a/rust/crates/cast/src/lib.rs
+++ b/rust/crates/cast/src/lib.rs
@@ -1,5 +1,5 @@
-use ente_core::b64;
use ente_core::crypto::{self, PublicKey, SecretKey};
+use ente_core::{b64, id};
use serde::{Deserialize, Serialize};
use thiserror::Error;
@@ -60,10 +60,7 @@ pub fn prepare_payload(
collection_id: i64,
collection_key: &str,
) -> Result<PreparedCastPayload> {
- let cast_token = format!(
- "cast_{}",
- b64::encode_url_safe_no_padding(&crypto::random_bytes(16))
- );
+ let cast_token = id::random("cast");
let encrypted_payload = seal_payload(
public_key,
&CastPayload {
diff --git a/rust/crates/core/src/id.rs b/rust/crates/core/src/id.rs
new file mode 100644
index 0000000000..b3466af8e3
--- /dev/null
+++ b/rust/crates/core/src/id.rs
@@ -0,0 +1,10 @@
+use crate::{b64, crypto};
+
+const RANDOM_BYTES: usize = 16;
+
+pub fn random(prefix: &str) -> String {
+ format!(
+ "{prefix}_{}",
+ b64::encode_url_safe_no_padding(&crypto::random_bytes(RANDOM_BYTES))
+ )
+}
diff --git a/rust/crates/core/src/lib.rs b/rust/crates/core/src/lib.rs
index 8897b59782..d47232895e 100644
--- a/rust/crates/core/src/lib.rs
+++ b/rust/crates/core/src/lib.rs
@@ -2,5 +2,6 @@ pub mod b64;
pub mod crypto;
pub mod error;
pub mod http;
+pub mod id;
pub mod io;
pub mod urls;