From e77ae0b57d63b8e95832ab86b69d3ae74fb9b3b1 Mon Sep 17 00:00:00 2001
From: Ayush Jain <76424614+ayushjain17@users.noreply.github.com>
Date: Mon, 30 Sep 2024 15:52:24 +0530
Subject: [PATCH] chore: Delete SuperpositionUser trait (#251)

---
 .../src/api/context/handlers.rs               |  2 +-
 .../src/api/default_config/handlers.rs        |  2 +-
 .../src/api/dimension/handlers.rs             |  2 +-
 .../src/api/functions/handlers.rs             |  2 +-
 .../src/api/experiments/handlers.rs           |  4 +--
 crates/superposition_types/src/lib.rs         | 28 ++++---------------
 6 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/crates/context_aware_config/src/api/context/handlers.rs b/crates/context_aware_config/src/api/context/handlers.rs
index 2b946dc5..07b8352c 100644
--- a/crates/context_aware_config/src/api/context/handlers.rs
+++ b/crates/context_aware_config/src/api/context/handlers.rs
@@ -42,7 +42,7 @@ use serde_json::{from_value, json, Map, Value};
 use service_utils::helpers::{parse_config_tags, validation_err_to_str};
 use service_utils::service::types::DbConnection;
 use std::collections::HashMap;
-use superposition_types::{SuperpositionUser, User};
+use superposition_types::User;
 
 use super::helpers::{
     validate_condition_with_functions, validate_condition_with_mandatory_dimensions,
diff --git a/crates/context_aware_config/src/api/default_config/handlers.rs b/crates/context_aware_config/src/api/default_config/handlers.rs
index c53509b0..3b8dee4e 100644
--- a/crates/context_aware_config/src/api/default_config/handlers.rs
+++ b/crates/context_aware_config/src/api/default_config/handlers.rs
@@ -8,7 +8,7 @@ use service_utils::{
 use superposition_macros::{
     bad_argument, db_error, not_found, unexpected_error, validation_error,
 };
-use superposition_types::{result as superposition, SuperpositionUser, User};
+use superposition_types::{result as superposition, User};
 
 use crate::{
     api::{
diff --git a/crates/context_aware_config/src/api/dimension/handlers.rs b/crates/context_aware_config/src/api/dimension/handlers.rs
index 750eb5f2..948da12c 100644
--- a/crates/context_aware_config/src/api/dimension/handlers.rs
+++ b/crates/context_aware_config/src/api/dimension/handlers.rs
@@ -18,7 +18,7 @@ use diesel::{
 use jsonschema::{Draft, JSONSchema};
 use serde_json::Value;
 use superposition_macros::{bad_argument, not_found, unexpected_error};
-use superposition_types::{result as superposition, SuperpositionUser, User};
+use superposition_types::{result as superposition, User};
 
 use service_utils::service::types::{AppState, DbConnection, Tenant};
 
diff --git a/crates/context_aware_config/src/api/functions/handlers.rs b/crates/context_aware_config/src/api/functions/handlers.rs
index 5b63d90f..a742bdbf 100644
--- a/crates/context_aware_config/src/api/functions/handlers.rs
+++ b/crates/context_aware_config/src/api/functions/handlers.rs
@@ -23,7 +23,7 @@ use serde_json::json;
 use service_utils::service::types::DbConnection;
 
 use superposition_macros::{bad_argument, not_found, unexpected_error};
-use superposition_types::{result as superposition, SuperpositionUser, User};
+use superposition_types::{result as superposition, User};
 
 use validation_functions::{compile_fn, execute_fn};
 
diff --git a/crates/experimentation_platform/src/api/experiments/handlers.rs b/crates/experimentation_platform/src/api/experiments/handlers.rs
index 11bc7b54..3da82d92 100644
--- a/crates/experimentation_platform/src/api/experiments/handlers.rs
+++ b/crates/experimentation_platform/src/api/experiments/handlers.rs
@@ -20,9 +20,7 @@ use service_utils::service::types::{
     AppHeader, AppState, CustomHeaders, DbConnection, Tenant,
 };
 use superposition_macros::{bad_argument, response_error, unexpected_error};
-use superposition_types::{
-    result as superposition, Condition, Exp, Overrides, SuperpositionUser, User,
-};
+use superposition_types::{result as superposition, Condition, Exp, Overrides, User};
 
 use super::{
     helpers::{
diff --git a/crates/superposition_types/src/lib.rs b/crates/superposition_types/src/lib.rs
index 0ef81e75..633b4d3a 100644
--- a/crates/superposition_types/src/lib.rs
+++ b/crates/superposition_types/src/lib.rs
@@ -12,13 +12,6 @@ use regex::Regex;
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::{json, Map, Value};
 
-pub trait SuperpositionUser {
-    fn get_email(&self) -> String;
-    fn get_username(&self) -> String;
-    fn get_auth_token(&self) -> String;
-    fn get_auth_type(&self) -> String;
-}
-
 #[derive(Debug, Clone)]
 pub struct User {
     pub email: String,
@@ -27,20 +20,20 @@ pub struct User {
     pub auth_type: String,
 }
 
-impl SuperpositionUser for User {
-    fn get_email(&self) -> String {
+impl User {
+    pub fn get_email(&self) -> String {
         self.email.clone()
     }
 
-    fn get_username(&self) -> String {
+    pub fn get_username(&self) -> String {
         self.username.clone()
     }
 
-    fn get_auth_token(&self) -> String {
+    pub fn get_auth_token(&self) -> String {
         self.auth_token.clone()
     }
 
-    fn get_auth_type(&self) -> String {
+    pub fn get_auth_type(&self) -> String {
         self.auth_type.clone()
     }
 }
@@ -56,17 +49,6 @@ impl Default for User {
     }
 }
 
-impl From<Box<dyn SuperpositionUser>> for User {
-    fn from(value: Box<dyn SuperpositionUser>) -> Self {
-        User {
-            email: value.get_email(),
-            username: value.get_username(),
-            auth_token: value.get_auth_token(),
-            auth_type: value.get_auth_type(),
-        }
-    }
-}
-
 impl FromRequest for User {
     type Error = actix_web::error::Error;
     type Future = Ready<Result<Self, Self::Error>>;