Repository split

application/pre_token_handler.rs

@@ -7,7 +7,7 @@ use serde_json::{to_value, Value};
 use tokio::sync::OnceCell;
 use tracing::{error, info, Level};
 
-use raktar::repository::{DynamoDBRepository, Repository};
+use raktar::repository::{DynamoDBRepository, UserRepository};
 
 #[tokio::main]
 async fn main() -> Result<(), Error> {

application/repository.rs

@@ -1,5 +1,5 @@
 mod base;
 pub mod dynamodb;
 
-pub use base::{DynRepository, Repository};
+pub use base::{DynRepository, Repository, UserRepository};
 pub use dynamodb::DynamoDBRepository;

application/repository/base.rs

@@ -1,53 +1,14 @@
-use std::sync::Arc;
+mod krate;
+mod token;
+mod user;
 
-use semver::Version;
+use std::sync::Arc;
 
-use crate::auth::AuthenticatedUser;
-use crate::error::AppResult;
-use crate::models::crate_summary::CrateSummary;
-use crate::models::index::PackageInfo;
-use crate::models::metadata::Metadata;
-use crate::models::token::TokenItem;
-use crate::models::user::{CognitoUserData, User, UserId};
+pub use crate::repository::base::krate::CrateRepository;
+pub use crate::repository::base::token::TokenRepository;
+pub use crate::repository::base::user::UserRepository;
 
 #[async_trait::async_trait]
-pub trait Repository {
-    async fn get_package_info(&self, crate_name: &str) -> AppResult<String>;
-    async fn store_package_info(
-        &self,
-        crate_name: &str,
-        version: &Version,
-        package_info: PackageInfo,
-        metadata: Metadata,
-        authenticated_user: &AuthenticatedUser,
-    ) -> AppResult<()>;
-    async fn set_yanked(&self, crate_name: &str, version: &Version, yanked: bool) -> AppResult<()>;
-    async fn list_owners(&self, crate_name: &str) -> AppResult<Vec<User>>;
-    async fn add_owners(&self, crate_name: &str, user_ids: Vec<String>) -> AppResult<()>;
-    async fn get_crate_summary(&self, crate_name: &str) -> AppResult<Option<CrateSummary>>;
-    async fn get_all_crate_details(
-        &self,
-        filter: Option<String>,
-        limit: usize,
-    ) -> AppResult<Vec<CrateSummary>>;
-    async fn get_crate_metadata(
-        &self,
-        crate_name: &str,
-        version: &Version,
-    ) -> AppResult<Option<Metadata>>;
-    async fn list_crate_versions(&self, crate_name: &str) -> AppResult<Vec<Version>>;
-    async fn store_auth_token(
-        &self,
-        token: &[u8],
-        name: String,
-        user_id: u32,
-    ) -> AppResult<TokenItem>;
-    async fn delete_auth_token(&self, user_id: u32, token_id: String) -> AppResult<()>;
-    async fn list_auth_tokens(&self, user_id: u32) -> AppResult<Vec<TokenItem>>;
-    async fn get_auth_token(&self, token: &[u8]) -> AppResult<Option<TokenItem>>;
-    async fn update_or_create_user(&self, user_data: CognitoUserData) -> AppResult<User>;
-    async fn get_user_by_id(&self, user_id: UserId) -> AppResult<Option<User>>;
-    async fn get_users(&self) -> AppResult<Vec<User>>;
-}
+pub trait Repository: CrateRepository + UserRepository + TokenRepository {}
 
 pub type DynRepository = Arc<dyn Repository + Send + Sync>;

application/repository/base/krate.rs

@@ -0,0 +1,35 @@
+use crate::auth::AuthenticatedUser;
+use crate::error::AppResult;
+use crate::models::crate_summary::CrateSummary;
+use crate::models::index::PackageInfo;
+use crate::models::metadata::Metadata;
+use crate::models::user::User;
+use semver::Version;
+
+#[async_trait::async_trait]
+pub trait CrateRepository {
+    async fn get_package_info(&self, crate_name: &str) -> AppResult<String>;
+    async fn store_package_info(
+        &self,
+        crate_name: &str,
+        version: &Version,
+        package_info: PackageInfo,
+        metadata: Metadata,
+        authenticated_user: &AuthenticatedUser,
+    ) -> AppResult<()>;
+    async fn set_yanked(&self, crate_name: &str, version: &Version, yanked: bool) -> AppResult<()>;
+    async fn list_owners(&self, crate_name: &str) -> AppResult<Vec<User>>;
+    async fn add_owners(&self, crate_name: &str, user_ids: Vec<String>) -> AppResult<()>;
+    async fn get_crate_summary(&self, crate_name: &str) -> AppResult<Option<CrateSummary>>;
+    async fn get_all_crate_details(
+        &self,
+        filter: Option<String>,
+        limit: usize,
+    ) -> AppResult<Vec<CrateSummary>>;
+    async fn get_crate_metadata(
+        &self,
+        crate_name: &str,
+        version: &Version,
+    ) -> AppResult<Option<Metadata>>;
+    async fn list_crate_versions(&self, crate_name: &str) -> AppResult<Vec<Version>>;
+}

application/repository/base/token.rs

@@ -0,0 +1,15 @@
+use crate::error::AppResult;
+use crate::models::token::TokenItem;
+
+#[async_trait::async_trait]
+pub trait TokenRepository {
+    async fn store_auth_token(
+        &self,
+        token: &[u8],
+        name: String,
+        user_id: u32,
+    ) -> AppResult<TokenItem>;
+    async fn delete_auth_token(&self, user_id: u32, token_id: String) -> AppResult<()>;
+    async fn list_auth_tokens(&self, user_id: u32) -> AppResult<Vec<TokenItem>>;
+    async fn get_auth_token(&self, token: &[u8]) -> AppResult<Option<TokenItem>>;
+}

application/repository/base/user.rs

@@ -0,0 +1,14 @@
+use crate::error::AppResult;
+use crate::models::user::{CognitoUserData, User, UserId};
+
+#[async_trait::async_trait]
+pub trait UserRepository {
+    /// Used by the pre-token Lambda to ensure the SSO user is up to date in the repository.
+    ///
+    /// This either creates a new user, or checks whether the existing user has the
+    /// latest data (e.g. first name and last name being up to date) and bring the
+    /// database in line if it's out of sync.
+    async fn update_or_create_user(&self, user_data: CognitoUserData) -> AppResult<User>;
+    async fn get_user_by_id(&self, user_id: UserId) -> AppResult<Option<User>>;
+    async fn get_users(&self) -> AppResult<Vec<User>>;
+}