Skip to content

In identity recovery routes, use IdentityForUrl #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 3, 2023
Merged

In identity recovery routes, use IdentityForUrl #139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions crates/client-api/src/routes/database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use spacetimedb::identity::Identity;
use spacetimedb::json::client_api::StmtResultJson;
use spacetimedb::messages::control_db::{Database, DatabaseInstance, HostType};

use super::identity::IdentityForUrl;
use crate::util::{ByteStringBody, NameOrAddress};
use crate::{log_and_500, ControlCtx, ControlNodeDelegate, WorkerCtx};

Expand Down Expand Up @@ -640,13 +641,14 @@ pub struct RequestRecoveryCodeParams {
#[serde(default)]
link: bool,
email: String,
identity: Identity,
identity: IdentityForUrl,
}

pub async fn request_recovery_code(
State(ctx): State<Arc<dyn ControlCtx>>,
Query(RequestRecoveryCodeParams { link, email, identity }): Query<RequestRecoveryCodeParams>,
) -> axum::response::Result<impl IntoResponse> {
let identity = Identity::from(identity);
let Some(sendgrid) = ctx.sendgrid_controller() else {
log::error!("A recovery code was requested, but SendGrid is disabled.");
return Err((StatusCode::INTERNAL_SERVER_ERROR, "SendGrid is disabled.").into());
Expand Down Expand Up @@ -688,7 +690,7 @@ pub async fn request_recovery_code(
#[derive(Deserialize)]
pub struct ConfirmRecoveryCodeParams {
pub email: String,
pub identity: Identity,
pub identity: IdentityForUrl,
pub code: String,
}

Expand All @@ -700,6 +702,7 @@ pub async fn confirm_recovery_code(
State(ctx): State<Arc<dyn ControlCtx>>,
Query(ConfirmRecoveryCodeParams { email, identity, code }): Query<ConfirmRecoveryCodeParams>,
) -> axum::response::Result<impl IntoResponse> {
let identity = Identity::from(identity);
let recovery_code = ctx
.control_db()
.spacetime_get_recovery_code(email.as_str(), code.as_str())
Expand Down