Skip to content

Commit 8ba2205

Browse files
jbrjbr
committed
fix load_session usage
1 parent 3f2f0e7 commit 8ba2205

File tree

3 files changed

+21
-20
lines changed

3 files changed

+21
-20
lines changed

‎src/cookie_store.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ mod tests {
8383
session.insert("key", "Hello")?;
8484
let cloned = session.clone();
8585
let cookie_value = store.store_session(&mut session).await?.unwrap();
86-
let loaded_session = store.load_session(cookie_value).await?.unwrap();
86+
let loaded_session = store.load_session(&cookie_value).await?.unwrap();
8787
assert_eq!(cloned.id(), loaded_session.id());
8888
assert_eq!("Hello", &loaded_session.get::<String>("key").unwrap());
8989
assert!(!loaded_session.is_expired());
@@ -99,11 +99,11 @@ mod tests {
9999
session.insert("key", "value")?;
100100
let cookie_value = store.store_session(&mut session).await?.unwrap();
101101

102-
let mut session = store.load_session(cookie_value.clone()).await?.unwrap();
102+
let mut session = store.load_session(&cookie_value.clone()).await?.unwrap();
103103
session.insert("key", "other value")?;
104104

105105
let new_cookie_value = store.store_session(&mut session).await?.unwrap();
106-
let session = store.load_session(new_cookie_value).await?.unwrap();
106+
let session = store.load_session(&new_cookie_value).await?.unwrap();
107107
assert_eq!(&mut session.get::<String>("key").unwrap(), "other value");
108108

109109
Ok(())
@@ -117,18 +117,18 @@ mod tests {
117117
let original_expires = *session.expiry().unwrap();
118118
let cookie_value = store.store_session(&mut session).await?.unwrap();
119119

120-
let mut session = store.load_session(cookie_value.clone()).await?.unwrap();
120+
let mut session = store.load_session(&cookie_value.clone()).await?.unwrap();
121121

122122
assert_eq!(session.expiry().unwrap(), &original_expires);
123123
session.expire_in(Duration::from_secs(3));
124124
let new_expires = *session.expiry().unwrap();
125125
let cookie_value = store.store_session(&mut session).await?.unwrap();
126126

127-
let session = store.load_session(cookie_value.clone()).await?.unwrap();
127+
let session = store.load_session(&cookie_value.clone()).await?.unwrap();
128128
assert_eq!(session.expiry().unwrap(), &new_expires);
129129

130130
task::sleep(Duration::from_secs(3)).await;
131-
assert_eq!(None, store.load_session(cookie_value).await?);
131+
assert_eq!(None, store.load_session(&cookie_value).await?);
132132

133133
Ok(())
134134
}
@@ -143,14 +143,14 @@ mod tests {
143143

144144
let cookie_value = store.store_session(&mut session).await?.unwrap();
145145

146-
let loaded_session = store.load_session(cookie_value.clone()).await?.unwrap();
146+
let loaded_session = store.load_session(&cookie_value.clone()).await?.unwrap();
147147
assert_eq!(cloned.id(), loaded_session.id());
148148
assert_eq!("value", &*loaded_session.get::<String>("key").unwrap());
149149

150150
assert!(!loaded_session.is_expired());
151151

152152
task::sleep(Duration::from_secs(3)).await;
153-
assert_eq!(None, store.load_session(cookie_value).await?);
153+
assert_eq!(None, store.load_session(&cookie_value).await?);
154154

155155
Ok(())
156156
}

‎src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
//! let cookie_value = store.store_session(&mut session).await?.unwrap();
2626
//!
2727
//! // Retrieve the session using the cookie.
28-
//! let session = store.load_session(cookie_value).await?.unwrap();
28+
//! let session = store.load_session(&cookie_value).await?.unwrap();
2929
//! assert_eq!(session.get::<usize>("user_id").unwrap(), 1);
3030
//! assert!(!session.data_changed());
3131
//! #

‎src/memory_store.rs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ impl SessionStore for MemoryStore {
5757
async fn store_session(&self, session: &mut Session) -> Result<Option<String>, Self::Error> {
5858
log::trace!("storing session by id `{}`", session.id());
5959
session.reset_data_changed();
60+
let cookie_value = session.take_cookie_value();
6061
self.0.insert(session.id().to_string(), session.clone());
61-
Ok(session.take_cookie_value())
62+
Ok(cookie_value)
6263
}
6364

6465
async fn destroy_session(&self, session: &mut Session) -> Result<(), Self::Error> {
@@ -116,7 +117,7 @@ mod tests {
116117
session.insert("key", "Hello")?;
117118
let cloned = session.clone();
118119
let cookie_value = store.store_session(&mut session).await?.unwrap();
119-
let loaded_session = store.load_session(cookie_value).await?.unwrap();
120+
let loaded_session = store.load_session(&cookie_value).await?.unwrap();
120121
assert_eq!(cloned.id(), loaded_session.id());
121122
assert_eq!("Hello", &loaded_session.get::<String>("key").unwrap());
122123
assert!(!loaded_session.is_expired());
@@ -132,11 +133,11 @@ mod tests {
132133
session.insert("key", "value")?;
133134
let cookie_value = store.store_session(&mut session).await?.unwrap();
134135

135-
let mut session = store.load_session(cookie_value.clone()).await?.unwrap();
136+
let mut session = store.load_session(&cookie_value).await?.unwrap();
136137
session.insert("key", "other value")?;
137138

138139
assert_eq!(store.store_session(&mut session).await?, None);
139-
let session = store.load_session(cookie_value).await?.unwrap();
140+
let session = store.load_session(&cookie_value).await?.unwrap();
140141
assert_eq!(&mut session.get::<String>("key").unwrap(), "other value");
141142

142143
Ok(())
@@ -150,18 +151,18 @@ mod tests {
150151
let original_expires = *session.expiry().unwrap();
151152
let cookie_value = store.store_session(&mut session).await?.unwrap();
152153

153-
let mut session = store.load_session(cookie_value.clone()).await?.unwrap();
154+
let mut session = store.load_session(&cookie_value).await?.unwrap();
154155

155156
assert_eq!(session.expiry().unwrap(), &original_expires);
156157
session.expire_in(Duration::from_secs(3));
157158
let new_expires = *session.expiry().unwrap();
158159
assert_eq!(None, store.store_session(&mut session).await?);
159160

160-
let session = store.load_session(cookie_value.clone()).await?.unwrap();
161+
let session = store.load_session(&cookie_value).await?.unwrap();
161162
assert_eq!(session.expiry().unwrap(), &new_expires);
162163

163164
task::sleep(Duration::from_secs(3)).await;
164-
assert_eq!(None, store.load_session(cookie_value).await?);
165+
assert_eq!(None, store.load_session(&cookie_value).await?);
165166

166167
Ok(())
167168
}
@@ -176,14 +177,14 @@ mod tests {
176177

177178
let cookie_value = store.store_session(&mut session).await?.unwrap();
178179

179-
let loaded_session = store.load_session(cookie_value.clone()).await?.unwrap();
180+
let loaded_session = store.load_session(&cookie_value).await?.unwrap();
180181
assert_eq!(cloned.id(), loaded_session.id());
181182
assert_eq!("value", &*loaded_session.get::<String>("key").unwrap());
182183

183184
assert!(!loaded_session.is_expired());
184185

185186
task::sleep(Duration::from_secs(3)).await;
186-
assert_eq!(None, store.load_session(cookie_value).await?);
187+
assert_eq!(None, store.load_session(&cookie_value).await?);
187188

188189
Ok(())
189190
}
@@ -197,9 +198,9 @@ mod tests {
197198

198199
let cookie = store.store_session(&mut Session::new()).await?.unwrap();
199200
assert_eq!(4, store.count());
200-
let mut session = store.load_session(cookie.clone()).await?.unwrap();
201+
let mut session = store.load_session(&cookie).await?.unwrap();
201202
store.destroy_session(&mut session).await?;
202-
assert_eq!(None, store.load_session(cookie).await?);
203+
assert_eq!(None, store.load_session(&cookie).await?);
203204
assert_eq!(3, store.count());
204205

205206
// attempting to destroy the session again is not an error

0 commit comments

Comments
 (0)