Merge pull request #178 from AdExNetwork/issue-176-ethereum_adapter-session_from_token-mutability

Issue #176 `EthereumAdapter::session_from_token` mutability

Author: elpiel

adapter/src/dummy.rs

@@ -70,7 +70,7 @@ impl Adapter for DummyAdapter {
         }
     }
 
-    fn session_from_token(&mut self, token: &str) -> AdapterResult<Session> {
+    fn session_from_token(&self, token: &str) -> AdapterResult<Session> {
         let identity = self
             .authorization_tokens
             .iter()

adapter/src/ethereum.rs

@@ -38,8 +38,6 @@ pub struct EthereumAdapter {
     keystore_json: Value,
     keystore_pwd: Password,
     config: Config,
-    // Auth tokens that we have verified (tokenId => session)
-    session_tokens: HashMap<String, Session>,
     // Auth tokens that we've generated to authenticate with someone (address => token)
     authorization_tokens: HashMap<String, String>,
     wallet: Option<SafeAccount>,
@@ -72,7 +70,6 @@ impl EthereumAdapter {
             address,
             keystore_json,
             keystore_pwd: opts.keystore_pwd.into(),
-            session_tokens: HashMap::new(),
             authorization_tokens: HashMap::new(),
             wallet: None,
             config: config.to_owned(),
@@ -164,15 +161,11 @@ impl Adapter for EthereumAdapter {
         Ok(true)
     }
 
-    fn session_from_token(&mut self, token: &str) -> AdapterResult<Session> {
+    /// Creates a `Session` from a provided Token by calling the Contract.
+    /// Does **not** cache the (`Token`, `Session`) pair.
+    fn session_from_token(&self, token: &str) -> AdapterResult<Session> {
         if token.len() < 16 {
-            return Err(AdapterError::Failed("invaild token id".to_string()));
-        }
-
-        let token_id = token[token.len() - 16..].to_string();
-
-        if let Some(token) = self.session_tokens.get(&token_id) {
-            return Ok(token.to_owned());
+            return Err(AdapterError::Failed("invalid token id".to_string()));
         }
 
         let parts: Vec<&str> = token.split('.').collect();
@@ -204,7 +197,7 @@ impl Adapter for EthereumAdapter {
                 let contract = get_contract(&self.config, contract_address, &IDENTITY_ABI)
                     .map_err(|_| map_error("failed to init identity contract"))?;
 
-                let priviledge_level: U256 = contract
+                let privilege_level: U256 = contract
                     .query(
                         "privileges",
                         verified.from.to_string(),
@@ -215,7 +208,7 @@ impl Adapter for EthereumAdapter {
                     .wait()
                     .map_err(|_| map_error("failed query priviledge level on contract"))?;
 
-                if priviledge_level == *PRIVILEGE_LEVEL_NONE {
+                if privilege_level == *PRIVILEGE_LEVEL_NONE {
                     return Err(AdapterError::Authorization(
                         "insufficient privilege".to_string(),
                     ));
@@ -231,7 +224,6 @@ impl Adapter for EthereumAdapter {
             },
         };
 
-        self.session_tokens.insert(token_id, sess.clone());
         Ok(sess)
     }
 

primitives/src/adapter.rs

@@ -81,7 +81,7 @@ pub trait Adapter: ChannelValidator + Send + Clone + Debug {
     fn validate_channel(&self, channel: &Channel) -> AdapterResult<bool>;
 
     /// Get user session from token
-    fn session_from_token(&mut self, token: &str) -> AdapterResult<Session>;
+    fn session_from_token(&self, token: &str) -> AdapterResult<Session>;
 
     /// Gets authentication for specific validator
     fn get_auth(&mut self, validator_id: &ValidatorId) -> AdapterResult<String>;