fix: change base64 to base64uri for uri-compatible hash (2)

Author: nmluci

crates/backend/src/service/master_pk.rs

@@ -110,7 +110,7 @@ impl MasterPKServiceTrait for MasterPKService {
       Ok(MasterPKResponse {
          id: meta.id.to_string(),
          public_key: BASE64.encode(&pk),
-         keypair_hash: BASE64.encode(&meta.keypair_hash),
+         keypair_hash: BASE64URL.encode(&meta.keypair_hash),
       })
    }
 
@@ -143,14 +143,14 @@ impl MasterPKServiceTrait for MasterPKService {
          Ok(v) => Ok(MasterPKResponse {
             id: v.to_string(),
             public_key: BASE64.encode(&payload.public_key),
-            keypair_hash: BASE64.encode(&payload.keypair_hash)
+            keypair_hash: BASE64URL.encode(&payload.keypair_hash)
          }),
          Err(e) => Err(KeypairError::CreationError(e.to_string())),
       };
    }
 
    async fn delete_keypair(&self, hash: String) -> Option<KeypairError> {
-      let keypair = match self.repository.find_keypair_by_hash(BASE64.decode(hash.as_bytes()).unwrap()).await {
+      let keypair = match self.repository.find_keypair_by_hash(BASE64URL.decode(hash.as_bytes()).unwrap()).await {
          Ok(v) => v,
          Err(e) => return Some(KeypairError::Yabai(e.to_string())),
       };

crates/backend/src/service/partner.rs

@@ -5,7 +5,7 @@ use aes::cipher::generic_array::GenericArray;
 use aes::cipher::typenum::U32;
 use async_trait::async_trait;
 use corelib::security;
-use data_encoding::BASE64;
+use data_encoding::{BASE64, BASE64URL};
 use uuid::Uuid;
 
 use crate::config::database::Database;

crates/backend/src/service/partner_pk.rs

@@ -126,7 +126,7 @@ impl PartnerPKServiceTrait for PartnerPKService {
       let mut iv = [0u8; 16];
       OsRng.fill_bytes(&mut iv);
 
-      let public_key = BASE64.decode(payload.public_key.as_bytes())
+      let public_key = BASE64URL.decode(payload.public_key.as_bytes())
          .map_err(|e| KeypairError::CreationError(e.to_string()))?;
 
       let enc_pk = security::aes256_encrypt(key, &public_key);
@@ -159,7 +159,7 @@ impl PartnerPKServiceTrait for PartnerPKService {
    async fn update_keypair(&self, payload: PartnerPKPayload) -> Result<(), KeypairError> {
       let key: GenericArray<u8, U32> = GenericArray::clone_from_slice(get("DB_KEY").as_bytes());
 
-      let public_key = BASE64.decode(payload.public_key.as_bytes())
+      let public_key = BASE64URL.decode(payload.public_key.as_bytes())
       .map_err(|e| KeypairError::CreationError(e.to_string()))?;
 
       let enc_pk = security::aes256_encrypt(key, &public_key);

crates/backend/src/service/payload_sec.rs

@@ -89,7 +89,7 @@ impl PayloadSecurityServiceTrait for PayloadSecurityService {
       Ok(EncryptDataResponse {
          data: format!("{}.{}", BASE64.encode(&ct) ,BASE64.encode(&iv)),
          tag: BASE64.encode(&mac),
-         secret_key: BASE64.encode(&master_data.keypair_hash),
+         secret_key: BASE64URL.encode(&master_data.keypair_hash),
       })
    }