Update login page

assets/js/common/functionsSchema.js

@@ -365,54 +365,6 @@ var ComunicWeb = {
 			deleteLoginTokens: function(){},
 		},
 		
-		/**
-		 * Manage user login
-		 */
-		userLogin: {
-			/**
-			 * @var {Boolean} Store user login state (true by default)
-			 */
-			__userLogin: true,
-
-			/**
-			 * @var {Integer} Store the current user ID
-			 */
-			__userID: 0,
-
-
-			/**
-			 * Tell if user is logged in or not
-			 */
-			getUserLoginState: function(){},
-
-			/**
-			 * Get user ID (if logged in)
-			 */
-			getUserID: function(){},
-
-			/**
-			 * Try to get and store current user ID
-			 */
-			getCurrentUserId: function(afterGetCurrentUserID){},
-
-			/**
-			 * Refresh the user login state
-			 */
-			refreshLoginState: function(afterLogin){},
-
-			/**
-			 * Try to login user
-			 */
-			loginUser: function(usermail, userpassword, permanentLogin, afterLogin){},
-
-			/**
-			 * Logout user
-			 */
-			logoutUser: function(afterLogout){},
-
-			//TODO : implement
-		},
-		
 		/**
 		 * Get user infos
 		 */

assets/js/common/system.js

@@ -59,9 +59,9 @@ ComunicWeb.common.system = {
 		ComunicWeb.components.darkTheme.refresh();
 
 		/**
-		 * What to do after login refresh
+		 * Get login state
 		 */
-		var afterLoginRefresh = async function(){
+		await UserLogin.refreshLoginState();
 
 		// Initialize Websocket if user is connected
 		if(signed_in()) {
@@ -82,15 +82,6 @@ ComunicWeb.common.system = {
 
 		//End of init
 		ComunicWeb.debug.logMessage("Application is ready !");
-		}
-
-		/**
-		 * Get login state
-		 */
-		ComunicWeb.user.userLogin.refreshLoginState(afterLoginRefresh);
-
-		//Success
-		return true;
 	},
 
 	/**

assets/js/pages/login.js

@@ -67,7 +67,6 @@ ComunicWeb.pages.login = {
 			var loginButton = loginBody.getElementsByClassName("btn-login")[0];
 
 			//Make the login action accessible
-			//loginButton.onclick = ComunicWeb.pages.login.loginSubmit;
 			loginBody.onsubmit = ComunicWeb.pages.login.loginSubmit;
 
 
@@ -103,9 +102,7 @@ ComunicWeb.pages.login = {
 		)){
 		   //Error notification
 		   ComunicWeb.common.notificationSystem.showNotification(lang("_login_page_bad_input"), "error");
-
+		   return;
-		   //Stop function execution
-		   return false;
 		}
 	   
 		//Enable overlay (use .remove() to remove)
@@ -117,7 +114,7 @@ ComunicWeb.pages.login = {
 		var permanentLogin = rememberLoginInput.checked;
 
 		//What to do once user is logged in (or not)
-		var afterTryLogin = function(loginResult){
+		var afterTryLogin = (loginResult) => {
 
 			//First, remove overlay
 			screenOverlay.remove();

assets/js/user/userLogin.js

@@ -4,7 +4,7 @@
  * @author Pierre HUBERT
  */
 
-ComunicWeb.user.userLogin = {
+const UserLogin = {
 
     /**
      * @var {Boolean} Store user login state (true by default)
@@ -29,7 +29,6 @@ ComunicWeb.user.userLogin = {
      * @return {Boolean} Depend of the result
      */
     getUserLoginState: function() {
-        //Return login state
         return this.__userLogin;
     },
 
@@ -41,27 +40,27 @@ ComunicWeb.user.userLogin = {
     getUserID: function() {
         //If user is logged in
         if(this.getUserLoginState() === true){
-            //Return user ID
             return this.__userID;
         }
     },
 
     /**
      * Try to get and store current user ID
-     * 
-     * @param {function} afterGetCurrentUserID What to do next
-     * @return {Integer} 0 if it fails
      */
-    getCurrentUserId: function(afterGetCurrentUserID){
+    async getCurrentUserId(){
-        //Prepare and make an API request
+        try {
-        var apiURI = "user/getCurrentUserID";
+            const result = await api("account/id", {}, true);
-        var params = {};
+
-        var requireLoginTokens = true;
+            // Update user ID
+            ComunicWeb.user.userLogin.__userID = result.userID;
+
+            //Notify about the event
+            SendEvent("got_user_id", {
+                userID: result.userID
+            });
+
+        } catch(e) {
 
-        //What to do after the request is completed
-        var afterAPIrequest = function(result){
-            //Check if we got any error
-            if(result.error){
             //Set user ID to 0 (security purpose)
             ComunicWeb.user.userLogin.__userID = 0;
 
@@ -74,64 +73,30 @@ ComunicWeb.user.userLogin = {
                 ComunicWeb.common.system.restart();
             }
 
-                //Perform next action
-                afterGetCurrentUserID(0);
         }
-            else
-            {
-                //Update user ID
-                ComunicWeb.user.userLogin.__userID = result.userID;
-
-                //Perform next action
-                afterGetCurrentUserID(result.userID);
-
-                //Notify about the event
-                SendEvent("got_user_id", {
-                    userID: result.userID
-                });
-            }
-
-        };
-
-        //Perform request
-        ComunicWeb.common.api.makeAPIrequest(apiURI, params, requireLoginTokens, afterAPIrequest);
     },
 
     /**
      * Refresh the user login state
-     * 
-     * @param {Function} afterRefresh Optionnal, what to do after refreshing login
      */
-    refreshLoginState: function(afterRefresh){
+    refreshLoginState: async function() {
         // First, check if we have login tokens
         if(ComunicWeb.user.loginTokens.checkLoginTokens() !== true) {
             //Specify the user isn't logged in
             this.__userLogin = false;
             this.__userID = 0;
 
-            //If there is a next action, do it (even if user isn't logged in)
+            return;
-            if(afterRefresh){
-                afterRefresh();
-            }
-
-            //User not logged in
-            return false;
         }
 
         // Try to use tokens to get user infos
-        var nextStep = function(userID){
+        await UserLogin.getCurrentUserId();
+
         //We check received data
-            if(userID == 0){
+        if(this.__userID == 0){
             // We consider user is not logged in
             ComunicWeb.user.userLogin.__userLogin = false;
         }
-
-            //If there is a next action, do it
-            if(afterRefresh){
-                afterRefresh();
-            }
-        };
-        this.getCurrentUserId(nextStep);
     },
 
     /**
@@ -142,22 +107,12 @@ ComunicWeb.user.userLogin = {
      * @param {Boolean} permanentLogin Specify wether the login is permanent or not
      * @param {function} afterLogin What to do next
      */
-    loginUser: function(usermail, userpassword, permanentLogin, afterLogin){
+    loginUser: async function(usermail, userpassword, permanentLogin, afterLogin) {
-        //Prepare and make an API request
+        try {
-        var apiURI = "user/connectUSER";
+            const result = await api("account/login", {
-        var params = {
+                mail: usermail,
-            userMail: usermail,
+                password: userpassword,
-            userPassword: userpassword,
+            })
-        };
-
-        //What to do after the request is completed
-        const afterAPIrequest = async function(result){
-            //Prepare data return
-            var loginstate = false;
-            
-            //Check if there is a success message
-            if(result.success){
-                loginstate = true;
 
             //Log
             ComunicWeb.debug.logMessage("User login " + usermail + " successful !");
@@ -180,17 +135,9 @@ ComunicWeb.user.userLogin = {
             // Initialize websocket
             await UserWebSocket.Connect();
             await UserWebSocket.WaitForConnected();
-            }
-
-            //Perform next action if login failed
-            if(!loginstate) {
-                ComunicWeb.user.userLogin._last_attempt_response_code = result.error.code;
-                afterLogin(loginstate);
-                return false;
-            }
 
             // Else refresh login state to get user ID
-            ComunicWeb.user.userLogin.refreshLoginState(function(){
+            await this.refreshLoginState();
 
             //Then get and apply user language settings
             ComunicWeb.components.settings.interface.getLanguage(function(lang){
@@ -198,18 +145,14 @@ ComunicWeb.user.userLogin = {
                 if(!lang.error)
                     ComunicWeb.common.langs.setLang(lang.lang);
                 
-                    //And then we'll be able to perform next action
                 afterLogin(true);
                 
             });
 
-                
+        } catch(e) {
-            });
+            UserLogin._last_attempt_response_code = e.code;
-            
+            afterLogin(false);
-        };
+        }
-
-        //Perform request
-        ComunicWeb.common.api.makeAPIrequest(apiURI, params, false, afterAPIrequest);
     },
 
     /**
@@ -259,3 +202,5 @@ ComunicWeb.user.userLogin = {
         return this._last_attempt_response_code;
     }
 }
+
+ComunicWeb.user.userLogin = UserLogin;