add error for login with unlinked snap account

NetsBlox · Jun 17, 2024 · 511a883 · 511a883
1 parent 8b95bbc
commit 511a883
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/crates/cloud/src/errors.rs b/crates/cloud/src/errors.rs
@@ -99,6 +99,8 @@ pub enum UserError {
     SnapConnectionError,
     #[display(fmt = "Account already linked to NetsBlox user.")]
     AccountAlreadyLinkedError,
+    #[display(fmt = "Account not linked to NetsBlox user. Please link account to NetsBlox user.")]
+    LinkedAccountNotFoundError,
     #[display(fmt = "Invalid account type.")]
     InvalidAccountTypeError,
     #[display(fmt = "Login from Tor not allowed.")]
@@ -189,6 +191,7 @@ impl error::ResponseError for UserError {
             | Self::InviteNotFoundError
             | Self::MagicLinkNotFoundError
             | Self::UserNotFoundError
+            | Self::LinkedAccountNotFoundError
             | Self::FriendNotFoundError
             | Self::OAuthClientNotFoundError
             | Self::OAuthTokenNotFoundError

diff --git a/crates/cloud/src/users/strategies.rs b/crates/cloud/src/users/strategies.rs
@@ -67,36 +67,11 @@ pub async fn login(users: &Collection<User>, credentials: Credentials) -> Result
             };
 
             let query = doc! {"linkedAccounts": {"$elemMatch": &account}};
-            let user_opt = users
+            let user = users
                 .find_one(query, None)
                 .await
-                .map_err(InternalError::DatabaseConnectionError)?;
-
-            let user = if let Some(user) = user_opt {
-                user
-            } else {
-                let cookie = response
-                    .cookies()
-                    .next()
-                    .ok_or(UserError::SnapConnectionError)?;
-                let url = &format!("https://snap.berkeley.edu/api/v1/users/{}", username);
-
-                let client = reqwest::Client::new();
-                let user_data = client
-                    .request(Method::GET, url)
-                    .header("Cookie", format!("{}={}", cookie.name(), cookie.value()))
-                    .send()
-                    .await
-                    .map_err(|_err| UserError::SnapConnectionError)?
-                    .json::<SnapUser>()
-                    .await
-                    .map_err(|_err| UserError::SnapConnectionError)?;
-
-                // FIX: snap route is not available anymore, snap does not provide email addresses
-                // TODO: ensure email isn't banned?
-
-                create_account(users, user_data.email, &account).await?
-            };
+                .map_err(InternalError::DatabaseConnectionError)?
+                .ok_or(UserError::LinkedAccountNotFoundError)?;
 
             Ok(user)
         }