diff --git a/src/app/client.rs b/src/app/client.rs index da490c4..0b03bd2 100644 --- a/src/app/client.rs +++ b/src/app/client.rs @@ -7,27 +7,24 @@ use anyhow::Result; use nkode_rs::nkode_core::nkode_cipher::NKodeCipher; use nkode_rs::from_bytes::FromBytes; use nkode_rs::nkode_core::chacha20prng::Nonce; -use crate::repository::client_app::repos::ClientRepo; pub struct Login; pub struct Register; -pub struct ClientAppKey { +pub struct ClientAppKey { api: S, - repo: R, email: Email, user_secret_key: UserSecretKey, _state: PhantomData } -impl ClientAppKey { - pub async fn register(self) -> Result, String> { +impl ClientAppKey { + pub async fn register(self) -> Result, String> { // self.repo.set_secret_key(&self.email, &self.user_secret_key).await?; self.api.register_key(&self.email, &self.user_secret_key).await?; Ok(ClientAppKey { api: self.api, - repo: self.repo, email: self.email, user_secret_key: self.user_secret_key, _state: PhantomData::, @@ -35,11 +32,10 @@ impl ClientAppKey { } } -impl ClientAppKey { - pub async fn login(self) -> Result,String> { +impl ClientAppKey { + pub async fn login(self) -> Result,String> { let key_login = self.api.login_key(&self.email, &self.user_secret_key).await?; Ok(ClientAppKeyLoggedIn{ - repo: self.repo, api: self.api, email: self.email, user_secret_key: self.user_secret_key, @@ -48,15 +44,14 @@ impl ClientAppKey { } } -pub struct ClientAppKeyLoggedIn { - repo: R, +pub struct ClientAppKeyLoggedIn { api: S, email: Email, user_secret_key: UserSecretKey, key_login: KeyLoginSession, } -impl ClientAppKeyLoggedIn { +impl ClientAppKeyLoggedIn { pub async fn register_code(self) -> Result, String> { let icon_nonce = Nonce::new(); let icons = self.get_icons(&icon_nonce).await?; diff --git a/src/repository/client_app/mod.rs b/src/repository/client_app/mod.rs deleted file mode 100644 index 8723567..0000000 --- a/src/repository/client_app/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod repos; \ No newline at end of file diff --git a/src/repository/client_app/repos.rs b/src/repository/client_app/repos.rs deleted file mode 100644 index e67885f..0000000 --- a/src/repository/client_app/repos.rs +++ /dev/null @@ -1,12 +0,0 @@ -use crate::models::app::CodeLoginData; -use crate::models::email::Email; -use crate::models::opaque::UserSecretKey; - -pub trait ClientRepo { - // async fn get_secret_key(&self) -> anyhow::Result; - // async fn set_secret_key(&self, email: &Email,user_secret_key: &UserSecretKey) -> anyhow::Result<(),String>; - // async fn get_login_data(&self) -> anyhow::Result; - // async fn set_login_data(&self, data: CodeLoginData) -> anyhow::Result<(), String>; - // async fn set_email(&self, email: &Email) -> anyhow::Result<(), String>; - // async fn get_email(&self) -> anyhow::Result; -} \ No newline at end of file diff --git a/src/repository/mod.rs b/src/repository/mod.rs index e37d699..5517533 100644 --- a/src/repository/mod.rs +++ b/src/repository/mod.rs @@ -1,2 +1 @@ pub mod opaque; -pub(crate) mod client_app;