Separate ResourceRef and ResourceHandle

Author: sergiimk

src/adapter/auth-web3/Cargo.toml

@@ -22,9 +22,7 @@ doctest = false
 
 
 [features]
-default = ["did-pkh"]
-
-did-pkh = ["odf/did-pkh"]
+default = []
 
 
 [dependencies]
@@ -54,6 +52,9 @@ kamu-auth-web3-services = { workspace = true, default-features = false }
 
 chrono = { version = "0.4", default-features = false }
 indoc = { version = "2" }
-pretty_assertions = { version = "1", default-features = false, features = ["std", "unstable"] }
+pretty_assertions = { version = "1", default-features = false, features = [
+    "std",
+    "unstable",
+] }
 test-log = { version = "0.2", features = ["trace"] }
 tokio = { version = "1", default-features = false, features = [] }

src/adapter/auth-web3/src/lib.rs

@@ -16,9 +16,6 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
-#[cfg(not(feature = "did-pkh"))]
-compile_error!("Feature `did-pkh` must be enabled for using Web3WalletAuthenticationProvider");
-
 mod dependencies;
 mod web3_wallet_authentication_provider;
 

src/adapter/graphql/src/scalars/account.rs

@@ -19,62 +19,6 @@ simple_string_scalar!(AccountName, odf::AccountName);
 simple_string_scalar!(Email, email_utils::Email, parse);
 simple_string_scalar!(AccountPassword, kamu_accounts::Password, try_new);
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#[derive(Debug, Clone)]
-pub struct AccountRef(odf::metadata::auth::AccountRef);
-
-#[Object]
-impl AccountRef {
-    pub async fn id(&self) -> Option<AccountID<'_>> {
-        self.0.id().map(Into::into)
-    }
-
-    pub async fn name(&self) -> Option<AccountName<'_>> {
-        self.0.name().map(Into::into)
-    }
-}
-
-impl From<odf::metadata::auth::AccountRef> for AccountRef {
-    fn from(value: odf::metadata::auth::AccountRef) -> Self {
-        Self(value)
-    }
-}
-
-impl From<AccountRef> for odf::metadata::auth::AccountRef {
-    fn from(value: AccountRef) -> Self {
-        value.0
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-#[derive(Debug, Clone)]
-pub struct AccountHandle(odf::metadata::auth::AccountHandle);
-
-#[Object]
-impl AccountHandle {
-    pub async fn id(&self) -> AccountID<'_> {
-        AccountID::from(&self.0.id)
-    }
-
-    pub async fn name(&self) -> AccountName<'_> {
-        AccountName::from(&self.0.name)
-    }
-}
-
-impl From<odf::metadata::auth::AccountHandle> for AccountHandle {
-    fn from(value: odf::metadata::auth::AccountHandle) -> Self {
-        Self(value)
-    }
-}
-
-impl From<AccountHandle> for odf::metadata::auth::AccountHandle {
-    fn from(value: AccountHandle) -> Self {
-        value.0
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // AccountDisplayName
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////