hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'

Browse source 
Backport moving out keys from user info to 1.1

See merge request pleroma/pleroma!1801
This commit is contained in:
rinpatch 2019-10-06 15:32:33 +00:00
commit b5e6ba323d
9 changed files with 34 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/signature_test.exs
View file

@ -80,7 +80,7 @@ defmodule Pleroma.SignatureTest do
user =
insert(:user, %{
ap_id: "https://mastodon.social/users/lambadalambda",
info: %{keys: @private_key}
keys: @private_key
})
assert Signature.sign(
@ -94,8 +94,7 @@ defmodule Pleroma.SignatureTest do
end
test "it returns error" do
user =
insert(:user, %{ap_id: "https://mastodon.social/users/lambadalambda", info: %{keys: ""}})
user = insert(:user, %{ap_id: "https://mastodon.social/users/lambadalambda", keys: ""})
assert Signature.sign(
user,

8
test/user_test.exs
View file

@ -1408,15 +1408,15 @@ defmodule Pleroma.UserTest do
describe "ensure_keys_present" do
test "it creates keys for a user and stores them in info" do
user = insert(:user)
refute is_binary(user.info.keys)
refute is_binary(user.keys)
{:ok, user} = User.ensure_keys_present(user)
assert is_binary(user.info.keys)
assert is_binary(user.keys)
end
test "it doesn't create keys if there already are some" do
user = insert(:user, %{info: %{keys: "xxx"}})
user = insert(:user, keys: "xxx")
{:ok, user} = User.ensure_keys_present(user)
assert user.info.keys == "xxx"
assert user.keys == "xxx"
end
end