move /vks/manage to /manage
This commit is contained in:
parent
eb80b66264
commit
6a08ff1089
|
@ -1,7 +1,7 @@
|
||||||
{{#> layout }}
|
{{#> layout }}
|
||||||
{{> search-form}}
|
{{> search-form}}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>You can also <a href="/publish">upload</a> or <a href="/vks/manage">delete</a> your key.</p>
|
<p>You can also <a href="/publish">upload</a> or <a href="/manage">delete</a> your key.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{{#> layout }}
|
{{#> layout }}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<form action="/vks/manage" method="POST">
|
<form action="/manage" method="POST">
|
||||||
<div class="manage">
|
<div class="manage">
|
||||||
<input type="text" name="search_term" class="manageEmail" autofocus
|
<input type="text" name="search_term" class="manageEmail" autofocus
|
||||||
placeholder="Your Email / Key ID / Fingerprint">
|
placeholder="Your Email / Key ID / Fingerprint">
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{{#> layout }}
|
{{#> layout }}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>This management link is invalid or expired.
|
<p>This management link is invalid or expired.
|
||||||
<p>You can <a href="/vks/manage">click here</a> to request a new one.
|
<p>You can <a href="/manage">click here</a> to request a new one.
|
||||||
</div>
|
</div>
|
||||||
{{/layout}}
|
{{/layout}}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
{{#each uid_status}}
|
{{#each uid_status}}
|
||||||
<div>
|
<div>
|
||||||
<div style="float: right;">
|
<div style="float: right;">
|
||||||
<form action="/vks/manage/unpublish" method="post">
|
<form action="/manage/unpublish" method="post">
|
||||||
<input type="hidden" name="token" value="{{../token}}" />
|
<input type="hidden" name="token" value="{{../token}}" />
|
||||||
<input type="hidden" name="address" value="{{address}}" />
|
<input type="hidden" name="address" value="{{address}}" />
|
||||||
<i class="fa fa-eye-slash"></i> <input type="submit" class="link" value="Unpublish">
|
<i class="fa fa-eye-slash"></i> <input type="submit" class="link" value="Unpublish">
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<p>You can delete an uploaded key <a href="/vks/manage">here</a>.</p>
|
<p>You can delete an uploaded key <a href="/manage">here</a>.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
|
@ -45,12 +45,12 @@ pub mod forms {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/vks/manage")]
|
#[get("/manage")]
|
||||||
pub fn vks_manage() -> Result<MyResponse> {
|
pub fn vks_manage() -> Result<MyResponse> {
|
||||||
Ok(MyResponse::ok("manage/manage", General::default()))
|
Ok(MyResponse::ok("manage/manage", General::default()))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/vks/manage/<token>")]
|
#[get("/manage/<token>")]
|
||||||
pub fn vks_manage_key(
|
pub fn vks_manage_key(
|
||||||
db: State<Polymorphic>,
|
db: State<Polymorphic>,
|
||||||
token: String,
|
token: String,
|
||||||
|
@ -89,7 +89,7 @@ pub fn vks_manage_key(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/vks/manage", data="<request>")]
|
#[post("/manage", data="<request>")]
|
||||||
pub fn vks_manage_post(
|
pub fn vks_manage_post(
|
||||||
db: State<Polymorphic>,
|
db: State<Polymorphic>,
|
||||||
request: Form<forms::ManageRequest>,
|
request: Form<forms::ManageRequest>,
|
||||||
|
@ -136,7 +136,7 @@ pub fn vks_manage_post(
|
||||||
MyResponse::ok("manage/manage_link_sent", ctx)
|
MyResponse::ok("manage/manage_link_sent", ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[post("/vks/manage/unpublish", data="<request>")]
|
#[post("/manage/unpublish", data="<request>")]
|
||||||
pub fn vks_manage_unpublish(
|
pub fn vks_manage_unpublish(
|
||||||
db: rocket::State<Polymorphic>,
|
db: rocket::State<Polymorphic>,
|
||||||
token_service: rocket::State<tokens::Service>,
|
token_service: rocket::State<tokens::Service>,
|
||||||
|
|
|
@ -522,7 +522,7 @@ pub mod tests {
|
||||||
assert!(response.body_string().unwrap().contains("upload"));
|
assert!(response.body_string().unwrap().contains("upload"));
|
||||||
|
|
||||||
// Check that we see the deletion form.
|
// Check that we see the deletion form.
|
||||||
let mut response = client.get("/vks/manage").dispatch();
|
let mut response = client.get("/manage").dispatch();
|
||||||
assert_eq!(response.status(), Status::Ok);
|
assert_eq!(response.status(), Status::Ok);
|
||||||
assert_eq!(response.content_type(), Some(ContentType::HTML));
|
assert_eq!(response.content_type(), Some(ContentType::HTML));
|
||||||
assert!(response.body_string().unwrap().contains("email"));
|
assert!(response.body_string().unwrap().contains("email"));
|
||||||
|
@ -798,7 +798,7 @@ pub mod tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_mails_and_confirm_deletion(client: &Client, filemail_path: &Path, address: &str) {
|
fn check_mails_and_confirm_deletion(client: &Client, filemail_path: &Path, address: &str) {
|
||||||
let pattern = format!("{}/vks/manage/([^ \t\n]*)", BASE_URI);
|
let pattern = format!("{}/manage/([^ \t\n]*)", BASE_URI);
|
||||||
let token = pop_mail_capture_pattern(filemail_path, &pattern);
|
let token = pop_mail_capture_pattern(filemail_path, &pattern);
|
||||||
vks_manage_delete(client, &token, address);
|
vks_manage_delete(client, &token, address);
|
||||||
}
|
}
|
||||||
|
@ -865,7 +865,7 @@ pub mod tests {
|
||||||
let encoded = ::url::form_urlencoded::Serializer::new(String::new())
|
let encoded = ::url::form_urlencoded::Serializer::new(String::new())
|
||||||
.append_pair("search_term", search_term)
|
.append_pair("search_term", search_term)
|
||||||
.finish();
|
.finish();
|
||||||
let response = client.post("/vks/manage")
|
let response = client.post("/manage")
|
||||||
.header(ContentType::Form)
|
.header(ContentType::Form)
|
||||||
.body(encoded.as_bytes())
|
.body(encoded.as_bytes())
|
||||||
.dispatch();
|
.dispatch();
|
||||||
|
@ -877,7 +877,7 @@ pub mod tests {
|
||||||
.append_pair("token", token)
|
.append_pair("token", token)
|
||||||
.append_pair("address", address)
|
.append_pair("address", address)
|
||||||
.finish();
|
.finish();
|
||||||
let response = client.post("/vks/manage/unpublish")
|
let response = client.post("/manage/unpublish")
|
||||||
.header(ContentType::Form)
|
.header(ContentType::Form)
|
||||||
.body(encoded.as_bytes())
|
.body(encoded.as_bytes())
|
||||||
.dispatch();
|
.dispatch();
|
||||||
|
|
Loading…
Reference in New Issue