aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-09-20 20:43:27 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-10-07 18:35:27 +0400
commit17562bf4147ab03e171b1f1d365a512f2e5b3202 (patch)
treeddcd665d446ad58c808a3145504ff2a9e177e1cc
parenta9efd441e242f1d8ac608b866d0cfafe4833243a (diff)
downloadpleroma-17562bf4147ab03e171b1f1d365a512f2e5b3202.tar.gz
Move API endpoints to `/api/v1/pleroma/backups`
-rw-r--r--docs/API/pleroma_api.md4
-rw-r--r--lib/pleroma/web/router.ex6
-rw-r--r--test/web/pleroma_api/controllers/backup_controller_test.exs14
3 files changed, 12 insertions, 12 deletions
diff --git a/docs/API/pleroma_api.md b/docs/API/pleroma_api.md
index aeb266159..fa3a9a449 100644
--- a/docs/API/pleroma_api.md
+++ b/docs/API/pleroma_api.md
@@ -616,7 +616,7 @@ Emoji reactions work a lot like favourites do. They make it possible to react to
]
```
-## `POST /api/pleroma/backups`
+## `POST /api/v1/pleroma/backups`
### Create a user backup archive
* Method: `POST`
@@ -635,7 +635,7 @@ Emoji reactions work a lot like favourites do. They make it possible to react to
}]
```
-## `GET /api/pleroma/backups`
+## `GET /api/v1/pleroma/backups`
### Lists user backups
* Method: `GET`
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index e539eeeeb..ad7e315c7 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -295,9 +295,6 @@ defmodule Pleroma.Web.Router do
get("/accounts/mfa/setup/:method", TwoFactorAuthenticationController, :setup)
post("/accounts/mfa/confirm/:method", TwoFactorAuthenticationController, :confirm)
delete("/accounts/mfa/:method", TwoFactorAuthenticationController, :disable)
-
- get("/backups", BackupController, :index)
- post("/backups", BackupController, :create)
end
scope "/oauth", Pleroma.Web.OAuth do
@@ -358,6 +355,9 @@ defmodule Pleroma.Web.Router do
put("/mascot", MascotController, :update)
post("/scrobble", ScrobbleController, :create)
+
+ get("/backups", BackupController, :index)
+ post("/backups", BackupController, :create)
end
scope [] do
diff --git a/test/web/pleroma_api/controllers/backup_controller_test.exs b/test/web/pleroma_api/controllers/backup_controller_test.exs
index 5d2f1206e..b2ac74c7d 100644
--- a/test/web/pleroma_api/controllers/backup_controller_test.exs
+++ b/test/web/pleroma_api/controllers/backup_controller_test.exs
@@ -14,14 +14,14 @@ defmodule Pleroma.Web.PleromaAPI.BackupControllerTest do
oauth_access(["read:accounts"])
end
- test "GET /api/pleroma/backups", %{user: user, conn: conn} do
+ test "GET /api/v1/pleroma/backups", %{user: user, conn: conn} do
assert {:ok, %Oban.Job{args: %{"backup_id" => backup_id}}} = Backup.create(user)
backup = Backup.get(backup_id)
response =
conn
- |> get("/api/pleroma/backups")
+ |> get("/api/v1/pleroma/backups")
|> json_response_and_validate_schema(:ok)
assert [
@@ -45,11 +45,11 @@ defmodule Pleroma.Web.PleromaAPI.BackupControllerTest do
}
] =
conn
- |> get("/api/pleroma/backups")
+ |> get("/api/v1/pleroma/backups")
|> json_response_and_validate_schema(:ok)
end
- test "POST /api/pleroma/backups", %{user: _user, conn: conn} do
+ test "POST /api/v1/pleroma/backups", %{user: _user, conn: conn} do
assert [
%{
"content_type" => "application/zip",
@@ -60,7 +60,7 @@ defmodule Pleroma.Web.PleromaAPI.BackupControllerTest do
}
] =
conn
- |> post("/api/pleroma/backups")
+ |> post("/api/v1/pleroma/backups")
|> json_response_and_validate_schema(:ok)
Pleroma.Tests.ObanHelpers.perform_all()
@@ -72,14 +72,14 @@ defmodule Pleroma.Web.PleromaAPI.BackupControllerTest do
}
] =
conn
- |> get("/api/pleroma/backups")
+ |> get("/api/v1/pleroma/backups")
|> json_response_and_validate_schema(:ok)
days = Pleroma.Config.get([Backup, :limit_days])
assert %{"error" => "Last export was less than #{days} days ago"} ==
conn
- |> post("/api/pleroma/backups")
+ |> post("/api/v1/pleroma/backups")
|> json_response_and_validate_schema(400)
end
end