move name validation to route deserialization

crates/api-common/Cargo.toml

@@ -15,6 +15,10 @@ serde = { version = "1.0.130", features = ["derive"] }
 bson = { version = "2.0.0", optional = true }
 derive_more = "0.99.17"
 serde_json = "1.0.59"
+rustrict = "0.1.30"
+regex = "1"
+lazy_static = "1.4.0"
+lettre = {version = "0.11.2", features = ["smtp-transport", "builder"]}
 # TODO: make this a dev dependency or a feature
 ts-rs = { version = "7.0", features = ["uuid-impl", "serde-compat"] }
 

crates/api-common/bindings/AuthorizedServiceHost.ts

@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 import type { ServiceHostScope } from "./ServiceHostScope";
 
-export interface AuthorizedServiceHost { url: string, id: string, visibility: ServiceHostScope, }
+export interface AuthorizedServiceHost { url: string, id: Name, visibility: ServiceHostScope, }

crates/api-common/bindings/CreateGroupData.ts

@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 import type { ServiceHost } from "./ServiceHost";
 
-export interface CreateGroupData { name: string, servicesHosts?: Array<ServiceHost>, }
+export interface CreateGroupData { name: Name, servicesHosts?: Array<ServiceHost>, }

crates/api-common/bindings/CreateLibraryData.ts

@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 
-export interface CreateLibraryData { name: string, notes: string, blocks: string, }
+export interface CreateLibraryData { name: Name, notes: string, blocks: string, }

crates/api-common/bindings/CreateProjectData.ts

@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ClientId } from "./ClientId";
+import type { Name } from "./Name";
 import type { RoleData } from "./RoleData";
 import type { SaveState } from "./SaveState";
 
-export interface CreateProjectData { owner?: string, name: string, roles?: Array<RoleData>, clientId?: ClientId, saveState?: SaveState, }
+export interface CreateProjectData { owner?: string, name: Name, roles?: Array<RoleData>, clientId?: ClientId, saveState?: SaveState, }

crates/api-common/bindings/Credentials.ts

@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 
-export type Credentials = { "Snap": { username: string, password: string, } } | { "NetsBlox": { username: string, password: string, } };
+export type Credentials = { "Snap": { username: string, password: string, } } | { "NetsBlox": { username: Name, password: string, } };

crates/api-common/bindings/EmailValidator.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EmailValidator = null;

crates/api-common/bindings/GroupNameValidator.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type GroupNameValidator = null;

crates/api-common/bindings/LibraryMetadata.ts

@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 import type { PublishState } from "./PublishState";
 
-export interface LibraryMetadata { owner: string, name: string, notes: string, state: PublishState, }
+export interface LibraryMetadata { owner: string, name: Name, notes: string, state: PublishState, }

crates/api-common/bindings/LibraryNameValidator.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type LibraryNameValidator = null;

crates/api-common/bindings/Name.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type Name = string;

crates/api-common/bindings/NewUser.ts

@@ -1,5 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { GroupId } from "./GroupId";
+import type { Name } from "./Name";
 import type { UserRole } from "./UserRole";
 
-export interface NewUser { username: string, email: string, password?: string, groupId?: GroupId, role?: UserRole, }
+export interface NewUser { username: Name, email: Name, password?: string, groupId?: GroupId, role?: UserRole, }

crates/api-common/bindings/Project.ts

@@ -1,8 +1,9 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 import type { ProjectId } from "./ProjectId";
 import type { PublishState } from "./PublishState";
 import type { RoleData } from "./RoleData";
 import type { RoleId } from "./RoleId";
 import type { SaveState } from "./SaveState";
 
-export interface Project { id: ProjectId, owner: string, name: string, updated: any, state: PublishState, collaborators: Array<string>, originTime: any, saveState: SaveState, roles: Record<RoleId, RoleData>, }
+export interface Project { id: ProjectId, owner: string, name: Name, updated: any, state: PublishState, collaborators: Array<string>, originTime: any, saveState: SaveState, roles: Record<RoleId, RoleData>, }

crates/api-common/bindings/ProjectMetadata.ts

@@ -1,9 +1,10 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 import type { NetworkTraceMetadata } from "./NetworkTraceMetadata";
 import type { ProjectId } from "./ProjectId";
 import type { PublishState } from "./PublishState";
 import type { RoleId } from "./RoleId";
 import type { RoleMetadata } from "./RoleMetadata";
 import type { SaveState } from "./SaveState";
 
-export interface ProjectMetadata { id: ProjectId, owner: string, name: string, updated: any, state: PublishState, collaborators: Array<string>, networkTraces: Array<NetworkTraceMetadata>, originTime: any, saveState: SaveState, roles: Record<RoleId, RoleMetadata>, }
+export interface ProjectMetadata { id: ProjectId, owner: string, name: Name, updated: any, state: PublishState, collaborators: Array<string>, networkTraces: Array<NetworkTraceMetadata>, originTime: any, saveState: SaveState, roles: Record<RoleId, RoleMetadata>, }

crates/api-common/bindings/ProjectNameValidator.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ProjectNameValidator = null;

crates/api-common/bindings/RoleData.ts

@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 
-export interface RoleData { name: string, code: string, media: string, }
+export interface RoleData { name: Name, code: string, media: string, }

crates/api-common/bindings/RoleMetadata.ts

@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 
-export interface RoleMetadata { name: string, code: string, media: string, }
+export interface RoleMetadata { name: Name, code: string, media: string, }

crates/api-common/bindings/RoleNameValidator.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type RoleNameValidator = null;

crates/api-common/bindings/RoleState.ts

@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 import type { OccupantState } from "./OccupantState";
 
-export interface RoleState { name: string, occupants: Array<OccupantState>, }
+export interface RoleState { name: Name, occupants: Array<OccupantState>, }

crates/api-common/bindings/RoomState.ts

@@ -1,6 +1,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 import type { ProjectId } from "./ProjectId";
 import type { RoleId } from "./RoleId";
 import type { RoleState } from "./RoleState";
 
-export interface RoomState { id: ProjectId, owner: string, name: string, roles: Record<RoleId, RoleState>, collaborators: Array<string>, version: bigint, }
+export interface RoomState { id: ProjectId, owner: string, name: Name, roles: Record<RoleId, RoleState>, collaborators: Array<string>, version: bigint, }

crates/api-common/bindings/ServiceIDValidator.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ServiceIDValidator = null;

crates/api-common/bindings/UpdateGroupData.ts

@@ -1,3 +1,4 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { Name } from "./Name";
 
-export interface UpdateGroupData { name: string, }
+export interface UpdateGroupData { name: Name, }

crates/api-common/bindings/UpdateProjectData.ts

@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ClientId } from "./ClientId";
+import type { Name } from "./Name";
 
-export interface UpdateProjectData { name: string, clientId?: ClientId, }
+export interface UpdateProjectData { name: Name, clientId?: ClientId, }

crates/api-common/bindings/UpdateRoleData.ts

@@ -1,4 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ClientId } from "./ClientId";
+import type { Name } from "./Name";
 
-export interface UpdateRoleData { name: string, clientId?: ClientId, }
+export interface UpdateRoleData { name: Name, clientId?: ClientId, }

crates/api-common/bindings/UsernameValidator.ts

@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type UsernameValidator = null;

crates/api-common/src/bson.rs

@@ -1,6 +1,7 @@
 use crate::{
     oauth, FriendInvite, FriendLinkState, GroupId, InvitationState, LinkedAccount, MagicLinkId,
-    ProjectId, PublishState, RoleMetadata, SaveState, ServiceHost, ServiceHostScope, UserRole,
+    Name, ProjectId, PublishState, RoleMetadata, SaveState, ServiceHost, ServiceHostScope,
+    UserRole,
 };
 use bson::{doc, Bson, DateTime};
 
@@ -93,6 +94,12 @@ impl From<GroupId> for Bson {
     }
 }
 
+impl<T: crate::Validate> From<Name<T>> for Bson {
+    fn from(name: Name<T>) -> Bson {
+        Bson::String(name.to_string())
+    }
+}
+
 impl From<InvitationState> for Bson {
     fn from(state: InvitationState) -> Bson {
         match state {
@@ -167,6 +174,8 @@ impl From<MagicLinkId> for Bson {
 
 #[cfg(test)]
 mod tests {
+    use bson::to_bson;
+
     use super::*;
 
     #[test]
@@ -184,4 +193,21 @@ mod tests {
         let scope: Result<ServiceHostScope, _> = serde_json::from_str(&data);
         assert!(scope.is_ok());
     }
+    #[test]
+    fn test_bson_serialize_update_project_data() {
+        let new_name = "new project";
+        let name = crate::ProjectName::new(new_name.to_string());
+
+        // Serialize the struct to BSON
+        let serialized = to_bson(&name).expect("Failed to serialize to BSON");
+        println!("Serialized BSON: {:?}", serialized);
+
+        // Deserialize the BSON back to the struct
+        let deserialized: crate::ProjectName =
+            bson::from_bson(serialized).expect("Failed to deserialize from BSON");
+        println!("Deserialized struct: {:?}", deserialized);
+
+        // Check that the deserialized value matches the original
+        assert_eq!(deserialized.as_str(), new_name);
+    }
 }