From d128f3e14eef2ed497f8506bf92e8518b5d5d56c Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Tue, 15 Feb 2022 13:09:10 -0700
Subject: [PATCH] Send CORS wildcard, allow editing of non-accepted team
 members (#299)

---
 src/main.rs         | 3 ++-
 src/routes/teams.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d9d31677f..5a5a42dd3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -243,7 +243,8 @@ async fn main() -> std::io::Result<()> {
                     .allow_any_origin()
                     .allow_any_header()
                     .allow_any_method()
-                    .max_age(3600),
+                    .max_age(3600)
+                    .send_wildcard(),
             )
             .wrap(
                 RateLimiter::new(MemoryStoreActor::from(store.clone()).start())
diff --git a/src/routes/teams.rs b/src/routes/teams.rs
index 30a992b0d..c6a5fb6b7 100644
--- a/src/routes/teams.rs
+++ b/src/routes/teams.rs
@@ -280,7 +280,7 @@ pub async fn edit_team_member(
                 "You don't have permission to edit members of this team".to_string(),
             )
         })?;
-    let edit_member_db = TeamMember::get_from_user_id(id, user_id, &**pool)
+    let edit_member_db = TeamMember::get_from_user_id_pending(id, user_id, &**pool)
         .await?
         .ok_or_else(|| {
             ApiError::CustomAuthenticationError(