summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boot/app.rs8
-rw-r--r--src/setup/app.rs4
-rw-r--r--src/setup/routes/post.rs4
-rw-r--r--src/test/fixtures/identity.rs8
-rw-r--r--src/test/fixtures/user.rs4
-rw-r--r--src/token/app.rs26
-rw-r--r--src/token/repo/auth.rs8
-rw-r--r--src/token/repo/token.rs20
8 files changed, 41 insertions, 41 deletions
diff --git a/src/boot/app.rs b/src/boot/app.rs
index 264d5ae..f531afe 100644
--- a/src/boot/app.rs
+++ b/src/boot/app.rs
@@ -22,15 +22,15 @@ impl<'a> Boot<'a> {
let mut tx = self.db.begin().await?;
let resume_point = tx.sequence().current().await?;
- let logins = tx.users().all(resume_point).await?;
+ let users = tx.users().all(resume_point).await?;
let channels = tx.channels().all(resume_point).await?;
let messages = tx.messages().all(resume_point).await?;
tx.commit().await?;
- let logins = logins
+ let users = users
.into_iter()
- .filter_map(|login| login.as_of(resume_point))
+ .filter_map(|user| user.as_of(resume_point))
.collect();
let channels = channels
@@ -45,7 +45,7 @@ impl<'a> Boot<'a> {
Ok(Snapshot {
resume_point,
- users: logins,
+ users,
channels,
messages,
})
diff --git a/src/setup/app.rs b/src/setup/app.rs
index 9f31c01..26eed7a 100644
--- a/src/setup/app.rs
+++ b/src/setup/app.rs
@@ -41,9 +41,9 @@ impl<'a> Setup<'a> {
let secret = tx.tokens().issue(stored.user(), created_at).await?;
tx.commit().await?;
- let login = stored.publish(self.events);
+ let user = stored.publish(self.events);
- Ok((login.as_created(), secret))
+ Ok((user.as_created(), secret))
}
pub async fn completed(&self) -> Result<bool, sqlx::Error> {
diff --git a/src/setup/routes/post.rs b/src/setup/routes/post.rs
index 9c6b7a6..0ff5d69 100644
--- a/src/setup/routes/post.rs
+++ b/src/setup/routes/post.rs
@@ -20,13 +20,13 @@ pub async fn handler(
identity: IdentityCookie,
Json(request): Json<Request>,
) -> Result<(IdentityCookie, Json<User>), Error> {
- let (login, secret) = app
+ let (user, secret) = app
.setup()
.initial(&request.name, &request.password, &setup_at)
.await
.map_err(Error)?;
let identity = identity.set(secret);
- Ok((identity, Json(login)))
+ Ok((identity, Json(user)))
}
#[derive(serde::Deserialize)]
diff --git a/src/test/fixtures/identity.rs b/src/test/fixtures/identity.rs
index 0b2f978..cb325d8 100644
--- a/src/test/fixtures/identity.rs
+++ b/src/test/fixtures/identity.rs
@@ -21,13 +21,13 @@ pub async fn from_cookie(
validated_at: &RequestedAt,
) -> Identity {
let secret = cookie.secret().expect("identity token has a secret");
- let (token, login) = app
+ let (token, user) = app
.tokens()
.validate(&secret, validated_at)
.await
.expect("always validates newly-issued secret");
- Identity { token, user: login }
+ Identity { token, user }
}
pub async fn logged_in(
@@ -41,7 +41,7 @@ pub async fn logged_in(
pub fn fictitious() -> Identity {
let token = token::Id::generate();
- let login = fixtures::user::fictitious();
+ let user = fixtures::user::fictitious();
- Identity { token, user: login }
+ Identity { token, user }
}
diff --git a/src/test/fixtures/user.rs b/src/test/fixtures/user.rs
index e668c95..6448f64 100644
--- a/src/test/fixtures/user.rs
+++ b/src/test/fixtures/user.rs
@@ -10,13 +10,13 @@ use crate::{
pub async fn create_with_password(app: &App, created_at: &RequestedAt) -> (Name, Password) {
let (name, password) = propose();
- let login = app
+ let user = app
.users()
.create(&name, &password, created_at)
.await
.expect("should always succeed if the login is actually new");
- (login.name, password)
+ (user.name, password)
}
pub async fn create(app: &App, created_at: &RequestedAt) -> User {
diff --git a/src/token/app.rs b/src/token/app.rs
index 211df81..46b2d73 100644
--- a/src/token/app.rs
+++ b/src/token/app.rs
@@ -33,7 +33,7 @@ impl<'a> Tokens<'a> {
login_at: &DateTime,
) -> Result<(User, Secret), LoginError> {
let mut tx = self.db.begin().await?;
- let (login, stored_hash) = tx
+ let (user, stored_hash) = tx
.auth()
.for_name(name)
.await
@@ -46,11 +46,11 @@ impl<'a> Tokens<'a> {
// if the account is deleted during that time.
tx.commit().await?;
- let snapshot = login.as_snapshot().ok_or(LoginError::Rejected)?;
+ let snapshot = user.as_snapshot().ok_or(LoginError::Rejected)?;
let token = if stored_hash.verify(password)? {
let mut tx = self.db.begin().await?;
- let token = tx.tokens().issue(&login, login_at).await?;
+ let token = tx.tokens().issue(&user, login_at).await?;
tx.commit().await?;
token
} else {
@@ -62,15 +62,15 @@ impl<'a> Tokens<'a> {
pub async fn change_password(
&self,
- login: &User,
+ user: &User,
password: &Password,
to: &Password,
changed_at: &DateTime,
) -> Result<(User, Secret), LoginError> {
let mut tx = self.db.begin().await?;
- let (login, stored_hash) = tx
+ let (user, stored_hash) = tx
.auth()
- .for_login(login)
+ .for_user(user)
.await
.optional()?
.ok_or(LoginError::Rejected)?;
@@ -85,13 +85,13 @@ impl<'a> Tokens<'a> {
return Err(LoginError::Rejected);
}
- let snapshot = login.as_snapshot().ok_or(LoginError::Rejected)?;
+ let snapshot = user.as_snapshot().ok_or(LoginError::Rejected)?;
let to_hash = to.hash()?;
let mut tx = self.db.begin().await?;
- let tokens = tx.tokens().revoke_all(&login).await?;
- tx.users().set_password(&login, &to_hash).await?;
- let secret = tx.tokens().issue(&login, changed_at).await?;
+ let tokens = tx.tokens().revoke_all(&user).await?;
+ tx.users().set_password(&user, &to_hash).await?;
+ let secret = tx.tokens().issue(&user, changed_at).await?;
tx.commit().await?;
for event in tokens.into_iter().map(TokenEvent::Revoked) {
@@ -107,16 +107,16 @@ impl<'a> Tokens<'a> {
used_at: &DateTime,
) -> Result<(Id, User), ValidateError> {
let mut tx = self.db.begin().await?;
- let (token, login) = tx
+ let (token, user) = tx
.tokens()
.validate(secret, used_at)
.await
.not_found(|| ValidateError::InvalidToken)?;
tx.commit().await?;
- let login = login.as_snapshot().ok_or(ValidateError::LoginDeleted)?;
+ let user = user.as_snapshot().ok_or(ValidateError::LoginDeleted)?;
- Ok((token, login))
+ Ok((token, user))
}
pub async fn limit_stream<S, E>(
diff --git a/src/token/repo/auth.rs b/src/token/repo/auth.rs
index a1f4aad..68a81c7 100644
--- a/src/token/repo/auth.rs
+++ b/src/token/repo/auth.rs
@@ -51,7 +51,7 @@ impl Auth<'_> {
Ok((login, row.password_hash))
}
- pub async fn for_login(&mut self, login: &User) -> Result<(History, StoredHash), LoadError> {
+ pub async fn for_user(&mut self, user: &User) -> Result<(History, StoredHash), LoadError> {
let row = sqlx::query!(
r#"
select
@@ -64,12 +64,12 @@ impl Auth<'_> {
from user
where id = $1
"#,
- login.id,
+ user.id,
)
.fetch_one(&mut *self.0)
.await?;
- let login = History {
+ let user = History {
user: User {
id: row.id,
name: Name::new(row.display_name, row.canonical_name)?,
@@ -77,7 +77,7 @@ impl Auth<'_> {
created: Instant::new(row.created_at, row.created_sequence),
};
- Ok((login, row.password_hash))
+ Ok((user, row.password_hash))
}
}
diff --git a/src/token/repo/token.rs b/src/token/repo/token.rs
index 145ba2d..e49c2d4 100644
--- a/src/token/repo/token.rs
+++ b/src/token/repo/token.rs
@@ -27,12 +27,12 @@ impl Tokens<'_> {
// be used to control expiry, until the token is actually used.
pub async fn issue(
&mut self,
- login: &History,
+ user: &History,
issued_at: &DateTime,
) -> Result<Secret, sqlx::Error> {
let id = Id::generate();
let secret = Uuid::new_v4().to_string();
- let login = login.id();
+ let user = user.id();
let secret = sqlx::query_scalar!(
r#"
@@ -43,7 +43,7 @@ impl Tokens<'_> {
"#,
id,
secret,
- login,
+ user,
issued_at,
)
.fetch_one(&mut *self.0)
@@ -85,8 +85,8 @@ impl Tokens<'_> {
}
// Revoke tokens for a login
- pub async fn revoke_all(&mut self, login: &user::History) -> Result<Vec<Id>, sqlx::Error> {
- let login = login.id();
+ pub async fn revoke_all(&mut self, user: &user::History) -> Result<Vec<Id>, sqlx::Error> {
+ let user = user.id();
let tokens = sqlx::query_scalar!(
r#"
delete
@@ -94,7 +94,7 @@ impl Tokens<'_> {
where user = $1
returning id as "id: Id"
"#,
- login,
+ user,
)
.fetch_all(&mut *self.0)
.await?;
@@ -132,7 +132,7 @@ impl Tokens<'_> {
// sqlite3, as of this writing, does not allow an update's `returning`
// clause to reference columns from tables joined into the update. Two
// queries is fine, but it feels untidy.
- let (token, login) = sqlx::query!(
+ let (token, user) = sqlx::query!(
r#"
update token
set last_used_at = $1
@@ -148,7 +148,7 @@ impl Tokens<'_> {
.fetch_one(&mut *self.0)
.await?;
- let login = sqlx::query!(
+ let user = sqlx::query!(
r#"
select
id as "id: user::Id",
@@ -159,7 +159,7 @@ impl Tokens<'_> {
from user
where id = $1
"#,
- login,
+ user,
)
.map(|row| {
Ok::<_, name::Error>(History {
@@ -173,7 +173,7 @@ impl Tokens<'_> {
.fetch_one(&mut *self.0)
.await??;
- Ok((token, login))
+ Ok((token, user))
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-02 18:25:08 +0000