Merge pull request #82 from TheShieldAuth/develop

Develop

Author: MKSinghDev

.idea/shield.iml

@@ -4,7 +4,7 @@ server:
   domain: localhost
   host: http://localhost:5555
 database:
-  uri: "postgres://postgres:1234@localhost:5432"
+  uri: "postgres://postgres:12345@localhost:5432"
   name: shield
 smtp:
   server: smtp.gmail.com

config/env/default.yml

@@ -1,19 +1,28 @@
-use std::collections::HashMap;
-
 use entity::user;
 use sea_orm::prelude::{DateTimeWithTimeZone, Uuid};
 use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
 
 #[derive(Deserialize)]
 pub struct ResourceGroup {
     pub name: String,
     pub client_id: Uuid,
 }
 
+#[derive(Deserialize)]
+#[serde(untagged)]
+pub enum IdentifierValue {
+    String(String),
+    Number(i64),
+    Boolean(bool),
+    Array(Vec<String>),
+    Object(HashMap<String, String>),
+}
+
 #[derive(Deserialize)]
 pub struct ResourceSubset {
     pub group: ResourceGroup,
-    pub identifiers: HashMap<String, String>,
+    pub identifiers: Option<HashMap<String, IdentifierValue>>,
 }
 
 #[derive(Deserialize)]

src/mappers/user.rs

@@ -2,6 +2,7 @@ use jsonwebtoken::{errors::Error, DecodingKey, EncodingKey, Header, TokenData, V
 use once_cell::sync::Lazy;
 use sea_orm::prelude::Uuid;
 use serde::{Deserialize, Serialize};
+use serde_json::Value as JsonValue;
 use std::collections::HashMap;
 
 use entity::{client, resource, resource_group, session, user};
@@ -18,15 +19,24 @@ pub struct Resource {
     pub client_id: Uuid,
     pub client_name: String,
     pub group_name: String,
-    pub identifiers: HashMap<String, String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub identifiers: Option<HashMap<String, JsonValue>>,
 }
 
 impl Resource {
-    fn from(client: &client::Model, resource_group: resource_group::Model, resources: Vec<resource::Model>) -> Self {
-        let mut identifiers = HashMap::new();
-        for resource in resources {
-            identifiers.insert(resource.name, resource.value);
-        }
+    fn from(client: &client::Model, resource_group: resource_group::Model, resources: Option<Vec<resource::Model>>) -> Self {
+        let identifiers = resources.map(|resources| {
+            resources
+                .into_iter()
+                .map(|resource| {
+                    let value = match serde_json::from_str(&resource.value) {
+                        Ok(json_value) => json_value,
+                        Err(_) => JsonValue::String(resource.value),
+                    };
+                    (resource.name, value)
+                })
+                .collect()
+        });
 
         Self {
             client_id: client.id,
@@ -66,7 +76,7 @@ impl JwtUser {
             last_name: user.last_name.unwrap_or_else(|| "".into()),
             email: user.email.clone(),
             phone: user.phone.unwrap_or_else(|| "".into()),
-            resource: Some(Resource::from(client, resource_group, resources)),
+            resource: Some(Resource::from(client, resource_group, Some(resources))),
         }
     }
 

src/packages/jwt_token.rs

@@ -156,10 +156,11 @@ pub async fn create_session(
         .await?;
 
     // TODO: if resource_groups_id is Some and resources are empty then return error else continue
-    if resources.is_empty() {
-        debug!("No resources found");
-        return Err(Error::Authenticate(AuthenticateError::Locked));
-    }
+    // debug!("Resources: {:#?}", resource_groups.id);
+    // if !resource_groups.id.is_nil() && resources.is_empty() {
+    //     debug!("No resources found");
+    //     return Err(Error::Authenticate(AuthenticateError::Locked));
+    // }
 
     let session_model = session::ActiveModel {
         id: Set(Uuid::now_v7()),
@@ -185,8 +186,7 @@ pub async fn create_session(
         resources,
         &session,
         &SETTINGS.read().secrets.signing_key,
-    )
-    .unwrap();
+    )?;
 
     Ok(LoginResponse {
         access_token,

src/services/auth.rs

@@ -1,3 +1,4 @@
+use crate::mappers::user::IdentifierValue;
 use crate::{
     mappers::user::{
         CreateUserRequest, ForgotPasswordRequest, ForgotPasswordResponse, InitiateForgotPasswordResponse, SendEmailVerificationRequest,
@@ -55,13 +56,22 @@ pub async fn insert_user(db: &DatabaseConnection, realm_id: Uuid, payload: Creat
     let futures: Vec<_> = payload
         .resource
         .identifiers
+        .unwrap_or_default()
         .iter()
         .map(|(name, value)| {
+            let value_string = match value {
+                IdentifierValue::String(s) => s.clone(),
+                IdentifierValue::Number(n) => n.to_string(),
+                IdentifierValue::Boolean(b) => b.to_string(),
+                IdentifierValue::Array(arr) => serde_json::to_string(arr).unwrap_or_else(|_| "[]".to_string()),
+                IdentifierValue::Object(obj) => serde_json::to_string(obj).unwrap_or_else(|_| "{}".to_string()),
+            };
+
             let resource = resource::ActiveModel {
                 id: Set(Uuid::now_v7()),
                 group_id: Set(resource_group.id),
                 name: Set(name.to_string()),
-                value: Set(value.to_string()),
+                value: Set(value_string),
                 ..Default::default()
             };
             resource.insert(&txn)