front/core/services/auth.js

@@ -38,31 +38,12 @@ export default class Auth {
             };
 
             if (this.vnToken.token) {
-                const maxRetries = 5;
+                return this.validateToken()
-                let retryCount = 0;
-                const retryDelay = 2000; // Milisegundos (1 segundo)
-
-                const loadAclsWithRetry = () => {
-                    return this.loadAcls(maxRetries)
                     .then(() => true)
-                        .catch(error => {
+                    .catch(err => {
-                            retryCount++;
+                        console.error(err);
-                            if (retryCount < maxRetries) {
+                        redirectToLogin();
-                                return new Promise(resolve => {
-                                    setTimeout(() => {
-                                        this.vnApp.showMessage(this.$translate.instant('Loading...'));
-                                        resolve(loadAclsWithRetry(maxRetries - retryCount));
-                                    }, retryDelay);
                     });
-                            } else {
-                                // Retry limit reached, redirect to login
-                                return redirectToLogin();
-                            }
-                        });
-                };
-
-                // Start loading ACLs with retry
-                return loadAclsWithRetry();
             } else
                 return redirectToLogin();
         });
@@ -132,33 +113,17 @@ export default class Auth {
         return promise;
     }
 
-    loadAcls(maxRetries = 1) {
+    validateToken() {
-        const attemptLoad = retryCount => {
+        return this.$http.get('VnUsers/validateToken')
-            return this.aclService.load()
             .then(() => {
                 this.loggedIn = true;
                 this.vnModules.reset();
             })
             .catch(err => {
-                    if (retryCount >= maxRetries) {
-                        this.vnToken.unset();
                 throw err;
-                    } else {
-                        // Retry after delay
-                        return new Promise((resolve, reject) => {
-                            reject(new Error(this.$translate.instant('Error loading ACLs')));
             });
     }
-                });
-        };
-
-        // Start loading with retry
-        return attemptLoad(1);
-    }
 }
-Auth.$inject = [
+Auth.$inject = ['$http', '$q', '$state', '$transitions', '$window', 'vnToken', 'vnModules'];
-    '$http', '$q', 'vnApp', '$translate', '$state',
-    '$transitions', '$window', 'vnToken', 'vnModules',
-    'aclService'];
 
 ngModule.service('vnAuth', Auth);