Logout (partial work) (multi-user matita)

[helm.git] / matitaB / matita / matitaAuthentication.ml

diff --git a/matitaB/matita/matitaAuthentication.ml b/matitaB/matita/matitaAuthentication.ml
index 1b9a91b7160024d8debd958a1b70ee6dcd094cac..7d6471df5b4848bade59340b548e2431e7cd4269 100644 (file)
--- a/matitaB/matita/matitaAuthentication.ml
+++ b/matitaB/matita/matitaAuthentication.ml
@@ -30,8 +30,8 @@ type user = string * (string * session_id option)
 
 let user_tbl = (ref [] : user list ref)
 
-(* session table: (user id, session id), matita status *)
-type session = session_id * (MatitaEngine.status * MatitaEngine.status list)
+(* session table: session id, (user id, matita status, matita history *)
+type session = session_id * (string * MatitaEngine.status * MatitaEngine.status list)
 
 let session_tbl = (ref [] : session list ref)
 
@@ -51,28 +51,35 @@ let create_session uid =
        List.remove_assoc sid' !session_tbl
     | _ -> !session_tbl
   in 
-  session_tbl := (new_session,(status,history))::clean_stbl;
+  session_tbl := (new_session,(uid,status,history))::clean_stbl;
   new_session
 ;;
 
-let get_status sid = fst (List.assoc sid !session_tbl)
+let get_session_owner sid =
+  let uid,_,_ = List.assoc sid !session_tbl
+  in uid
 
-let get_history sid = snd (List.assoc sid !session_tbl)
+let get_status sid =
+  let _,st,_ = List.assoc sid !session_tbl
+  in st
+
+let get_history sid = 
+  let _,_,hist = List.assoc sid !session_tbl
+  in hist
 
 let set_status sid st =
-  let oldst, hist = List.assoc sid !session_tbl in
-  session_tbl := (sid,(st,hist))::(List.remove_assoc sid !session_tbl)
+  let uid, oldst, hist = List.assoc sid !session_tbl in
+  session_tbl := (sid,(uid,st,hist))::(List.remove_assoc sid !session_tbl)
    
 let set_history sid hist =
-  let st, oldhist = List.assoc sid !session_tbl in
-  session_tbl := (sid,(st,hist))::(List.remove_assoc sid !session_tbl)
-
-let logout_user uid =
-  match List.assoc uid !user_tbl with
-  | _,None -> ()
-  | pw, Some sid ->
-     user_tbl := (uid,(pw,None))::List.remove_assoc uid !user_tbl;
-     session_tbl := List.remove_assoc sid !session_tbl
+  let uid, st, oldhist = List.assoc sid !session_tbl in
+  session_tbl := (sid,(uid,st,hist))::(List.remove_assoc sid !session_tbl)
+
+let logout_user sid =
+  let uid,st,hist = List.assoc sid !session_tbl in
+  let pw,_ = List.assoc uid !user_tbl in
+  user_tbl := (uid,(pw,None))::List.remove_assoc uid !user_tbl;
+  session_tbl := List.remove_assoc sid !session_tbl
 ;;
 
 let remove_user uid =