summaryrefslogtreecommitdiff
path: root/src/invite
diff options
context:
space:
mode:
Diffstat (limited to 'src/invite')
-rw-r--r--src/invite/app.rs16
-rw-r--r--src/invite/mod.rs4
-rw-r--r--src/invite/repo.rs12
-rw-r--r--src/invite/routes/invite/post.rs4
-rw-r--r--src/invite/routes/invite/test/get.rs4
-rw-r--r--src/invite/routes/invite/test/post.rs32
-rw-r--r--src/invite/routes/post.rs2
-rw-r--r--src/invite/routes/test.rs2
8 files changed, 38 insertions, 38 deletions
diff --git a/src/invite/app.rs b/src/invite/app.rs
index c56c9b3..e7bd5c6 100644
--- a/src/invite/app.rs
+++ b/src/invite/app.rs
@@ -6,12 +6,12 @@ use crate::{
clock::DateTime,
db::{Duplicate as _, NotFound as _},
event::Broadcaster,
- login::{
- Login, Password,
- create::{self, Create},
- },
name::Name,
token::{Secret, repo::Provider as _},
+ user::{
+ Password, User,
+ create::{self, Create},
+ },
};
pub struct Invites<'a> {
@@ -24,7 +24,7 @@ impl<'a> Invites<'a> {
Self { db, events }
}
- pub async fn issue(&self, issuer: &Login, issued_at: &DateTime) -> Result<Invite, sqlx::Error> {
+ pub async fn issue(&self, issuer: &User, issued_at: &DateTime) -> Result<Invite, sqlx::Error> {
let mut tx = self.db.begin().await?;
let invite = tx.invites().create(issuer, issued_at).await?;
tx.commit().await?;
@@ -46,7 +46,7 @@ impl<'a> Invites<'a> {
name: &Name,
password: &Password,
accepted_at: &DateTime,
- ) -> Result<(Login, Secret), AcceptError> {
+ ) -> Result<(User, Secret), AcceptError> {
let create = Create::begin(name, password, accepted_at);
let mut tx = self.db.begin().await?;
@@ -70,7 +70,7 @@ impl<'a> Invites<'a> {
.store(&mut tx)
.await
.duplicate(|| AcceptError::DuplicateLogin(name.clone()))?;
- let secret = tx.tokens().issue(stored.login(), accepted_at).await?;
+ let secret = tx.tokens().issue(stored.user(), accepted_at).await?;
tx.commit().await?;
let login = stored.publish(self.events);
@@ -94,7 +94,7 @@ impl<'a> Invites<'a> {
pub enum AcceptError {
#[error("invite not found: {0}")]
NotFound(Id),
- #[error("invalid login name: {0}")]
+ #[error("invalid user name: {0}")]
InvalidName(Name),
#[error("name in use: {0}")]
DuplicateLogin(Name),
diff --git a/src/invite/mod.rs b/src/invite/mod.rs
index 53ca984..2d32fda 100644
--- a/src/invite/mod.rs
+++ b/src/invite/mod.rs
@@ -3,14 +3,14 @@ mod id;
mod repo;
mod routes;
-use crate::{clock::DateTime, login, normalize::nfc};
+use crate::{clock::DateTime, normalize::nfc, user};
pub use self::{id::Id, routes::router};
#[derive(Debug, serde::Serialize)]
pub struct Invite {
pub id: Id,
- pub issuer: login::Id,
+ pub issuer: user::Id,
pub issued_at: DateTime,
}
diff --git a/src/invite/repo.rs b/src/invite/repo.rs
index c1dc701..79114ec 100644
--- a/src/invite/repo.rs
+++ b/src/invite/repo.rs
@@ -3,8 +3,8 @@ use sqlx::{SqliteConnection, Transaction, sqlite::Sqlite};
use super::{Id, Invite, Summary};
use crate::{
clock::DateTime,
- login::{self, Login},
normalize::nfc,
+ user::{self, User},
};
pub trait Provider {
@@ -22,7 +22,7 @@ pub struct Invites<'t>(&'t mut SqliteConnection);
impl Invites<'_> {
pub async fn create(
&mut self,
- issuer: &Login,
+ issuer: &User,
issued_at: &DateTime,
) -> Result<Invite, sqlx::Error> {
let id = Id::generate();
@@ -33,7 +33,7 @@ impl Invites<'_> {
values ($1, $2, $3)
returning
id as "id: Id",
- issuer as "issuer: login::Id",
+ issuer as "issuer: user::Id",
issued_at as "issued_at: DateTime"
"#,
id,
@@ -52,7 +52,7 @@ impl Invites<'_> {
r#"
select
id as "id: Id",
- issuer as "issuer: login::Id",
+ issuer as "issuer: user::Id",
issued_at as "issued_at: DateTime"
from invite
where id = $1
@@ -70,11 +70,11 @@ impl Invites<'_> {
r#"
select
invite.id as "invite_id: Id",
- issuer.id as "issuer_id: login::Id",
+ issuer.id as "issuer_id: user::Id",
issuer.display_name as "issuer_name: nfc::String",
invite.issued_at as "invite_issued_at: DateTime"
from invite
- join login as issuer on (invite.issuer = issuer.id)
+ join user as issuer on (invite.issuer = issuer.id)
where invite.id = $1
"#,
invite,
diff --git a/src/invite/routes/invite/post.rs b/src/invite/routes/invite/post.rs
index bb68e07..58d15c2 100644
--- a/src/invite/routes/invite/post.rs
+++ b/src/invite/routes/invite/post.rs
@@ -9,9 +9,9 @@ use crate::{
clock::RequestedAt,
error::{Internal, NotFound},
invite::app,
- login::{Login, Password},
name::Name,
token::extract::IdentityCookie,
+ user::{Password, User},
};
pub async fn handler(
@@ -20,7 +20,7 @@ pub async fn handler(
identity: IdentityCookie,
Path(invite): Path<super::PathInfo>,
Json(request): Json<Request>,
-) -> Result<(IdentityCookie, Json<Login>), Error> {
+) -> Result<(IdentityCookie, Json<User>), Error> {
let (login, secret) = app
.invites()
.accept(&invite, &request.name, &request.password, &accepted_at)
diff --git a/src/invite/routes/invite/test/get.rs b/src/invite/routes/invite/test/get.rs
index c6780ed..0dc8a79 100644
--- a/src/invite/routes/invite/test/get.rs
+++ b/src/invite/routes/invite/test/get.rs
@@ -7,7 +7,7 @@ async fn valid_invite() {
// Set up the environment
let app = fixtures::scratch_app().await;
- let issuer = fixtures::login::create(&app, &fixtures::now()).await;
+ let issuer = fixtures::user::create(&app, &fixtures::now()).await;
let invite = fixtures::invite::issue(&app, &issuer, &fixtures::now()).await;
// Call endpoint
@@ -45,7 +45,7 @@ async fn expired_invite() {
// Set up the environment
let app = fixtures::scratch_app().await;
- let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+ let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
app.invites()
diff --git a/src/invite/routes/invite/test/post.rs b/src/invite/routes/invite/test/post.rs
index 40e0580..b204b32 100644
--- a/src/invite/routes/invite/test/post.rs
+++ b/src/invite/routes/invite/test/post.rs
@@ -11,12 +11,12 @@ async fn valid_invite() {
// Set up the environment
let app = fixtures::scratch_app().await;
- let issuer = fixtures::login::create(&app, &fixtures::now()).await;
+ let issuer = fixtures::user::create(&app, &fixtures::now()).await;
let invite = fixtures::invite::issue(&app, &issuer, &fixtures::now()).await;
// Call the endpoint
- let (name, password) = fixtures::login::propose();
+ let (name, password) = fixtures::user::propose();
let identity = fixtures::cookie::not_logged_in();
let request = post::Request {
name: name.clone(),
@@ -68,7 +68,7 @@ async fn nonexistent_invite() {
// Call the endpoint
- let (name, password) = fixtures::login::propose();
+ let (name, password) = fixtures::user::propose();
let identity = fixtures::cookie::not_logged_in();
let request = post::Request {
name: name.clone(),
@@ -94,7 +94,7 @@ async fn expired_invite() {
// Set up the environment
let app = fixtures::scratch_app().await;
- let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+ let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
app.invites()
@@ -104,7 +104,7 @@ async fn expired_invite() {
// Call the endpoint
- let (name, password) = fixtures::login::propose();
+ let (name, password) = fixtures::user::propose();
let identity = fixtures::cookie::not_logged_in();
let request = post::Request {
name: name.clone(),
@@ -130,10 +130,10 @@ async fn accepted_invite() {
// Set up the environment
let app = fixtures::scratch_app().await;
- let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+ let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
- let (name, password) = fixtures::login::propose();
+ let (name, password) = fixtures::user::propose();
app.invites()
.accept(&invite.id, &name, &password, &fixtures::now())
.await
@@ -141,7 +141,7 @@ async fn accepted_invite() {
// Call the endpoint
- let (name, password) = fixtures::login::propose();
+ let (name, password) = fixtures::user::propose();
let identity = fixtures::cookie::not_logged_in();
let request = post::Request {
name: name.clone(),
@@ -167,23 +167,23 @@ async fn conflicting_name() {
// Set up the environment
let app = fixtures::scratch_app().await;
- let issuer = fixtures::login::create(&app, &fixtures::ancient()).await;
+ let issuer = fixtures::user::create(&app, &fixtures::ancient()).await;
let invite = fixtures::invite::issue(&app, &issuer, &fixtures::ancient()).await;
let existing_name = Name::from("rijksmuseum");
- app.logins()
+ app.users()
.create(
&existing_name,
- &fixtures::login::propose_password(),
+ &fixtures::user::propose_password(),
&fixtures::now(),
)
.await
- .expect("creating a login in an empty environment succeeds");
+ .expect("creating a user in an empty environment succeeds");
// Call the endpoint
let conflicting_name = Name::from("r\u{0133}ksmuseum");
- let password = fixtures::login::propose_password();
+ let password = fixtures::user::propose_password();
let identity = fixtures::cookie::not_logged_in();
let request = post::Request {
@@ -212,13 +212,13 @@ async fn invalid_name() {
// Set up the environment
let app = fixtures::scratch_app().await;
- let issuer = fixtures::login::create(&app, &fixtures::now()).await;
+ let issuer = fixtures::user::create(&app, &fixtures::now()).await;
let invite = fixtures::invite::issue(&app, &issuer, &fixtures::now()).await;
// Call the endpoint
- let name = fixtures::login::propose_invalid_name();
- let password = fixtures::login::propose_password();
+ let name = fixtures::user::propose_invalid_name();
+ let password = fixtures::user::propose_password();
let identity = fixtures::cookie::not_logged_in();
let request = post::Request {
name: name.clone(),
diff --git a/src/invite/routes/post.rs b/src/invite/routes/post.rs
index 898081e..f7ca76c 100644
--- a/src/invite/routes/post.rs
+++ b/src/invite/routes/post.rs
@@ -10,7 +10,7 @@ pub async fn handler(
identity: Identity,
_: Json<Request>,
) -> Result<Json<Invite>, Internal> {
- let invite = app.invites().issue(&identity.login, &issued_at).await?;
+ let invite = app.invites().issue(&identity.user, &issued_at).await?;
Ok(Json(invite))
}
diff --git a/src/invite/routes/test.rs b/src/invite/routes/test.rs
index 4d99660..4ea8a3d 100644
--- a/src/invite/routes/test.rs
+++ b/src/invite/routes/test.rs
@@ -23,6 +23,6 @@ async fn create_invite() {
.expect("creating an invite always succeeds");
// Verify the response
- assert_eq!(issuer.login.id, invite.issuer);
+ assert_eq!(issuer.user.id, invite.issuer);
assert_eq!(&*issued_at, &invite.issued_at);
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-02 22:27:34 +0000