-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Added a rustfmt.toml file. (with "acceptable" settings... it's not …
…as customizable as eslint, so still off a fair deal from what I'd like, but it's probably close enough to be more helpful than hurtful) * Made-so rustfmt is used by default in vscode, when rust files are saved. * Applied rustfmt formatting throughout all .rs files in the project, by running "cargo fmt". * Also added some `#[rustfmt::skip]` annotations, in places where the custom formatting was important for readability and/or succinctness.
- Loading branch information
Showing
197 changed files
with
13,175 additions
and
12,359 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
110 changes: 60 additions & 50 deletions
110
Packages/app-server/src/db/_shared/access_policy_target.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,79 @@ | ||
| use rust_shared::{async_graphql::{self, ScalarType, InputValueResult, InputValueError, Scalar, Value}, utils::general_::extensions::ToOwnedV, serde_json}; | ||
| use serde::{Serialize, Serializer, Deserialize, Deserializer}; | ||
| use rust_shared::{ | ||
| async_graphql::{self, InputValueError, InputValueResult, Scalar, ScalarType, Value}, | ||
| serde_json, | ||
| utils::general_::extensions::ToOwnedV, | ||
| }; | ||
| use serde::{Deserialize, Deserializer, Serialize, Serializer}; | ||
|
|
||
| use crate::db::access_policies_::_permission_set::APTable; | ||
|
|
||
| pub struct AccessPolicyTarget { | ||
| pub policy_id: String, | ||
| pub ap_table: APTable, | ||
| pub policy_id: String, | ||
| pub ap_table: APTable, | ||
| } | ||
| impl AccessPolicyTarget { | ||
| pub fn new(access_policy: String, table: APTable) -> Self { | ||
| Self { policy_id: access_policy, ap_table: table.o() } | ||
| } | ||
| pub fn new(access_policy: String, table: APTable) -> Self { | ||
| Self { policy_id: access_policy, ap_table: table.o() } | ||
| } | ||
| } | ||
|
|
||
| impl Clone for AccessPolicyTarget { | ||
| fn clone(&self) -> Self { | ||
| AccessPolicyTarget::new(self.policy_id.o(), self.ap_table) | ||
| } | ||
| fn clone(&self) -> Self { | ||
| AccessPolicyTarget::new(self.policy_id.o(), self.ap_table) | ||
| } | ||
| } | ||
| impl Serialize for AccessPolicyTarget { | ||
| fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer { | ||
| //serializer.serialize_str(self.inner.to_string().as_str()) | ||
| let str_val = format!("{}:{:?}", self.policy_id, self.ap_table); | ||
| str_val.serialize(serializer) | ||
| } | ||
| fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> | ||
| where | ||
| S: Serializer, | ||
| { | ||
| //serializer.serialize_str(self.inner.to_string().as_str()) | ||
| let str_val = format!("{}:{:?}", self.policy_id, self.ap_table); | ||
| str_val.serialize(serializer) | ||
| } | ||
| } | ||
| impl<'de> Deserialize<'de> for AccessPolicyTarget { | ||
| fn deserialize<D>(deserializer: D) -> Result<AccessPolicyTarget, D::Error> where D: Deserializer<'de> { | ||
| let str_val = String::deserialize(deserializer)?; | ||
| let (policy_id, table_name) = str_val.split_once(":").ok_or_else(|| serde::de::Error::custom("AccessPolicyTarget must be in the format `access_policy_id:policy_subfield`"))?; | ||
| fn deserialize<D>(deserializer: D) -> Result<AccessPolicyTarget, D::Error> | ||
| where | ||
| D: Deserializer<'de>, | ||
| { | ||
| let str_val = String::deserialize(deserializer)?; | ||
| let (policy_id, table_name) = str_val.split_once(":").ok_or_else(|| serde::de::Error::custom("AccessPolicyTarget must be in the format `access_policy_id:policy_subfield`"))?; | ||
|
|
||
| // ensure that policy_id substring is a valid UUID/slugid | ||
| // todo: probably change `policy_id` field to custom type that enforces this for itself | ||
| if policy_id.len() != 22 { | ||
| return Err(serde::de::Error::custom(format!("The policy-id within the access-policy-target must be a valid slugid; for example, its length must be 22 characters. Actual length:{}", policy_id.len()))); | ||
| } | ||
| let table: APTable = serde_json::from_value(serde_json::Value::String(table_name.o())).map_err(|e| serde::de::Error::custom(format!("Failed to parse valid table-name from access-policy-target:{}", e)))?; | ||
| Ok(AccessPolicyTarget::new(policy_id.o(), table)) | ||
| } | ||
| // ensure that policy_id substring is a valid UUID/slugid | ||
| // todo: probably change `policy_id` field to custom type that enforces this for itself | ||
| if policy_id.len() != 22 { | ||
| return Err(serde::de::Error::custom(format!("The policy-id within the access-policy-target must be a valid slugid; for example, its length must be 22 characters. Actual length:{}", policy_id.len()))); | ||
| } | ||
| let table: APTable = serde_json::from_value(serde_json::Value::String(table_name.o())).map_err(|e| serde::de::Error::custom(format!("Failed to parse valid table-name from access-policy-target:{}", e)))?; | ||
|
|
||
| Ok(AccessPolicyTarget::new(policy_id.o(), table)) | ||
| } | ||
| } | ||
|
|
||
| #[Scalar] | ||
| impl ScalarType for AccessPolicyTarget { | ||
| fn parse(value: Value) -> InputValueResult<Self> { | ||
| match value { | ||
| Value::String(str_val) => { | ||
| //Ok(serde_json::from_str(&str_val).map_err(|e| InputValueError::custom(e))?) | ||
| let (policy_id, table_name) = str_val.split_once(":").ok_or_else(|| InputValueError::custom("AccessPolicyTarget must be in the format `access_policy_id:policy_subfield`"))?; | ||
| fn parse(value: Value) -> InputValueResult<Self> { | ||
| match value { | ||
| Value::String(str_val) => { | ||
| //Ok(serde_json::from_str(&str_val).map_err(|e| InputValueError::custom(e))?) | ||
| let (policy_id, table_name) = str_val.split_once(":").ok_or_else(|| InputValueError::custom("AccessPolicyTarget must be in the format `access_policy_id:policy_subfield`"))?; | ||
|
|
||
| // ensure that policy_id substring is a valid UUID/slugid | ||
| // todo: probably change `policy_id` field to custom type that enforces this for itself | ||
| if policy_id.len() != 22 { | ||
| return Err(InputValueError::custom(format!("The policy-id within the access-policy-target must be a valid slugid; for example, its length must be 22 characters. Actual length:{}", policy_id.len()))); | ||
| } | ||
| let table: APTable = serde_json::from_value(serde_json::Value::String(table_name.o())).map_err(|e| InputValueError::custom(format!("Failed to parse valid table-name from access-policy-target:{}", e)))?; | ||
|
|
||
| // ensure that policy_id substring is a valid UUID/slugid | ||
| // todo: probably change `policy_id` field to custom type that enforces this for itself | ||
| if policy_id.len() != 22 { | ||
| return Err(InputValueError::custom(format!("The policy-id within the access-policy-target must be a valid slugid; for example, its length must be 22 characters. Actual length:{}", policy_id.len()))); | ||
| } | ||
| let table: APTable = serde_json::from_value(serde_json::Value::String(table_name.o())).map_err(|e| InputValueError::custom(format!("Failed to parse valid table-name from access-policy-target:{}", e)))?; | ||
|
|
||
| Ok(AccessPolicyTarget::new(policy_id.o(), table)) | ||
| }, | ||
| _ => Err(InputValueError::custom("AccessPolicyTarget must be a string")), | ||
| } | ||
| } | ||
| fn to_value(&self) -> Value { | ||
| //Value::String(serde_json::to_string(&self).unwrap()) | ||
| let str_val = format!("{}:{:?}", self.policy_id, self.ap_table); | ||
| Value::String(str_val) | ||
| } | ||
| } | ||
| Ok(AccessPolicyTarget::new(policy_id.o(), table)) | ||
| }, | ||
| _ => Err(InputValueError::custom("AccessPolicyTarget must be a string")), | ||
| } | ||
| } | ||
| fn to_value(&self) -> Value { | ||
| //Value::String(serde_json::to_string(&self).unwrap()) | ||
| let str_val = format!("{}:{:?}", self.policy_id, self.ap_table); | ||
| Value::String(str_val) | ||
| } | ||
| } |
Oops, something went wrong.