Merge branch 'live' into omni-worker-1

1 files changed, 13 insertions, 1 deletions

diff --git a/Biz/Dragons.hs b/Biz/Dragons.hs
index 7ba7fa0..cfe211e 100755
--- a/Biz/Dragons.hs
+++ b/Biz/Dragons.hs
@@ -742,7 +742,19 @@ startup quiet = do
   cfg <- Envy.decodeWithDefaults Envy.defConfig
   oAuthArgs <- Envy.decodeWithDefaults Envy.defConfig
   kp <- Acid.openLocalStateFrom (keep cfg) init :: IO (Acid.AcidState Keep)
-  jwk <- Auth.generateKey -- TODO: store this in a file somewhere
+  let jwkPath = keep cfg </> "jwk.json"
+  jwkExists <- Directory.doesFileExist jwkPath
+  jwk <-
+    if jwkExists
+      then do
+        maybeKey <- Aeson.decodeFileStrict jwkPath
+        case maybeKey of
+          Nothing -> panic <| "Could not decode JWK from " <> str jwkPath
+          Just k -> pure k
+      else do
+        k <- Auth.generateKey
+        Aeson.encodeFile jwkPath k
+        pure k
   let url = case homeExample cfg of
         ForgeURL u -> u
         CLISubmission -> "<CLISubmission>"