Merge factors type for authentication
This commit is contained in:
@@ -33,8 +33,7 @@ impl<'a> SessionIdentity<'a> {
|
||||
fn get_session_data(&self) -> Option<SessionIdentityData> {
|
||||
if let Some(id) = self.0 {
|
||||
Self::deserialize_session_data(id.id().ok())
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
@@ -71,12 +70,15 @@ impl<'a> SessionIdentity<'a> {
|
||||
}
|
||||
|
||||
pub fn set_user(&self, req: &HttpRequest, user: &User, status: SessionStatus) {
|
||||
self.set_session_data(req, &SessionIdentityData {
|
||||
id: Some(user.uid.clone()),
|
||||
is_admin: user.admin,
|
||||
auth_time: time(),
|
||||
status,
|
||||
});
|
||||
self.set_session_data(
|
||||
req,
|
||||
&SessionIdentityData {
|
||||
id: Some(user.uid.clone()),
|
||||
is_admin: user.admin,
|
||||
auth_time: time(),
|
||||
status,
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
pub fn set_status(&self, req: &HttpRequest, status: SessionStatus) {
|
||||
@@ -108,7 +110,9 @@ impl<'a> SessionIdentity<'a> {
|
||||
}
|
||||
|
||||
pub fn user_id(&self) -> UserID {
|
||||
self.get_session_data().unwrap_or_default().id
|
||||
self.get_session_data()
|
||||
.unwrap_or_default()
|
||||
.id
|
||||
.expect("UserID should never be null here!")
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user