replace avatar url with cid

ambrosus · Mar 5, 2024 · 6ea7e1f · 6ea7e1f
1 parent e31981d
commit 6ea7e1f
Show file tree

Hide file tree

Showing 11 changed files with 249 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -30,6 +30,7 @@ tower-http = { version = "0", features = ["cors"] }
 reqwest = { version = "0", features = ["rustls-tls", "json", "deflate"] }
 jsonwebtoken = "9"
 url = { version = "2", features = ["serde"] }
+cid = "0"
 
 # SerDe
 serde = { version = "1", features = ["derive"] }

diff --git a/gov-portal-db/config/default.json b/gov-portal-db/config/default.json
@@ -17,9 +17,7 @@
             "telegramMaxLength": 32,
             "twitterMaxLength": 32,
             "bioMaxLength": 250,
-            "bioMinLength": 2,
-            "avatarUrlMaxLength": 250,
-            "avatarUrlMinLength": 7
+            "bioMinLength": 2
         },
         "emailVerification": {
             "mailerBaseUrl": null,

diff --git a/gov-portal-db/src/server.rs b/gov-portal-db/src/server.rs
@@ -8,7 +8,7 @@ use tower_http::cors::CorsLayer;
 
 use shared::common::{
     SendEmailRequest, SendEmailRequestKind, SessionToken, UserEmailConfirmationToken, UserInfo,
-    UserProfile, UserProfileStatus,
+    UserProfile, UserProfileStatus, WrappedCid,
 };
 
 use crate::{
@@ -86,7 +86,7 @@ pub struct UpdateUserRequest {
     #[serde(default)]
     pub bio: Option<String>,
     #[serde(default)]
-    pub avatar: Option<url::Url>,
+    pub avatar: Option<WrappedCid>,
     #[serde(flatten)]
     pub session: SessionToken,
 }

diff --git a/gov-portal-db/src/users_manager/mod.rs b/gov-portal-db/src/users_manager/mod.rs
@@ -64,8 +64,6 @@ pub struct UserProfileAttributes {
     pub twitter_max_length: usize,
     pub bio_max_length: usize,
     pub bio_min_length: usize,
-    pub avatar_url_max_length: usize,
-    pub avatar_url_min_length: usize,
 }
 
 impl Default for UserProfileAttributes {
@@ -81,8 +79,6 @@ impl Default for UserProfileAttributes {
             twitter_max_length: 32,
             bio_max_length: 250,
             bio_min_length: 2,
-            avatar_url_max_length: 250,
-            avatar_url_min_length: 7, // length("a://a.a")
         }
     }
 }
@@ -393,17 +389,6 @@ impl UsersManager {
             )));
         }
 
-        if user.avatar.as_ref().is_some_and(|value| {
-            value.as_str().len() < self.config.user_profile_attributes.avatar_url_min_length
-                || value.as_str().len() > self.config.user_profile_attributes.avatar_url_max_length
-        }) {
-            return Err(error::Error::InvalidInput(format!(
-                "Avatar URL doesn't met requirements (min: {}, max: {})",
-                self.config.user_profile_attributes.avatar_url_min_length,
-                self.config.user_profile_attributes.avatar_url_max_length
-            )));
-        }
-
         Ok(())
     }
 
@@ -496,9 +481,7 @@ mod tests {
                     "telegramMaxLength": 32,
                     "twitterMaxLength": 32,
                     "bioMaxLength": 250,
-                    "bioMinLength": 2,
-                    "avatarUrlMaxLength": 250,
-                    "avatarUrlMinLength": 7
+                    "bioMinLength": 2
                 },
                 "emailVerification": {
                     "mailerBaseUrl": "http://localhost:10002",

diff --git a/gov-portal-db/tests/test_db.rs b/gov-portal-db/tests/test_db.rs
@@ -1,12 +1,11 @@
 #![cfg(feature = "enable-integration-tests")]
-use std::str::FromStr;
 
 use airdao_gov_portal_db::{
     quiz::{Quiz, QuizAnswer, QuizConfig},
     users_manager::{EmailVerificationConfig, *},
 };
 use assert_matches::assert_matches;
-use shared::common::{EmailFrom, UserInfo, UserProfile, UserProfileStatus};
+use shared::common::{EmailFrom, UserInfo, UserProfile, UserProfileStatus, WrappedCid};
 use web3::types::Address;
 
 #[tokio::test]
@@ -210,7 +209,9 @@ async fn test_complete_profile() -> Result<(), anyhow::Error> {
             name: Some("some name".to_owned()),
             role: Some("some role".to_owned()),
             bio: Some("some bio".to_owned()),
-            avatar: Some(url::Url::from_str("http://avatar.link")?),
+            avatar: Some(WrappedCid::new(
+                "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
+            )?),
             ..default_user_info()
         })
         .await?;

diff --git a/gov-portal-mocker/src/main.rs b/gov-portal-mocker/src/main.rs
@@ -16,7 +16,7 @@ use tower_http::cors::CorsLayer;
 use shared::{
     common::{
         ApprovedResponse, PendingResponse, SBTRequest, SessionToken, SignedSBTRequest,
-        UserDbConfig, UserInfo, UserProfile, VerifyAccountResponse,
+        UserDbConfig, UserInfo, UserProfile, VerifyAccountResponse, WrappedCid,
     },
     logger, utils,
 };
@@ -96,7 +96,7 @@ pub enum UpdateUserQuery {
         telegram: Option<String>,
         twitter: Option<String>,
         bio: Option<String>,
-        avatar: Option<String>,
+        avatar: Box<Option<WrappedCid>>,
     },
     NoJwtToken {},
 }
@@ -219,10 +219,11 @@ async fn index_route(
                         &utils::get_checksum_address(&user.wallet),
                     )
                     .replace(
-                        "{{USER_AVATAR_URL}}",
-                        user.avatar
+                        "{{USER_AVATAR_CID}}",
+                        &user
+                            .avatar
                             .as_ref()
-                            .map(|url| url.as_str())
+                            .map(|cid| cid.to_string())
                             .unwrap_or_default(),
                     )
                     .replace("{{USER_NAME}}", user.name.as_deref().unwrap_or_default())
@@ -264,7 +265,7 @@ async fn update_user_route(
             bio,
             avatar,
         } => match state
-            .update_user(&token, name, role, telegram, twitter, bio, avatar)
+            .update_user(&token, name, role, telegram, twitter, bio, *avatar)
             .and_then(|_| state.get_user(&token))
             .await
         {
@@ -299,10 +300,11 @@ async fn update_user_route(
                         &utils::get_checksum_address(&user.wallet),
                     )
                     .replace(
-                        "{{USER_AVATAR_URL}}",
-                        user.avatar
+                        "{{USER_AVATAR_CID}}",
+                        &user
+                            .avatar
                             .as_ref()
-                            .map(|url| url.as_str())
+                            .map(|cid| cid.to_string())
                             .unwrap_or_default(),
                     )
                     .replace("{{USER_NAME}}", user.name.as_deref().unwrap_or_default())
@@ -596,12 +598,8 @@ impl AppState {
         telegram: Option<String>,
         twitter: Option<String>,
         bio: Option<String>,
-        avatar: Option<String>,
+        avatar: Option<WrappedCid>,
     ) -> Result<(), anyhow::Error> {
-        let avatar = match avatar {
-            Some(avatar_url) => Some(url::Url::parse(&avatar_url)?),
-            None => None,
-        };
         let raw_data = self
             .client
             .post(&[&self.config.user_db.base_url, "/update-user"].concat())

diff --git a/gov-portal-mocker/static/index.html b/gov-portal-mocker/static/index.html
@@ -97,8 +97,8 @@ <h1>User Profile</h1>
             <input type="text" id="wallet" name="wallet" value="{{USER_WALLET}}" maxlength="64" size="64" disabled="true" />
         </p>
         <p>
-            <label for="avatar">Avatar URL:</label>
-            <input type="text" id="avatar" name="avatar" value="{{USER_AVATAR_URL}}" maxlength="64" size="64" />
+            <label for="avatar">Avatar ipfs url (or CID):</label>
+            <input type="text" id="avatar" name="avatar" value="{{USER_AVATAR_CID}}" maxlength="256" size="64" />
         </p>
         <p>
             <label for="name">Name:</label>

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -20,6 +20,7 @@ k256 = { workspace = true }
 # Web
 jsonwebtoken = { workspace = true }
 url = { workspace = true }
+cid = { workspace = true }
 
 # SerDe
 serde = { workspace = true }