From 1c098d9b04da7ad257923ccd62edc5ab4df4baa4 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 27 Jan 2021 15:05:05 +0100
Subject: [PATCH] :sparkles: Parse bigints as integers.

---
 backend/src/app/tokens.clj         | 2 +-
 frontend/src/app/util/transit.cljs | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/backend/src/app/tokens.clj b/backend/src/app/tokens.clj
index 1ca3ccee75..6885b858ae 100644
--- a/backend/src/app/tokens.clj
+++ b/backend/src/app/tokens.clj
@@ -24,7 +24,7 @@
 (defn- derive-tokens-secret
   [key]
   (when (= key "default")
-    (log/warn "Using default APP_SECRET_KEY, the system will generate insecure tokens."))
+    (log/warn "Using default PENPOT_SECRET_KEY, the system will generate insecure tokens."))
   (let [engine (bk/engine {:key key
                            :salt "tokens"
                            :alg :hkdf
diff --git a/frontend/src/app/util/transit.cljs b/frontend/src/app/util/transit.cljs
index 3936a96f68..4b63be68b2 100644
--- a/frontend/src/app/util/transit.cljs
+++ b/frontend/src/app/util/transit.cljs
@@ -37,6 +37,11 @@
 
 ;; --- Transit adapters
 
+(def bigint-read-handler
+  (t/read-handler
+   (fn [value]
+     (js/parseInt value 10))))
+
 (def point-write-handler
   (t/write-handler
    (constantly "point")
@@ -69,6 +74,7 @@
 
 (def ^:privare +read-handlers+
   {"u" uuid
+   "n" bigint-read-handler
    "ordered-set" ordered-set-read-handler
    "jsonblob" blob-read-handler
    "matrix" matrix-read-handler