Improve admin views (2)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2022-01-14 18:10:50 +01:00
parent ca6ef9b06b
commit 6e5061250c
108 changed files with 12041 additions and 2526 deletions

View File

@@ -1,14 +1,14 @@
defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
use Mobilizon.Web.ConnCase
use Bamboo.Test
import Mobilizon.Factory
alias Mobilizon.Actors.Actor
alias Mobilizon.Events.Event
alias Mobilizon.Federation.ActivityPub.Relay
alias Mobilizon.Reports.{Note, Report}
alias Mobilizon.Users.User
alias Mobilizon.Federation.ActivityPub.Relay
alias Mobilizon.Web.Email
alias Mobilizon.GraphQL.{AbsintheHelpers, API}
@@ -480,11 +480,11 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
end
test "unless user isn't admin", %{conn: conn} do
admin = insert(:user)
user = insert(:user)
res =
conn
|> auth_conn(admin)
|> auth_conn(user)
|> AbsintheHelpers.graphql_query(
query: @update_instance_admin_settings_mutation,
variables: %{"instanceName" => @new_instance_name, "registrationsOpen" => false}
@@ -494,4 +494,244 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
"You need to be logged-in and an administrator to save admin settings"
end
end
@admin_update_user """
mutation AdminUpdateUser($id: ID!, $email: String, $role: UserRole, $confirmed: Boolean, $notify: Boolean) {
adminUpdateUser(id: $id, email: $email, role: $role, confirmed: $confirmed, notify: $notify) {
id
email
role
confirmedAt
}
}
"""
describe "Resolver: Update an user email" do
setup do
admin = insert(:user, role: :administrator)
user = insert(:user)
{:ok, admin: admin, user: user}
end
test "when not an admin", %{conn: conn, user: user} do
admin = insert(:user)
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "email" => "new@email.com"}
)
assert hd(res["errors"])["message"] ==
"You need to be logged-in and an administrator to edit an user's details"
end
test "when putting same email", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "email" => user.email}
)
assert hd(res["errors"])["message"] ==
"The new email must be different"
end
test "with an invalid email", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "email" => "not an email"}
)
assert hd(res["errors"])["message"] ==
"The new email doesn't seem to be valid"
end
test "with a valid email, and no notification", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "email" => "new@email.com", "notify" => false}
)
refute_delivered_email(
Email.Admin.user_email_change_old(%User{user | email: "new@email.com"}, user.email)
)
refute_delivered_email(
Email.Admin.user_email_change_new(%User{user | email: "new@email.com"}, user.email)
)
assert res["errors"] == nil
assert res["data"]["adminUpdateUser"]["email"] == "new@email.com"
end
test "with a valid email, and notification", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "email" => "new@email.com", "notify" => true}
)
assert_delivered_email(
Email.Admin.user_email_change_old(%User{user | email: "new@email.com"}, user.email)
)
assert_delivered_email(
Email.Admin.user_email_change_new(%User{user | email: "new@email.com"}, user.email)
)
assert res["errors"] == nil
assert res["data"]["adminUpdateUser"]["email"] == "new@email.com"
end
end
describe "Resolver: Update an user role" do
setup do
admin = insert(:user, role: :administrator)
user = insert(:user)
{:ok, admin: admin, user: user}
end
test "when putting same role", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "role" => String.upcase(to_string(user.role))}
)
assert hd(res["errors"])["message"] ==
"The new role must be different"
end
test "with an invalid role", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "role" => "not a valid role"}
)
assert hd(res["errors"])["message"] ==
"Argument \"role\" has invalid value $role."
end
test "with a valid role, and no notification", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "role" => "MODERATOR", "notify" => false}
)
refute_delivered_email(
Email.Admin.user_role_change(%User{user | role: :moderator}, user.role)
)
assert res["errors"] == nil
assert res["data"]["adminUpdateUser"]["role"] == "MODERATOR"
end
test "with a valid role, and notification", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "role" => "MODERATOR", "notify" => true}
)
assert_delivered_email(
Email.Admin.user_role_change(%User{user | role: :moderator}, user.role)
)
assert res["errors"] == nil
assert res["data"]["adminUpdateUser"]["role"] == "MODERATOR"
end
end
describe "Resolver: Confirm an user" do
setup do
admin = insert(:user, role: :administrator)
user = insert(:user)
{:ok, admin: admin, user: user}
end
test "already confirmed", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "confirmed" => true, "notify" => false}
)
refute_delivered_email(Email.Admin.user_confirmation(user))
assert hd(res["errors"])["message"] == "Can't confirm an already confirmed user"
end
test "while unconfirming", %{conn: conn, user: user, admin: admin} do
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "confirmed" => false, "notify" => false}
)
refute_delivered_email(Email.Admin.user_confirmation(user))
assert hd(res["errors"])["message"] == "Deconfirming users is not supported"
end
test "while confirming, and no notification", %{conn: conn, admin: admin} do
user = insert(:user, confirmed_at: nil)
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "confirmed" => true, "notify" => false}
)
refute_delivered_email(Email.Admin.user_confirmation(user))
assert res["errors"] == nil
refute res["data"]["adminUpdateUser"]["confirmedAt"] == nil
end
test "while confirming, and notification", %{conn: conn, admin: admin} do
user = insert(:user, confirmed_at: nil)
res =
conn
|> auth_conn(admin)
|> AbsintheHelpers.graphql_query(
query: @admin_update_user,
variables: %{"id" => user.id, "confirmed" => true, "notify" => true}
)
assert_delivered_email(Email.Admin.user_confirmation(user))
assert res["errors"] == nil
refute res["data"]["adminUpdateUser"]["confirmedAt"] == nil
end
end
end

View File

@@ -35,8 +35,22 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
"""
@list_users_query """
query ListUsers($page: Int, $limit: Int, $sort: SortableUserField, $direction: SortDirection) {
users(page: $page, limit: $limit, sort: $sort, direction: $direction) {
query ListUsers(
$email: String
$currentSignInIp: String
$page: Int
$limit: Int
$sort: SortableUserField
$direction: SortDirection
) {
users(
email: $email
currentSignInIp: $currentSignInIp
page: $page
limit: $limit
sort: $sort
direction: $direction
) {
total,
elements {
email
@@ -262,6 +276,62 @@ defmodule Mobilizon.GraphQL.Resolvers.UserTest do
"riri@example.com"
]
end
test "list_users/3 allows filtering the list of users by email", %{conn: conn} do
user = insert(:user, email: "donald@somewhere.fr", role: :moderator)
insert(:user, email: "riri@only.fr")
insert(:user, email: "fifi@we.fr")
insert(:user, email: "loulou@know.com")
res =
conn
|> auth_conn(user)
|> AbsintheHelpers.graphql_query(
query: @list_users_query,
variables: %{email: "e.fr"}
)
assert res["errors"] == nil
assert res["data"]["users"]["total"] == 2
assert res["data"]["users"]["elements"] |> length == 2
assert res["data"]["users"]["elements"]
|> Enum.map(& &1["email"]) == [
"fifi@we.fr",
"donald@somewhere.fr"
]
end
test "list_users/3 allows filtering the list of users by currentSignInIp", %{conn: conn} do
user =
insert(:user,
email: "donald@somewhere.fr",
current_sign_in_ip: "144.76.131.212",
role: :moderator
)
insert(:user, email: "riri@only.fr", current_sign_in_ip: "94.130.212.178")
insert(:user, email: "fifi@we.fr", current_sign_in_ip: "2a01:4f8:221:131d::178")
insert(:user, email: "loulou@know.com", current_sign_in_ip: "144.76.131.212")
res =
conn
|> auth_conn(user)
|> AbsintheHelpers.graphql_query(
query: @list_users_query,
variables: %{currentSignInIp: "144.76.131.212"}
)
assert res["errors"] == nil
assert res["data"]["users"]["total"] == 2
assert res["data"]["users"]["elements"] |> length == 2
assert res["data"]["users"]["elements"]
|> Enum.map(& &1["email"]) == [
"loulou@know.com",
"donald@somewhere.fr"
]
end
end
describe "Resolver: Create an user & actor" do

View File

@@ -13,7 +13,10 @@ defmodule Mobilizon.UsersTest do
test "list_users/0 returns all users" do
user = insert(:user)
%Page{elements: users, total: 1} = Users.list_users("", nil, nil, :id, :desc)
%Page{elements: users, total: 1} =
Users.list_users(email: "", page: nil, limit: nil, sort: :id, direction: :desc)
assert [user.id] == users |> Enum.map(& &1.id)
end