Fix API key issues (#20)

Author: andrew-propelauth

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "propelauth"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["support@propelauth.com"]
 description = "A Rust crate for managing authentication and authorization with support for multi-tenant / B2B products, powered by PropelAuth"
 keywords = ["authentication", "auth", "authorization", "b2b", "tenant"]

src/models/user_in_org.rs

@@ -11,30 +11,21 @@
 
 
 
+use std::collections::HashMap;
+use serde_json::Value;
+
 #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
 pub struct UserInOrg {
     #[serde(rename = "org_id")]
     pub org_id: String,
     #[serde(rename = "org_name")]
     pub org_name: String,
+    #[serde(rename = "org_metadata")]
+    pub org_metadata: HashMap<String, Value>,
     #[serde(rename = "user_role")]
     pub user_role: String,
     #[serde(rename = "inherited_user_roles_plus_current_role")]
     pub inherited_user_roles_plus_current_role: Vec<String>,
     #[serde(rename = "user_permissions")]
     pub user_permissions: Vec<String>,
 }
-
-impl UserInOrg {
-    pub fn new(org_id: String, org_name: String, user_role: String, inherited_user_roles_plus_current_role: Vec<String>, user_permissions: Vec<String>) -> UserInOrg {
-        UserInOrg {
-            org_id,
-            org_name,
-            user_role,
-            inherited_user_roles_plus_current_role,
-            user_permissions,
-        }
-    }
-}
-
-

src/models/validate_api_key_response.rs

@@ -1,72 +1,42 @@
 use std::collections::HashMap;
 use serde_json::Value;
 use uuid::Uuid;
-use crate::models::UserMetadata;
+use crate::models::{UserInOrg, UserMetadata};
 
 pub type OrgRole = String;
 
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 pub struct ValidateApiKeyResponse {
     pub metadata: Option<serde_json::Value>,
-    pub user_metadata: Option<UserMetadata>,
-    pub org_metadata: Option<OrgInternalMetadata>,
-    pub user_role_in_org: Option<OrgRole>,
+    pub user: Option<UserMetadata>,
+    pub org: Option<OrgMetadata>,
+    pub user_in_org: Option<UserInOrg>,
     pub user_id: Option<String>,
     pub org_id: Option<String>,
 }
 
-impl ValidateApiKeyResponse {
-    pub fn new(metadata: Option<serde_json::Value>, user_metadata: Option<UserMetadata>, org_metadata: Option<OrgInternalMetadata>, user_role_in_org: Option<OrgRole>, user_id: Option<String>, org_id: Option<String>) -> Self {
-        Self { metadata, user_metadata, org_metadata, user_role_in_org, user_id, org_id }
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 pub struct ValidatePersonalApiKeyResponse {
     pub metadata: Option<serde_json::Value>,
-    pub user_metadata: UserMetadata,
+    pub user: UserMetadata,
 }
 
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 pub struct ValidateOrgApiKeyResponse {
     pub metadata: Option<serde_json::Value>,
-    pub user_metadata: Option<UserMetadata>,
-    pub org_metadata: OrgInternalMetadata,
-    pub user_role_in_org: Option<OrgRole>,
+    pub user: Option<UserMetadata>,
+    pub org: OrgMetadata,
+    pub user_in_org: Option<UserInOrg>,
 }
 
 #[derive(Clone, Debug, PartialEq, Deserialize)]
-pub struct OrgInternalMetadata {
+pub struct OrgMetadata {
     pub org_id: Uuid,
     pub org_name: String,
-    pub org_definition: OrgDefinition,
     pub can_setup_saml: bool,
-    pub autojoin_by_domain: bool,
-    pub restrict_to_domain: bool,
-    pub domain: Option<String>,
-    //pub require_2fa_by: Option<chrono::DateTime<chrono::Utc>>,
     pub max_users: Option<i32>,
     pub metadata: MetadataHashOfValue,
 }
 
-#[derive(Clone, Debug, PartialEq, Deserialize)]
-pub struct OrgDefinition {
-    pub roles: Vec<OrgRoleDefinition>,
-    pub default_role: Option<String>,
-}
-
-#[derive(Clone, Debug, PartialEq, Deserialize)]
-pub struct OrgRoleDefinition {
-    pub name: String,
-    pub description: Option<String>,
-    pub can_invite: bool,
-    pub can_change_roles: bool,
-    pub can_remove_users: bool,
-    pub can_setup_saml: Option<bool>,
-    pub external_permissions: Vec<String>,
-    pub deprecated: bool,
-    pub is_visible_to_end_user: bool,
-}
-
 pub type MetadataHashOfValue = HashMap<String, Value>;
 

src/propelauth/api_key.rs

@@ -139,27 +139,27 @@ impl ApiKeyService<'_> {
 
     pub async fn validate_personal_api_key(&self, params: ValidateApiKeyParams) -> Result<ValidatePersonalApiKeyResponse, ApiKeyError> {
         let resp = self.validate_api_key(params).await?;
-        if resp.user_metadata.is_none() || resp.org_metadata.is_some() {
+        if resp.user.is_none() || resp.org.is_some() {
             return Err(ApiKeyError::InvalidPersonalAPIKey);
         }
 
         Ok(ValidatePersonalApiKeyResponse {
             metadata: resp.metadata,
-            user_metadata: resp.user_metadata.unwrap(),
+            user: resp.user.unwrap(),
         })
     }
 
     pub async fn validate_org_api_key(&self, params: ValidateApiKeyParams) -> Result<ValidateOrgApiKeyResponse, ApiKeyError> {
         let resp = self.validate_api_key(params).await?;
-        if resp.org_metadata.is_none() {
+        if resp.org.is_none() {
             return Err(ApiKeyError::InvalidOrgAPIKey);
         }
 
         Ok(ValidateOrgApiKeyResponse {
             metadata: resp.metadata,
-            user_metadata: resp.user_metadata,
-            org_metadata: resp.org_metadata.unwrap(),
-            user_role_in_org: resp.user_role_in_org,
+            user: resp.user,
+            org: resp.org.unwrap(),
+            user_in_org: resp.user_in_org,
         })
     }
 }