From f2863537c84fccb2f84b634fb8e76392b75442da Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Wed, 21 Aug 2024 21:38:36 +0200
Subject: [PATCH] feat: add session service, version bump

---
 Cargo.toml            | 10 +++++-----
 build.rs              |  1 +
 proto/auth.proto      | 19 +++++++++----------
 proto/common.proto    | 11 ++++++++---
 proto/session.proto   | 28 ++++++++++++++++++++++++++++
 proto/workspace.proto | 23 +++++++++--------------
 src/lib.rs            | 10 ++++++++++
 7 files changed, 70 insertions(+), 32 deletions(-)
 create mode 100644 proto/session.proto

diff --git a/Cargo.toml b/Cargo.toml
index 80314bb..5f2aaed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "codemp-proto"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 
 [lib]
 name = "codemp_proto"
 
 [dependencies]
-prost = "0.12.3"
-tonic = "0.11.0"
-uuid = "1.7.0"
+prost = "0.13"
+tonic = "0.12"
+uuid = "1.7"
 
 [build-dependencies]
-tonic-build = "0.11.0"
+tonic-build = "0.12"
diff --git a/build.rs b/build.rs
index 98c52ca..46b91c0 100644
--- a/build.rs
+++ b/build.rs
@@ -5,6 +5,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 			"proto/cursor.proto",
 			"proto/files.proto",
 			"proto/auth.proto",
+			"proto/session.proto",
 			"proto/workspace.proto",
 			"proto/buffer.proto",
 		],
diff --git a/proto/auth.proto b/proto/auth.proto
index 0f8c53a..9d69b71 100644
--- a/proto/auth.proto
+++ b/proto/auth.proto
@@ -2,19 +2,18 @@ syntax = "proto2";
 
 package auth;
 
-// authenticates users, issuing tokens
+import "common.proto";
+
+// service entrypoint, authenticate users and grant initial token
 service Auth {
-	// send credentials and join a workspace, returns ready to use token
-	rpc Login (WorkspaceJoinRequest) returns (Token);
+	// send credentials, returns empty valid token
+	rpc Login (LoginRequest) returns (common.Token);
+
+	// if given token has just expired, get a new valid one
+	rpc Refresh (common.Token) returns (common.Token);
 }
 
-message Token {
-	required string token = 1;
-}
-
-// TODO one-request-to-do-it-all from login to workspace access
-message WorkspaceJoinRequest {
+message LoginRequest {
 	required string username = 1;
 	required string password = 2;
-	optional string workspace_id = 3;
 }
diff --git a/proto/common.proto b/proto/common.proto
index 0b45c4d..707b814 100644
--- a/proto/common.proto
+++ b/proto/common.proto
@@ -2,15 +2,20 @@ syntax = "proto2";
 
 package common;
 
+// authentication token, probably a JWT but should be treated as a raw string
+message Token {
+	required string token = 1;
+}
+
 // a wrapper payload representing an uuid
 message Identity {
 	required uint64 hi = 1;
 	required uint64 lo = 2;
 }
 
-// a collection of identities
-message IdentityList {
-	repeated Identity users = 1;
+message User {
+	required Identity id = 1;
+	optional string name = 2;
 }
 
 //generic Empty message
diff --git a/proto/session.proto b/proto/session.proto
new file mode 100644
index 0000000..d6099c9
--- /dev/null
+++ b/proto/session.proto
@@ -0,0 +1,28 @@
+syntax = "proto2";
+
+package session;
+
+import "common.proto";
+
+// manage user workspaces, refresh tokens
+service Session {
+	rpc AccessWorkspace (WorkspaceRequest) returns (common.Token);
+	rpc CreateWorkspace (WorkspaceRequest) returns (common.Empty);
+	rpc DeleteWorkspace (WorkspaceRequest) returns (common.Empty);
+	rpc ListWorkspaces (common.Empty) returns (WorkspaceList);
+	rpc InviteToWorkspace (InviteRequest) returns (common.Empty);
+}
+
+message WorkspaceRequest {
+	required string workspace = 1;
+}
+
+message WorkspaceList {
+	repeated string owned = 1;
+	repeated string invited = 2;
+}
+
+message InviteRequest {
+	required string user = 1;
+	required string workspace = 2;
+}
diff --git a/proto/workspace.proto b/proto/workspace.proto
index bd7aaf2..b5fcee7 100644
--- a/proto/workspace.proto
+++ b/proto/workspace.proto
@@ -4,26 +4,29 @@ package workspace;
 
 import "common.proto";
 import "files.proto";
-import "auth.proto";
 
 service Workspace {
 	rpc Attach (common.Empty) returns (stream WorkspaceEvent);
 	
 	rpc CreateBuffer (files.BufferNode) returns (common.Empty);
-	rpc AccessBuffer (files.BufferNode) returns (BufferCredentials);
+	rpc AccessBuffer (files.BufferNode) returns (common.Token);
 	rpc DeleteBuffer (files.BufferNode) returns (common.Empty);
 
 	rpc ListBuffers (common.Empty) returns (files.BufferTree); 
-	rpc ListUsers (common.Empty) returns (common.IdentityList);
-	rpc ListBufferUsers (files.BufferNode) returns (common.IdentityList);
+	rpc ListUsers (common.Empty) returns (UserList);
+	rpc ListBufferUsers (files.BufferNode) returns (UserList);
+}
+
+message UserList {
+	repeated common.User users = 1;
 }
 
 message WorkspaceEvent {
 	message UserJoin {
-		required common.Identity user = 1;
+		required common.User user = 1;
 	}
 	message UserLeave {
-		required common.Identity user = 1;
+		required common.User user = 1;
 	}
 	message FileCreate {
 		required string path = 1;
@@ -44,11 +47,3 @@ message WorkspaceEvent {
 		FileDelete delete = 5;
 	}
 }
-
-// TODO this is very ugly because we can't just return a new token (which is already smelly but whatev), we also need to tell the underlying id so that
-//	the client can put it as metadata while attaching, because it can't really know the underlying id that the server is using for each buffer without
-//	parsing the token itself. meehhhhhh, this bleeds underlying implementation to the upper levels, how can we avoid this??
-message BufferCredentials {
-	required common.Identity id = 1;
-	required auth.Token token = 2;
-}
diff --git a/src/lib.rs b/src/lib.rs
index fed3963..de32518 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,6 +27,12 @@ pub mod common {
 			uuid::Uuid::from_u64_pair(value.hi, value.lo)
 		}
 	}
+
+	impl Identity {
+		pub fn uuid(&self) -> uuid::Uuid {
+			uuid::Uuid::from(self)
+		}
+	}
 }
 
 pub mod files {
@@ -87,6 +93,10 @@ pub mod workspace {
 	tonic::include_proto!("workspace");
 }
 
+pub mod session {
+	tonic::include_proto!("session");
+}
+
 pub mod auth {
 	tonic::include_proto!("auth");
 }