From cf3853263af9cbc6c484976edcd95b230130f4b8 Mon Sep 17 00:00:00 2001
From: Nadja Reitzenstein <me@dequbed.space>
Date: Tue, 31 Jan 2023 16:16:00 +0100
Subject: [PATCH] Make spacename/instanceurl required and enable card interface

---
 bffhd/capnp/user.rs   | 1 +
 bffhd/config/dhall.rs | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bffhd/capnp/user.rs b/bffhd/capnp/user.rs
index 31bd885..72d540e 100644
--- a/bffhd/capnp/user.rs
+++ b/bffhd/capnp/user.rs
@@ -73,6 +73,7 @@ impl User {
         }
         if session.has_perm(Permission::new("bffh.users.admin")) {
             builder.set_admin(capnp_rpc::new_client(client.clone()));
+            builder.set_card_d_e_s_fire_e_v2(capnp_rpc::new_client(client));
         }
     }
 }
diff --git a/bffhd/config/dhall.rs b/bffhd/config/dhall.rs
index efb1ecd..8fb3bd9 100644
--- a/bffhd/config/dhall.rs
+++ b/bffhd/config/dhall.rs
@@ -97,11 +97,9 @@ pub struct Config {
     #[serde(default, skip)]
     pub logging: LogConfig,
 
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub spacename: Option<String>,
+    pub spacename: String,
 
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub instanceurl: Option<String>,
+    pub instanceurl: String,
 }
 
 impl Config {