fix: resolve comment

juspay · Nov 6, 2024 · e83ce3f · e83ce3f
1 parent 540d61a
commit e83ce3f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/crates/router/src/core/user.rs b/crates/router/src/core/user.rs
@@ -644,8 +644,10 @@ async fn handle_existing_user_invitation(
         created_at: now,
         last_modified: now,
         entity: domain::NoLevel,
-        // TODO: To be sent from token after option is removed
-        tenant_id: state.tenant.tenant_id.clone(),
+        tenant_id: user_from_token
+            .tenant_id
+            .clone()
+            .unwrap_or(state.tenant.tenant_id.clone()),
     };
 
     let _user_role = match role_info.get_entity_type() {
@@ -773,8 +775,10 @@ async fn handle_new_user_invitation(
         created_at: now,
         last_modified: now,
         entity: domain::NoLevel,
-        // TODO: To be sent from token after option is removed
-        tenant_id: state.tenant.tenant_id.clone(),
+        tenant_id: user_from_token
+            .tenant_id
+            .clone()
+            .unwrap_or(state.tenant.tenant_id.clone()),
     };
 
     let _user_role = match role_info.get_entity_type() {