From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 19 Jul 2020 18:00:33 +0000 (+0100)
Subject: wip spec
X-Git-Tag: otter-0.2.0~1284
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=35ad89b4ddbe329cec11e6ed7453599e35fbcc37;p=otter.git

wip spec
---

diff --git a/src/global.rs b/src/global.rs
index 95f0d11c..6136b1a3 100644
--- a/src/global.rs
+++ b/src/global.rs
@@ -276,7 +276,7 @@ impl AccessId for ClientId {
 
 impl RawToken {
   #[throws(OE)]
-  fn new_random() -> Self {
+  pub fn new_random() -> Self {
     let mut rng = thread_rng();
     let token = RawToken (
       repeat_with(|| rng.sample(Alphanumeric))
diff --git a/src/lib.rs b/src/lib.rs
index 3c2d8cd2..482792f6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,4 +12,5 @@ pub mod error;
 pub mod http;
 pub mod session;
 pub mod api;
+pub mod spec;
 #[path="slotmap-slot-idx.rs"] pub mod slotmap_slot_idx;
diff --git a/src/session.rs b/src/session.rs
index 2253c2a5..a1ac516f 100644
--- a/src/session.rs
+++ b/src/session.rs
@@ -55,7 +55,7 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
       g : iad.g.clone(),
       ident : client,
     };
-    let ctoken = record_token(&mut ig, ciad);
+    let ctoken = record_token(&mut ig, ciad)?;
     let ig = &mut *ig;
 
     let mut uses = vec![];
diff --git a/src/spec.rs b/src/spec.rs
new file mode 100644
index 00000000..02889209
--- /dev/null
+++ b/src/spec.rs
@@ -0,0 +1,18 @@
+
+#![allow(dead_code)]
+
+use crate::imports::*;
+
+struct GameSpec {
+  players : Vec<PlayerSpec>
+}
+
+struct PlayerSpec {
+  nick: String,
+  access: Box<dyn PlayerAccessSpec>,
+}
+
+trait PlayerAccessSpec {
+  #[throws(OE)]
+  fn make_token(&self) -> RawToken { RawToken::new_random()? }
+}