LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-29 15:51:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reorganize api endpoints (fixes #2022)

Browse source
This commit is contained in:
Felix Ableitner 2024-11-20 14:41:15 +01:00
parent 417e18e819
commit 9072bb365c
1 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/api_routes_http.rs
View file

@ -161,7 +161,7 @@ use lemmy_utils::rate_limit::RateLimitCell;
pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) { pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
cfg.service( cfg.service(
web::scope("/api/v3") web::scope("/api/v4")
.route("/image_proxy", web::get().to(image_proxy)) .route("/image_proxy", web::get().to(image_proxy))
// Site // Site
.service( .service(
@ -295,74 +295,62 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
.service( .service(
// Account action, I don't like that it's in /user maybe /accounts // Account action, I don't like that it's in /user maybe /accounts
// Handle /user/register separately to add the register() rate limiter // Handle /user/register separately to add the register() rate limiter
web::resource("/user/register") web::resource("/account/register")
.guard(guard::Post()) .guard(guard::Post())
.wrap(rate_limit.register()) .wrap(rate_limit.register())
.route(web::post().to(register)), .route(web::post().to(register)),
) )
// User // User
.service( .service(
// Handle /user/login separately to add the register() rate limiter // Handle /account/login separately to add the register() rate limiter
// TODO: pretty annoying way to apply rate limits for register and login, we should // TODO: pretty annoying way to apply rate limits for register and login, we should
// group them under a common path so that rate limit is only applied once (eg under // group them under a common path so that rate limit is only applied once (eg under
// /account). // /account).
web::resource("/user/login") web::resource("/account/login")
.guard(guard::Post()) .guard(guard::Post())
.wrap(rate_limit.register()) .wrap(rate_limit.register())
.route(web::post().to(login)), .route(web::post().to(login)),
) )
.service( .service(
web::resource("/user/password_reset") web::resource("/account/password_reset")
.wrap(rate_limit.register()) .wrap(rate_limit.register())
.route(web::post().to(reset_password)), .route(web::post().to(reset_password)),
) )
.service( .service(
// Handle captcha separately // Handle captcha separately
web::resource("/user/get_captcha") web::resource("/account/get_captcha")
.wrap(rate_limit.post()) .wrap(rate_limit.post())
.route(web::get().to(get_captcha)), .route(web::get().to(get_captcha)),
) )
.service( .service(
web::resource("/user/export_settings") web::resource("/account/export_settings")
.wrap(rate_limit.import_user_settings()) .wrap(rate_limit.import_user_settings())
.route(web::get().to(export_settings)), .route(web::get().to(export_settings)),
) )
.service( .service(
web::resource("/user/import_settings") web::resource("/account/import_settings")
.wrap(rate_limit.import_user_settings()) .wrap(rate_limit.import_user_settings())
.route(web::post().to(import_settings)), .route(web::post().to(import_settings)),
) )
// TODO, all the current account related actions under /user need to get moved here eventually
.service( .service(
web::scope("/account") web::scope("/account")
.wrap(rate_limit.message()) .wrap(rate_limit.message())
.route("/list_media", web::get().to(list_media)), .route("/list_media", web::get().to(list_media))
)
// User actions
.service(
web::scope("/user")
.wrap(rate_limit.message())
.route("", web::get().to(read_person))
.route("/mention", web::get().to(list_mentions)) .route("/mention", web::get().to(list_mentions))
.route(
"/mention/mark_as_read",
web::post().to(mark_person_mention_as_read),
)
.route("/replies", web::get().to(list_replies)) .route("/replies", web::get().to(list_replies))
// Admin action. I don't like that it's in /user
.route("/ban", web::post().to(ban_from_site))
.route("/banned", web::get().to(list_banned_users))
.route("/block", web::post().to(block_person)) .route("/block", web::post().to(block_person))
// TODO Account actions. I don't like that they're in /user maybe /accounts
.route("/logout", web::post().to(logout)) .route("/logout", web::post().to(logout))
.route("/delete_account", web::post().to(delete_account)) .route("/delete_account", web::post().to(delete_account))
.route( .route(
"/password_change", "/password_change",
web::post().to(change_password_after_reset), web::post().to(change_password_after_reset),
) )
// TODO mark_all_as_read feels off being in this section as well
.route( .route(
"/mark_all_as_read", "/mention/mark_as_read",
web::post().to(mark_person_mention_as_read),
)
.route(
"/mention/mark_all_as_read",
web::post().to(mark_all_notifications_read), web::post().to(mark_all_notifications_read),
) )
.route("/save_user_settings", web::put().to(save_user_settings)) .route("/save_user_settings", web::put().to(save_user_settings))
@ -376,6 +364,12 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
.route("/list_logins", web::get().to(list_logins)) .route("/list_logins", web::get().to(list_logins))
.route("/validate_auth", web::get().to(validate_auth)), .route("/validate_auth", web::get().to(validate_auth)),
) )
// User actions
.service(
web::scope("/user")
.wrap(rate_limit.message())
.route("", web::get().to(read_person)),
)
// Admin Actions // Admin Actions
.service( .service(
web::scope("/admin") web::scope("/admin")
@ -412,7 +406,9 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
.route("", web::put().to(update_tagline)) .route("", web::put().to(update_tagline))
.route("/delete", web::post().to(delete_tagline)) .route("/delete", web::post().to(delete_tagline))
.route("/list", web::get().to(list_taglines)), .route("/list", web::get().to(list_taglines)),
), )
.route("/ban", web::post().to(ban_from_site))
.route("/banned", web::get().to(list_banned_users)),
) )
.service( .service(
web::scope("/custom_emoji") web::scope("/custom_emoji")