aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-11-18 19:33:43 +0100
committerlain <lain@soykaf.club>2018-11-18 19:33:43 +0100
commite7cd6e97394a80ed3ef794e801183cc0635f8a15 (patch)
treedc3b26eccfb18e678c12d77abe09fd40bfebffaa /lib/pleroma/web
parentfc3bcf335e2c5ba1f8b1b25c1a4869cefff2a431 (diff)
downloadpleroma-e7cd6e97394a80ed3ef794e801183cc0635f8a15.tar.gz
Fix setting of keys.
Diffstat (limited to 'lib/pleroma/web')
-rw-r--r--lib/pleroma/web/web_finger/web_finger.ex14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 9f554d286..18cdc057e 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -113,16 +113,20 @@ defmodule Pleroma.Web.WebFinger do
# This seems a better fit in Salmon
def ensure_keys_present(user) do
- info = user.info || %{}
+ info = user.info
- if info["keys"] do
+ if info.keys do
{:ok, user}
else
{:ok, pem} = Salmon.generate_rsa_pem()
- info = Map.put(info, "keys", pem)
- Ecto.Changeset.change(user, info: info)
- |> User.update_and_set_cache()
+ info_cng = info
+ |> Pleroma.User.Info.set_keys(pem)
+
+ cng = Ecto.Changeset.change(user)
+ |> Ecto.Changeset.put_embed(:info, info_cng)
+
+ User.update_and_set_cache(cng)
end
end