move scim types to /models

Author: pfvatterott

src/apis/scim_service_api.rs

@@ -13,82 +13,11 @@ use reqwest;
 use super::{configuration, Error};
 use crate::propelauth::auth::AUTH_HOSTNAME_HEADER;
 use crate::apis::ResponseContent;
-
-/// struct for passing parameters to the method [`fetch_org_scim_groups`]
-#[derive(Clone, Debug, Default)]
-pub struct FetchOrgScimGroupsRequest {
-    pub org_id: String,
-    pub user_id: Option<String>,
-    pub page_size: Option<i64>,
-    pub page_number: Option<i64>,
-}
-
-/// struct for passing parameters to the method [`fetch_scim_group`]
-#[derive(Clone, Debug, Default)]
-pub struct FetchScimGroupRequest {
-    pub org_id: String,
-    pub group_id: String,
-    pub members_page_size: Option<i64>,
-    pub members_page_number: Option<i64>,
-}
-
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
-pub struct ScimGroupResult {
-    #[serde(rename = "group_id")]
-    pub group_id: String,
-    #[serde(rename = "display_name")]
-    pub display_name: String,
-    #[serde(rename = "external_id_from_idp")]
-    pub external_id_from_idp: Option<String>,
-}
-
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
-pub struct ScimGroupResultPage {
-    #[serde(rename = "groups")]
-    pub groups: Vec<ScimGroupResult>,
-    #[serde(rename = "total_groups")]
-    pub total_groups: i64,
-    #[serde(rename = "page_number")]
-    pub page_number: i64,
-    #[serde(rename = "page_size")]
-    pub page_size: i64,
-}
-
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
-pub struct ScimGroupMember {
-    #[serde(rename = "user_id")]
-    pub user_id: String
-}
-
-#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
-pub struct ScimGroup {
-    #[serde(rename = "group_id")]
-    pub group_id: String,
-    #[serde(rename = "display_name")]
-    pub display_name: String,
-    #[serde(rename = "external_id_from_idp")]
-    pub external_id_from_idp: Option<String>,
-    #[serde(rename = "members")]
-    pub members: Vec<ScimGroupMember>,
-}
-
-/// struct for typed errors of method [`fetch_org_scim_groups`]
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum FetchOrgScimGroupsError {
-    Status401(serde_json::Value),
-    Status404(serde_json::Value),
-    UnknownValue(serde_json::Value),
-}
-
-/// struct for typed errors of method [`fetch_scim_group`]
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum FetchScimGroupError {
-    Status401(serde_json::Value),
-    Status404(serde_json::Value),
-    UnknownValue(serde_json::Value),
-}
+use crate::models::{
+    FetchOrgScimGroupsError, FetchOrgScimGroupsRequest,
+    FetchScimGroupError, FetchScimGroupRequest,
+    ScimGroup, ScimGroupResultPage,
+};
 
 
 pub async fn fetch_org_scim_groups(

src/models/mod.rs

@@ -143,3 +143,14 @@ pub mod social_login_token;
 pub use self::social_login_token::SocialLoginToken;
 pub use self::social_login_token::SocialLoginTokenProvider;
 pub use self::social_login_token::SocialLoginTokensResponse;
+pub mod scim_group;
+pub use self::scim_group::ScimGroup;
+pub use self::scim_group::ScimGroupMember;
+pub use self::scim_group::ScimGroupResult;
+pub use self::scim_group::ScimGroupResultPage;
+pub mod scim_group_requests;
+pub use self::scim_group_requests::FetchOrgScimGroupsRequest;
+pub use self::scim_group_requests::FetchScimGroupRequest;
+pub mod scim_group_errors;
+pub use self::scim_group_errors::FetchOrgScimGroupsError;
+pub use self::scim_group_errors::FetchScimGroupError;

src/propelauth/scim.rs

@@ -1,6 +1,7 @@
 use crate::apis::configuration::Configuration;
-use crate::apis::scim_service_api::{
-    FetchOrgScimGroupsRequest, ScimGroup, ScimGroupResultPage, FetchScimGroupRequest
+use crate::models::{
+    FetchOrgScimGroupsRequest, FetchScimGroupRequest,
+    ScimGroup, ScimGroupResultPage,
 };
 use crate::propelauth::helpers::{is_valid_id, map_autogenerated_error};
 use crate::propelauth::errors::ErrorsWithNotFound;