Initial organizations functionality: Creating orgs and inviting users

src/db/models/collection.rs

@@ -1,4 +1,3 @@
-use chrono::{NaiveDateTime, Utc};
 use serde_json::Value as JsonValue;
 
 use uuid::Uuid;
@@ -18,8 +17,6 @@ pub struct Collection {
 /// Local methods
 impl Collection {
     pub fn new(org_uuid: String, name: String) -> Self {
-        let now = Utc::now().naive_utc();
-
         Self {
             uuid: Uuid::new_v4().to_string(),
 
@@ -46,8 +43,6 @@ use db::schema::collections;
 /// Database methods
 impl Collection {
     pub fn save(&mut self, conn: &DbConn) -> bool {
-        self.updated_at = Utc::now().naive_utc();
-
         match diesel::replace_into(collections::table)
             .values(&*self)
             .execute(&**conn) {

src/db/models/device.rs

@@ -40,7 +40,7 @@ impl Device {
         }
     }
 
-    pub fn refresh_tokens(&mut self, user: &super::User) -> (String, i64) {
+    pub fn refresh_tokens(&mut self, user: &super::User, orgs: Vec<super::UserOrganization>) -> (String, i64) {
         // If there is no refresh token, we create one
         if self.refresh_token.is_empty() {
             use data_encoding::BASE64URL;
@@ -51,9 +51,14 @@ impl Device {
 
         // Update the expiration of the device and the last update date
         let time_now = Utc::now().naive_utc();
-
         self.updated_at = time_now;
 
+
+        let orgowner: Vec<_> = orgs.iter().filter(|o| o.type_ == 0).map(|o| o.org_uuid.clone()).collect();
+        let orgadmin: Vec<_> = orgs.iter().filter(|o| o.type_ == 1).map(|o| o.org_uuid.clone()).collect();
+        let orguser: Vec<_> = orgs.iter().filter(|o| o.type_ == 2).map(|o| o.org_uuid.clone()).collect();
+
+
         // Create the JWT claims struct, to send to the client
         use auth::{encode_jwt, JWTClaims, DEFAULT_VALIDITY, JWT_ISSUER};
         let claims = JWTClaims {
@@ -61,16 +66,23 @@ impl Device {
             exp: (time_now + *DEFAULT_VALIDITY).timestamp(),
             iss: JWT_ISSUER.to_string(),
             sub: user.uuid.to_string(),
+
             premium: true,
             name: user.name.to_string(),
             email: user.email.to_string(),
             email_verified: true,
+
+            orgowner,
+            orgadmin,
+            orguser,
+
             sstamp: user.security_stamp.to_string(),
             device: self.uuid.to_string(),
             scope: vec!["api".into(), "offline_access".into()],
             amr: vec!["Application".into()],
         };
 
+
         (encode_jwt(&claims), DEFAULT_VALIDITY.num_seconds())
     }
 }

src/db/models/mod.rs

@@ -4,8 +4,16 @@ mod device;
 mod folder;
 mod user;
 
+mod collection;
+mod organization;
+
 pub use self::attachment::Attachment;
 pub use self::cipher::Cipher;
 pub use self::device::Device;
 pub use self::folder::Folder;
 pub use self::user::User;
+
+pub use self::collection::Collection;
+pub use self::organization::Organization;
+
+pub use self::organization::{UserOrganization, UserOrgStatus, UserOrgType};

src/db/models/org/organization.rs

@@ -1,116 +0,0 @@
-use chrono::{NaiveDateTime, Utc};
-use serde_json::Value as JsonValue;
-
-use uuid::Uuid;
-
-#[derive(Debug, Identifiable, Queryable, Insertable)]
-#[table_name = "organizations"]
-#[primary_key(uuid)]
-pub struct Organization {
-    pub uuid: String,
-    pub name: String,
-    pub billing_email: String,
-
-    pub key: String,
-}
-
-/// Local methods
-impl Organization {
-    pub fn new(name: String, billing_email: String, key: String) -> Self {
-        let now = Utc::now().naive_utc();
-
-        Self {
-            uuid: Uuid::new_v4().to_string(),
-
-            name,
-            billing_email,
-            key,
-        }
-    }
-
-    pub fn to_json(&self) -> JsonValue {
-        json!({
-            "Id": self.uuid,
-            "Name": self.name,
-
-            "BusinessName": null,
-            "BusinessAddress1":	null,
-            "BusinessAddress2":	null,
-            "BusinessAddress3":	null,
-            "BusinessCountry": null,
-            "BusinessTaxNumber": null,
-            "BillingEmail":self.billing_email,
-            "Plan": "Free",
-            "PlanType": 0, // Free plan
-
-            "Seats": 10,
-            "MaxCollections": 10,
-
-            "UseGroups": false,
-            "UseDirectory": false,
-            "UseEvents": false,
-            "UseTotp": false,
-
-            "Object": "organization",
-        })
-    }
-
-    pub fn to_json_profile(&self) -> JsonValue {
-        json!({
-            "Id": self.uuid,
-            "Name": self.name,
-
-            "Seats": 10,
-            "MaxCollections": 10,
-
-            "UseGroups": false,
-            "UseDirectory": false,
-            "UseEvents": false,
-            "UseTotp": false,
-
-            "MaxStorageGb": null,
-
-            // These are probably per user
-            "Key": self.key,
-            "Status": 2, // Confirmed
-            "Type": 0, // Owner
-            "Enabled": true,
-
-            "Object": "profileOrganization",
-        })
-    }
-}
-
-use diesel;
-use diesel::prelude::*;
-use db::DbConn;
-use db::schema::organizations;
-
-/// Database methods
-impl Organization {
-    pub fn save(&mut self, conn: &DbConn) -> bool {
-        self.updated_at = Utc::now().naive_utc();
-
-        match diesel::replace_into(organizations::table)
-            .values(&*self)
-            .execute(&**conn) {
-            Ok(1) => true, // One row inserted
-            _ => false,
-        }
-    }
-
-    pub fn delete(self, conn: &DbConn) -> bool {
-        match diesel::delete(organizations::table.filter(
-            organizations::uuid.eq(self.uuid)))
-            .execute(&**conn) {
-            Ok(1) => true, // One row deleted
-            _ => false,
-        }
-    }
-
-    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Self> {
-        organizations::table
-            .filter(organizations::uuid.eq(uuid))
-            .first::<Self>(&**conn).ok()
-    }
-}

src/db/models/organization.rs

@@ -0,0 +1,214 @@
+use serde_json::Value as JsonValue;
+
+use uuid::Uuid;
+
+#[derive(Debug, Identifiable, Queryable, Insertable)]
+#[table_name = "organizations"]
+#[primary_key(uuid)]
+pub struct Organization {
+    pub uuid: String,
+    pub name: String,
+    pub billing_email: String,
+}
+
+#[derive(Debug, Identifiable, Queryable, Insertable)]
+#[table_name = "users_organizations"]
+#[primary_key(uuid)]
+pub struct UserOrganization {
+    pub uuid: String,
+    pub user_uuid: String,
+    pub org_uuid: String,
+
+    pub access_all: bool,
+    pub key: String,
+    pub status: i32,
+    pub type_: i32,
+}
+
+pub enum UserOrgStatus {
+    Invited = 0,
+    Accepted = 1,
+    Confirmed = 2,
+}
+
+pub enum UserOrgType {
+    Owner = 0,
+    Admin = 1,
+    User = 2,
+}
+
+/// Local methods
+impl Organization {
+    pub fn new(name: String, billing_email: String) -> Self {
+        Self {
+            uuid: Uuid::new_v4().to_string(),
+
+            name,
+            billing_email,
+        }
+    }
+
+    pub fn to_json(&self) -> JsonValue {
+        json!({
+            "Id": self.uuid,
+            "Name": self.name,
+            "Seats": 10,
+            "MaxCollections": 10,
+
+            "Use2fa": false,
+            "UseDirectory": false,
+            "UseEvents": false,
+            "UseGroups": false,
+            "UseTotp": false,
+
+            "BusinessName": null,
+            "BusinessAddress1":	null,
+            "BusinessAddress2":	null,
+            "BusinessAddress3":	null,
+            "BusinessCountry": null,
+            "BusinessTaxNumber": null,
+
+            "BillingEmail": self.billing_email,
+            "Plan": "Free",
+            "PlanType": 0, // Free plan
+
+            "Object": "organization",
+        })
+    }
+}
+
+impl UserOrganization {
+    pub fn new(user_uuid: String, org_uuid: String) -> Self {
+        Self {
+            uuid: Uuid::new_v4().to_string(),
+
+            user_uuid,
+            org_uuid,
+
+            access_all: false,
+            key: String::new(),
+            status: UserOrgStatus::Accepted as i32,
+            type_: UserOrgType::User as i32,
+        }
+    }
+}
+
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::organizations;
+use db::schema::users_organizations;
+
+/// Database methods
+impl Organization {
+    pub fn save(&mut self, conn: &DbConn) -> bool {
+        match diesel::replace_into(organizations::table)
+            .values(&*self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn delete(self, conn: &DbConn) -> bool {
+        match diesel::delete(organizations::table.filter(
+            organizations::uuid.eq(self.uuid)))
+            .execute(&**conn) {
+            Ok(1) => true, // One row deleted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Self> {
+        organizations::table
+            .filter(organizations::uuid.eq(uuid))
+            .first::<Self>(&**conn).ok()
+    }
+}
+
+impl UserOrganization {
+    pub fn to_json(&self, conn: &DbConn) -> JsonValue {
+        let org = Organization::find_by_uuid(&self.org_uuid, conn).unwrap();
+
+        json!({
+            "Id": self.org_uuid,
+            "Name": org.name,
+            "Seats": 10,
+            "MaxCollections": 10,
+
+            "Use2fa": false,
+            "UseDirectory": false,
+            "UseEvents": false,
+            "UseGroups": false,
+            "UseTotp": false,
+
+            "MaxStorageGb": null,
+
+            // These are per user
+            "Key": self.key,
+            "Status": self.status,
+            "Type": self.type_,
+            "Enabled": true,
+
+            "Object": "profileOrganization",
+        })
+    }
+
+    pub fn to_json_details(&self, conn: &DbConn) -> JsonValue {
+        use super::User;
+        let user = User::find_by_uuid(&self.user_uuid, conn).unwrap();
+
+        json!({
+            "Id": self.uuid,
+            "UserId": user.uuid,
+            "Name": user.name,
+            "Email": user.email,
+
+            "Status": self.status,
+            "Type": self.type_,
+            "AccessAll": true,
+
+            "Object": "organizationUserUserDetails",
+        })
+    }
+
+    pub fn save(&mut self, conn: &DbConn) -> bool {
+        match diesel::replace_into(users_organizations::table)
+            .values(&*self)
+            .execute(&**conn) {
+            Ok(1) => true, // One row inserted
+            _ => false,
+        }
+    }
+
+    pub fn delete(self, conn: &DbConn) -> bool {
+        match diesel::delete(users_organizations::table.filter(
+            users_organizations::uuid.eq(self.uuid)))
+            .execute(&**conn) {
+            Ok(1) => true, // One row deleted
+            _ => false,
+        }
+    }
+
+    pub fn find_by_user(user_uuid: &str, conn: &DbConn) -> Vec<Self> {
+        users_organizations::table
+            .filter(users_organizations::user_uuid.eq(user_uuid))
+            .load::<Self>(&**conn).expect("Error loading user organizations")
+    }
+
+    pub fn find_by_org(org_uuid: &str, conn: &DbConn) -> Vec<Self> {
+        users_organizations::table
+            .filter(users_organizations::org_uuid.eq(org_uuid))
+            .load::<Self>(&**conn).expect("Error loading user organizations")
+    }
+
+    pub fn find_by_user_and_org(user_uuid: &str, org_uuid: &str, conn: &DbConn) -> Option<Self> {
+        users_organizations::table
+            .filter(users_organizations::user_uuid.eq(user_uuid))
+            .filter(users_organizations::org_uuid.eq(org_uuid))
+            .first::<Self>(&**conn).ok()
+    }
+}
+
+

src/db/models/user.rs

@@ -115,8 +115,21 @@ impl User {
             true
         }
     }
+}
+
+use diesel;
+use diesel::prelude::*;
+use db::DbConn;
+use db::schema::users;
+
+/// Database methods
+impl User {
+    pub fn to_json(&self, conn: &DbConn) -> JsonValue {
+        use super::UserOrganization;
+
+        let orgs = UserOrganization::find_by_user(&self.uuid, conn);
+        let orgs_json: Vec<JsonValue> = orgs.iter().map(|c| c.to_json(&conn)).collect();
 
-    pub fn to_json(&self) -> JsonValue {
         json!({
             "Id": self.uuid,
             "Name": self.name,
@@ -129,19 +142,12 @@ impl User {
             "Key": self.key,
             "PrivateKey": self.private_key,
             "SecurityStamp": self.security_stamp,
-            "Organizations": [],
+            "Organizations": orgs_json,
             "Object": "profile"
         })
     }
-}
 
-use diesel;
-use diesel::prelude::*;
-use db::DbConn;
-use db::schema::users;
 
-/// Database methods
-impl User {
     pub fn save(&mut self, conn: &DbConn) -> bool {
         self.updated_at = Utc::now().naive_utc();
 

src/db/schema.rs

@@ -95,9 +95,11 @@ table! {
 }
 
 table! {
-    users_organizations (user_uuid, org_uuid) {
+    users_organizations (uuid) {
+        uuid -> Text,
         user_uuid -> Text,
         org_uuid -> Text,
+        access_all -> Bool,
         key -> Text,
         status -> Integer,
         #[sql_name = "type"]