sign in & out done. try/except improvments in server.py. some error message...

sign in & out done. try/except improvments in server.py. some error message still coming but those are about setuserDetals and are ok by now

Lab_3/Twidder/static/client.js

@@ -5,6 +5,10 @@ var welcomeDiv;
 var profileDiv;
 var url = 'http://127.0.0.1:5000/myServer/';
 
+
+
+// - - - - - Init Request Objects - - - - - //
+
 // Sign In Request Object
 var signInRequest = new XMLHttpRequest();
 signInRequest.onreadystatechange = function() {
@@ -18,8 +22,8 @@ signInRequest.onreadystatechange = function() {
             
             // Changes the view to profile view an loads user info
             displayView();
-            setUserDetails("home");
 
+            setUserDetails("home");
             // Todo - kommentera fram när den är klar
             // reloadWall("home");
         }
@@ -41,16 +45,14 @@ signInRequest.onreadystatechange = function() {
         } 
     }
 };
-signInRequest.open("POST", url + "sign_in", true);
-signInRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
 
-// Sign In Request Object
+// Sign Out Request Object
 var signOutRequest = new XMLHttpRequest();
 signOutRequest.onreadystatechange = function() {
     if (this.readyState == 4) {
         if (this.status == 204) {
 
-            // Reset the localStorage
+            // Reset token in the localStorage
             localStorage.setItem("currentUser", "");
 
             // Changes the view to welcome view
@@ -66,8 +68,7 @@ signOutRequest.onreadystatechange = function() {
         } 
     }
 };
-signOutRequest.open("POST", url + "sign_out", true);
-signOutRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+
 
 
 // - - - - - Init functions - - - - - //
@@ -80,6 +81,8 @@ displayView = function(){
         windowDiv.innerHTML = profileDiv.innerHTML;
 };
 
+
+
 // - - - - - The function when page loads - - - - - //
 window.onload = function () {
 
@@ -91,13 +94,14 @@ window.onload = function () {
     if (localStorage.getItem("currentUser") == null)
         localStorage.setItem("currentUser", "");
 
-    // Initalize div objects (global variables)
+    // Initialize div objects (global variables)
     welcomeDiv = document.getElementById("welcomeview");
     profileDiv = document.getElementById("profileview");
     windowDiv = document.getElementById("windowDiv");
 
     // Set correct view depending on if someone is signed in or not
     displayView();
+
     // Load user details to home page and browse page
     setUserDetails("home");
     setUserDetails("browse");
@@ -105,28 +109,30 @@ window.onload = function () {
 
 //Function for setting user details
 function setUserDetails(who) {
-    // // "who" could be either home or browse, this way know which info we are displaying and where
-    // let token = localStorage.getItem("currentUser");
-    // if (token != null && token != "" ){
-    //     let userTable = document.getElementById(who + "UserInfo");
-    //     let email = localStorage.getItem(who + "Email");
+    // "who" could be either home or browse, this way know which info we are displaying and where
+    let token = localStorage.getItem("currentUser");
+    if (token != null && token != "" ){
+        let userTable = document.getElementById(who + "UserInfo");
+        let email = localStorage.getItem(who + "Email");
         
-    //     // Todo
-    //     //let userDataArray = serverstub.getUserDataByEmail(token, email);
-    //     let userDataArray = server.get_user_data_by_email(email);
-
-    //     // Putting the user data we retrieved from server to the corresponding html table
-    //     if (userDataArray["success"]) {
-    //         userTable.rows[0].cells[1].innerHTML = userDataArray["data"].email;
-    //         userTable.rows[1].cells[1].innerHTML = userDataArray["data"].firstname;
-    //         userTable.rows[2].cells[1].innerHTML = userDataArray["data"].familyname;
-    //         userTable.rows[3].cells[1].innerHTML = userDataArray["data"].gender;
-    //         userTable.rows[4].cells[1].innerHTML = userDataArray["data"].city;
-    //         userTable.rows[5].cells[1].innerHTML = userDataArray["data"].country;
-    //     }
-    // }
+        // Todo
+        //let userDataArray = serverstub.getUserDataByEmail(token, email);
+        let userDataArray = server.get_user_data_by_email(email);
+
+        // Putting the user data we retrieved from server to the corresponding html table
+        if (userDataArray["success"]) {
+            userTable.rows[0].cells[1].innerHTML = userDataArray["data"].email;
+            userTable.rows[1].cells[1].innerHTML = userDataArray["data"].firstname;
+            userTable.rows[2].cells[1].innerHTML = userDataArray["data"].familyname;
+            userTable.rows[3].cells[1].innerHTML = userDataArray["data"].gender;
+            userTable.rows[4].cells[1].innerHTML = userDataArray["data"].city;
+            userTable.rows[5].cells[1].innerHTML = userDataArray["data"].country;
+        }
+    }
 }
 
+
+
 // - - - - - Sign Up/In/Out - - - - - //
 
 function sign_up() {
@@ -199,7 +205,8 @@ function sign_in() {
     else {
 
         // Sending sign_in request to "server"
-        // let signInObj = serverstub.signIn(email, password);
+        signInRequest.open("POST", url + "sign_in", true);
+        signInRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
         signInRequest.send(JSON.stringify({email: email,password: password}));
     }
     return false;
@@ -207,10 +214,16 @@ function sign_in() {
 
 function sign_out(){
     let token = localStorage.getItem("currentUser");
+
+    // Sending sign_out request to "server"
+    signOutRequest.open("POST", url + "sign_out", true);
+    signOutRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
     signOutRequest.setRequestHeader("Authorization", token)
     signOutRequest.send();
 }
 
+
+
 // - - - - - Changing tabs - - - - - //
 
 function showPage(ourEvent, name){
@@ -235,6 +248,8 @@ function showPage(ourEvent, name){
     selected_tab.style.display = "block";
 }
 
+
+
 // - - - - - Changing Password - - - - - //
 
 //Function for changing password
@@ -261,7 +276,6 @@ function change_password(ourEvent){
         // Set error text
         error_text.innerHTML = message["message"];
     }
-    
    error_text.style.display = "block";
 }