From 2d1d58f78f3bcdce5030da2eb2e67532f3ccff27 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 28 Jan 2020 12:06:52 +0100 Subject: [PATCH] feat(storage-key): add StorageKeyR to routes; minor Handler refactor --- routes | 3 ++- src/Handler/StorageKey.hs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/routes b/routes index 0d000a959..753ea445a 100644 --- a/routes +++ b/routes @@ -73,6 +73,7 @@ /user/set-display-email SetDisplayEmailR GET POST !free /user/csv-options CsvOptionsR GET POST !free /user/lang LangR POST !free +/user/storage-key StorageKeyR POST !free /exam-office ExamOfficeR !exam-office: / EOExamsR GET @@ -221,4 +222,4 @@ !/#UUID CryptoUUIDDispatchR GET !free -- just redirect -- !/*{CI FilePath} CryptoFileNameDispatchR GET !free -- Disabled until preliminary check for valid cID exists -!/*WellKnownFileName WellKnownR GET !free \ No newline at end of file +!/*WellKnownFileName WellKnownR GET !free diff --git a/src/Handler/StorageKey.hs b/src/Handler/StorageKey.hs index dc18f2047..4589364eb 100644 --- a/src/Handler/StorageKey.hs +++ b/src/Handler/StorageKey.hs @@ -70,7 +70,7 @@ postStorageKeyR = do ikm = (toStrict . Aeson.encode) (skReqType, uid, sbKey) key = HKDF.expand (HKDF.extract salt ikm :: HKDF.PRK SHA3_256) (toStrict $ Binary.encode (timestamp,skReqLength)) skReqLength - sendResponseStatus ok200 $ toJSON StorageKeyResponse + return $ toJSON StorageKeyResponse { skResKey = (decodeUtf8 . Base64.encode) key , skResTimestamp = timestamp , skResSalt = (decodeUtf8 . Base64.encode) salt